Do not use upper level configure and do not install to upper level any more. Drops backward compatibility to Stream 2.7

This commit is contained in:
2020-07-30 17:39:29 +02:00
parent 1cace82a70
commit bf55d4c202
5 changed files with 14 additions and 38 deletions

1
.gitignore vendored
View File

@ -7,3 +7,4 @@ include
*.pdf
*.*log
StreamVersion.h
*.local

View File

@ -21,21 +21,10 @@
# along with StreamDevice. If not, see https://www.gnu.org/licenses/.
#########################################################################/
TOP = ..
ifneq ($(wildcard ../configure),)
# We are in an EPICS R3.14+ <TOP> location
include $(TOP)/configure/CONFIG
else ifneq ($(wildcard ../config),)
# We are in an EPICS R3.13 <TOP> location
CONFIG = $(TOP)/config
include $(TOP)/config/CONFIG_APP
else
# Using our own local configuration
TOP = .
DIRS = configure
src_DEPEND_DIRS := $(DIRS)
include $(TOP)/configure/CONFIG
endif
TOP = .
DIRS = configure
src_DEPEND_DIRS := $(DIRS)
include $(TOP)/configure/CONFIG
DIRS += src
DIRS += streamApp

View File

@ -54,15 +54,17 @@ git clone https://github.com/paulscherrerinstitute/StreamDevice.git
<p class="new">
<em>StreamDevice</em> now comes with a standard
<kbd>configure</kbd> directory.
But it can still be built in an external <em>&lt;top&gt;</em>
<del>But it can still be built in an external <em>&lt;top&gt;</em>
directory as in previous versions.
It will automatically detect <em>&lt;top&gt;</em> locations
from the presence of <kbd>../configure</kbd> or <kbd>../config</kbd>
directories.
directories.</del> Using an upper level <kbd>../configure</kbd> is
no longer supported due to compatibility issues with <em>SynApps</em>.
</p>
<p class="new">
Edit the <kbd>configure/RELEASE</kbd> file to specify the install location
of EPICS base and of additional software modules, for example:
of EPICS base and of additional software modules or add a
<kbd>configure/RELEASE.local</kbd> file to overwrite, for example:
<pre>
EPICS_BASE=/home/epics/base-3.16.1
</pre>

View File

@ -21,16 +21,8 @@
# along with StreamDevice. If not, see https://www.gnu.org/licenses/.
#########################################################################/
TOP = ../..
ifneq ($(wildcard ../../configure),)
include $(TOP)/configure/CONFIG
else ifneq ($(wildcard ../../config),)
include $(TOP)/config/CONFIG_APP
include $(TOP)/config/RULES_ARCHS
else
TOP= ..
include $(TOP)/configure/CONFIG
endif
TOP= ..
include $(TOP)/configure/CONFIG
-include CONFIG_STREAM
-include ../CONFIG_STREAM

View File

@ -21,16 +21,8 @@
# along with StreamDevice. If not, see https://www.gnu.org/licenses/.
#########################################################################/
TOP = ../..
ifneq ($(wildcard ../../configure),)
include $(TOP)/configure/CONFIG
else ifneq ($(wildcard ../../config),)
include $(TOP)/config/CONFIG_APP
include $(TOP)/config/RULES_ARCHS
else
TOP= ..
include $(TOP)/configure/CONFIG
endif
TOP= ..
include $(TOP)/configure/CONFIG
PROD = streamApp
DBD = streamApp.dbd