EPICS_driver_modules/StreamDevice
0
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
zimoch
2020-07-30 17:39:29 +02:00
parent 1cace82a70
commit bf55d4c202
5 changed files with 14 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

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

19
Makefile
View File

@ -21,21 +21,10 @@
# along with StreamDevice. If not, see https://www.gnu.org/licenses/. # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
#########################################################################/ #########################################################################/
TOP = .. TOP = .
ifneq ($(wildcard ../configure),) DIRS = configure
# We are in an EPICS R3.14+ <TOP> location src_DEPEND_DIRS := $(DIRS)
include $(TOP)/configure/CONFIG 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
DIRS += src DIRS += src
DIRS += streamApp DIRS += streamApp

8
docs/setup.html
View File

@ -54,15 +54,17 @@ git clone https://github.com/paulscherrerinstitute/StreamDevice.git
<p class="new"> <p class="new">
<em>StreamDevice</em> now comes with a standard <em>StreamDevice</em> now comes with a standard
<kbd>configure</kbd> directory. <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. directory as in previous versions.
It will automatically detect <em>&lt;top&gt;</em> locations It will automatically detect <em>&lt;top&gt;</em> locations
from the presence of <kbd>../configure</kbd> or <kbd>../config</kbd> 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>
<p class="new"> <p class="new">
Edit the <kbd>configure/RELEASE</kbd> file to specify the install location 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> <pre>
EPICS_BASE=/home/epics/base-3.16.1 EPICS_BASE=/home/epics/base-3.16.1
</pre> </pre>

12
src/Makefile
View File

@ -21,16 +21,8 @@
# along with StreamDevice. If not, see https://www.gnu.org/licenses/. # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
#########################################################################/ #########################################################################/
TOP = ../.. TOP= ..
ifneq ($(wildcard ../../configure),) include $(TOP)/configure/CONFIG
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
-include CONFIG_STREAM -include CONFIG_STREAM
-include ../CONFIG_STREAM -include ../CONFIG_STREAM

12
streamApp/Makefile
View File

@ -21,16 +21,8 @@
# along with StreamDevice. If not, see https://www.gnu.org/licenses/. # along with StreamDevice. If not, see https://www.gnu.org/licenses/.
#########################################################################/ #########################################################################/
TOP = ../.. TOP= ..
ifneq ($(wildcard ../../configure),) include $(TOP)/configure/CONFIG
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
PROD = streamApp PROD = streamApp
DBD = streamApp.dbd DBD = streamApp.dbd