From 5883622f59980ca52edb65e1ecd62f1f6874fd5a Mon Sep 17 00:00:00 2001 From: "Janet B. Anderson" Date: Mon, 20 Sep 1999 19:43:29 +0000 Subject: [PATCH] changes for 3.14 --- src/makeBaseApp/Makefile | 84 +++++-------------- src/makeBaseApp/makeBaseApp.pl | 22 ++--- src/makeBaseApp/top/Makefile | 2 +- src/makeBaseApp/top/config/CONFIG_APP | 22 ----- src/makeBaseApp/top/config/Makefile | 9 -- src/makeBaseApp/top/config/Makefile.Host | 19 ----- src/makeBaseApp/top/config/Makefile.Vx | 19 ----- src/makeBaseApp/top/config/RULES.Host | 3 - src/makeBaseApp/top/config/RULES.Vx | 9 -- src/makeBaseApp/top/config/RULES.ioc | 9 -- src/makeBaseApp/top/config/RULES_ARCHS | 2 - src/makeBaseApp/top/config/RULES_DIRS | 2 - .../top/{config => configure}/CONFIG | 1 + src/makeBaseApp/top/configure/CONFIG_APP | 35 ++++++++ src/makeBaseApp/top/configure/Makefile | 19 +++++ .../top/{config => configure}/RELEASE | 0 .../top/{config => configure}/RULES.Db | 10 ++- src/makeBaseApp/top/configure/RULES.ioc | 9 ++ .../top/{config => configure}/RULES.iocBoot | 2 +- .../RULES.registerRecordDeviceDriver | 0 src/makeBaseApp/top/configure/RULES_BUILD | 2 + src/makeBaseApp/top/configure/RULES_DIRS | 2 + .../top/{config => configure}/RULES_TOP | 2 +- .../makeConfigAppInclude.pl | 4 +- .../{config => configure}/makeDbDepends.pl | 0 .../makeIocCdCommands.pl | 2 +- .../top/{config => configure}/replaceVAR.pl | 0 src/makeBaseApp/top/exampleApp/src/Makefile | 24 +++--- src/makeBaseApp/top/exampleBoot/Makefile | 4 +- src/makeBaseApp/top/exampleBoot/ioc/Makefile | 4 +- src/makeBaseApp/top/simpleApp/Db/Makefile | 31 ++++++- .../top/simpleApp/Db/Makefile.Host | 30 ------- src/makeBaseApp/top/simpleApp/Makefile | 4 +- src/makeBaseApp/top/simpleApp/src/Makefile | 3 +- src/makeBaseApp/top/simpleBoot/Makefile | 4 +- src/makeBaseApp/top/simpleBoot/ioc/Makefile | 4 +- 36 files changed, 163 insertions(+), 235 deletions(-) delete mode 100644 src/makeBaseApp/top/config/CONFIG_APP delete mode 100644 src/makeBaseApp/top/config/Makefile delete mode 100644 src/makeBaseApp/top/config/Makefile.Host delete mode 100644 src/makeBaseApp/top/config/Makefile.Vx delete mode 100644 src/makeBaseApp/top/config/RULES.Host delete mode 100644 src/makeBaseApp/top/config/RULES.Vx delete mode 100644 src/makeBaseApp/top/config/RULES.ioc delete mode 100644 src/makeBaseApp/top/config/RULES_ARCHS delete mode 100644 src/makeBaseApp/top/config/RULES_DIRS rename src/makeBaseApp/top/{config => configure}/CONFIG (69%) create mode 100644 src/makeBaseApp/top/configure/CONFIG_APP create mode 100644 src/makeBaseApp/top/configure/Makefile rename src/makeBaseApp/top/{config => configure}/RELEASE (100%) rename src/makeBaseApp/top/{config => configure}/RULES.Db (96%) create mode 100644 src/makeBaseApp/top/configure/RULES.ioc rename src/makeBaseApp/top/{config => configure}/RULES.iocBoot (59%) rename src/makeBaseApp/top/{config => configure}/RULES.registerRecordDeviceDriver (100%) create mode 100644 src/makeBaseApp/top/configure/RULES_BUILD create mode 100644 src/makeBaseApp/top/configure/RULES_DIRS rename src/makeBaseApp/top/{config => configure}/RULES_TOP (53%) rename src/makeBaseApp/top/{config => configure}/makeConfigAppInclude.pl (95%) rename src/makeBaseApp/top/{config => configure}/makeDbDepends.pl (100%) rename src/makeBaseApp/top/{config => configure}/makeIocCdCommands.pl (97%) rename src/makeBaseApp/top/{config => configure}/replaceVAR.pl (100%) delete mode 100644 src/makeBaseApp/top/simpleApp/Db/Makefile.Host diff --git a/src/makeBaseApp/Makefile b/src/makeBaseApp/Makefile index dfe7295ac..19db019e5 100644 --- a/src/makeBaseApp/Makefile +++ b/src/makeBaseApp/Makefile @@ -5,96 +5,52 @@ include $(TOP)/configure/CONFIG TEMPLATES_DIR = makeBaseApp TEMPLATES += top/Makefile +TEMPLATES += top/configure/CONFIG +TEMPLATES += top/configure/CONFIG_APP TEMPLATES += top/configure/RELEASE TEMPLATES += top/configure/RULES.Db +TEMPLATES += top/configure/RULES_BUILD +TEMPLATES += top/configure/RULES_DIRS +TEMPLATES += top/configure/RULES_TOP TEMPLATES += top/configure/RULES.ioc TEMPLATES += top/configure/RULES.iocBoot +TEMPLATES += top/configure/RULES.registerRecordDeviceDriver + +TEMPLATES += top/configure/Makefile +TEMPLATES += top/configure/makeConfigAppInclude.pl TEMPLATES += top/configure/makeDbDepends.pl TEMPLATES += top/configure/makeIocCdCommands.pl TEMPLATES += top/configure/replaceVAR.pl -TEMPLATES += $(TOP)/configure/CONFIG -TEMPLATES += $(TOP)/configure/CONFIG.CrossCommon -TEMPLATES += $(TOP)/configure/CONFIG.Host.WIN32 -TEMPLATES += $(TOP)/configure/CONFIG.Host.linux -TEMPLATES += $(TOP)/configure/CONFIG.Host.linux-x86 -TEMPLATES += $(TOP)/configure/CONFIG.Host.solaris -TEMPLATES += $(TOP)/configure/CONFIG.Host.solaris-sparc -TEMPLATES += $(TOP)/configure/CONFIG.Host.sun4-68k -TEMPLATES += $(TOP)/configure/CONFIG.Host.win32-x86 -TEMPLATES += $(TOP)/configure/CONFIG.Target.UnixCommon -TEMPLATES += $(TOP)/configure/CONFIG.Target.linux-x86 -TEMPLATES += $(TOP)/configure/CONFIG.Target.mv162 -TEMPLATES += $(TOP)/configure/CONFIG.Target.mv162lc -TEMPLATES += $(TOP)/configure/CONFIG.Target.mv167 -TEMPLATES += $(TOP)/configure/CONFIG.Target.mv177 -TEMPLATES += $(TOP)/configure/CONFIG.Target.solaris -TEMPLATES += $(TOP)/configure/CONFIG.Target.solaris-sparc -TEMPLATES += $(TOP)/configure/CONFIG.Target.sun4-68k -TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-486 -TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-68040 -TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-68040lc -TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-68060 -TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorks-ppc604 -TEMPLATES += $(TOP)/configure/CONFIG.Target.vxWorksCommon -TEMPLATES += $(TOP)/configure/CONFIG.Target.win32-x86 -TEMPLATES += $(TOP)/configure/CONFIG_BASE_VERSION -TEMPLATES += $(TOP)/configure/CONFIG_COMMON -TEMPLATES += $(TOP)/configure/CONFIG_ENV -TEMPLATES += $(TOP)/configure/CONFIG_EPICS_BASE -TEMPLATES += $(TOP)/configure/CONFIG_SITE -TEMPLATES += $(TOP)/configure/CONFIG_SITE.Host.WIN32-x86 -TEMPLATES += $(TOP)/configure/CONFIG_SITE_ENV -TEMPLATES += $(TOP)/configure/RULES_ARCHS -TEMPLATES += $(TOP)/configure/RULES_BUILD -TEMPLATES += $(TOP)/configure/RULES_DIRS -TEMPLATES += $(TOP)/configure/RULES_TOP -TEMPLATES += $(TOP)/configure/tools/cp.pl -TEMPLATES += $(TOP)/configure/tools/findbase.pl -TEMPLATES += $(TOP)/configure/tools/getrel -TEMPLATES += $(TOP)/configure/tools/installEpics -TEMPLATES += $(TOP)/configure/tools/installEpics.pl -TEMPLATES += $(TOP)/configure/tools/makeMakefile.pl -TEMPLATES += $(TOP)/configure/tools/mkdir.pl -TEMPLATES += $(TOP)/configure/tools/mv.pl -TEMPLATES += $(TOP)/configure/tools/rm.pl -TEMPLATES += $(TOP)/configure/tools/testmkdir - TEMPLATES += top/exampleApp/Makefile TEMPLATES += top/exampleApp/Db/Makefile -TEMPLATES += top/exampleApp/Db/Makefile.Host TEMPLATES += top/exampleApp/Db/dbExample1.db TEMPLATES += top/exampleApp/Db/dbExample2.substitutions TEMPLATES += top/exampleApp/Db/dbExample2.template TEMPLATES += top/exampleApp/src/Makefile -TEMPLATES += top/exampleApp/src/Makefile.Host -TEMPLATES += top/exampleApp/src/Makefile.Vx +TEMPLATES += top/exampleApp/src/base.dbd +TEMPLATES += top/exampleApp/src/baseLIBOBJS TEMPLATES += top/exampleApp/src/caExample.c TEMPLATES += top/exampleApp/src/devXxxSoft.c TEMPLATES += top/exampleApp/src/exampleInclude.dbd TEMPLATES += top/exampleApp/src/sncExample.st TEMPLATES += top/exampleApp/src/xxxRecord.c TEMPLATES += top/exampleApp/src/xxxRecord.dbd -TEMPLATES += top/exampleApp/src/base.dbd -TEMPLATES += top/exampleApp/src/baseLIBOBJS - -TEMPLATES += top/simpleApp/Makefile -TEMPLATES += top/simpleApp/Db/Makefile -TEMPLATES += top/simpleApp/Db/Makefile.Host -TEMPLATES += top/simpleApp/src/Makefile -TEMPLATES += top/simpleApp/src/Makefile.Host -TEMPLATES += top/simpleApp/src/Makefile.Vx - -TEMPLATES += top/simpleBoot/Makefile -TEMPLATES += top/simpleBoot/nfsCommands -TEMPLATES += top/simpleBoot/ioc/Makefile -TEMPLATES += top/simpleBoot/ioc/st.cmd TEMPLATES += top/exampleBoot/Makefile TEMPLATES += top/exampleBoot/nfsCommands TEMPLATES += top/exampleBoot/ioc/Makefile TEMPLATES += top/exampleBoot/ioc/st.cmd +TEMPLATES += top/simpleApp/Makefile +TEMPLATES += top/simpleApp/Db/Makefile +TEMPLATES += top/simpleApp/src/Makefile + +TEMPLATES += top/simpleBoot/Makefile +TEMPLATES += top/simpleBoot/nfsCommands +TEMPLATES += top/simpleBoot/ioc/Makefile +TEMPLATES += top/simpleBoot/ioc/st.cmd + SCRIPTS += makeBaseApp.pl include $(TOP)/configure/RULES_BUILD diff --git a/src/makeBaseApp/makeBaseApp.pl b/src/makeBaseApp/makeBaseApp.pl index 1d629d691..c0b42f69f 100755 --- a/src/makeBaseApp/makeBaseApp.pl +++ b/src/makeBaseApp/makeBaseApp.pl @@ -44,7 +44,7 @@ sub ReplaceFilename { # (filename) } if ($app) { # apptypenameApp itself is dynamic, too $file =~ s|/$apptypename|/$appdir|; - $file =~ s|/$appdir/config|/config/$apptype|; + $file =~ s|/$appdir/configure|/configure/$apptype|; } $file =~ s|_APPNAME_|$appname|; $file =~ s|_APPTYPE_|$apptype|; @@ -78,10 +78,10 @@ if (-r "$top/$apptypename/Replace.pl") { } # -# Copy /Makefile and config files if not present +# Copy /Makefile and configure files if not present # CopyFile("$top/Makefile") unless (-f 'Makefile'); -find(\&FCopyTree, "$top/config") unless (-d 'config'); +find(\&FCopyTree, "$top/configure") unless (-d 'configure'); # # Create ioc directories @@ -130,8 +130,8 @@ sub get_commandline_opts { #no args my ($command) = UnixPath($0); if ($opt_b) { # first choice is -b base $epics_base = UnixPath($opt_b); - } elsif (-r "config/RELEASE") { # second choice is config/RELEASE - open(IN, "config/RELEASE") or die "Cannot open config/RELEASE"; + } elsif (-r "configure/RELEASE") { # second choice is configure/RELEASE + open(IN, "configure/RELEASE") or die "Cannot open configure/RELEASE"; while () { chomp; s/EPICS_BASE\s*=\s*// and $epics_base = UnixPath($_), break; @@ -146,8 +146,8 @@ sub get_commandline_opts { #no args # Locate template top directory if ($opt_T) { # first choice is -T templ-top $top = UnixPath($opt_T); - } elsif (-r "config/RELEASE") { # second choice is config/RELEASE - open(IN, "config/RELEASE") or die "Cannot open config/RELEASE"; + } elsif (-r "configure/RELEASE") { # second choice is configure/RELEASE + open(IN, "configure/RELEASE") or die "Cannot open configure/RELEASE"; while () { chomp; s/TEMPLATE_TOP\s*=\s*// and $top = UnixPath($_), break; @@ -299,16 +299,16 @@ where If not specified, type is taken from environment If not found in environment, \"default\" is used -T top Set the template top directory (where the application templates are) - If not specified, top path is taken from config/RELEASE - If config does not exist, top path is taken from environment + If not specified, top path is taken from configure/RELEASE + If configure does not exist, top path is taken from environment If not found in environment, the templates from EPICS base are used -l List valid application types for this installation If this is specified the other options are not used -a arch Set the IOC architecture (e.g. mv167) If not specified, you will be prompted -b base Set the location of EPICS base (full path) - If not specified, base path is taken from config/RELEASE - If config does not exist, base path is taken from command + If not specified, base path is taken from configure/RELEASE + If configure does not exist, base path is taken from command -d Verbose output (useful for debugging) Environment: diff --git a/src/makeBaseApp/top/Makefile b/src/makeBaseApp/top/Makefile index 6e11df891..5749581bd 100644 --- a/src/makeBaseApp/top/Makefile +++ b/src/makeBaseApp/top/Makefile @@ -1,7 +1,7 @@ #Makefile at top of application tree TOP = . include $(TOP)/configure/CONFIG -DIRS += config +DIRS += configure DIRS += $(wildcard *App) DIRS += $(wildcard *app) DIRS += $(wildcard iocBoot) diff --git a/src/makeBaseApp/top/config/CONFIG_APP b/src/makeBaseApp/top/config/CONFIG_APP deleted file mode 100644 index 38466b2d6..000000000 --- a/src/makeBaseApp/top/config/CONFIG_APP +++ /dev/null @@ -1,22 +0,0 @@ -#CONFIG_APP -include $(TOP)/config/RELEASE --include $(TOP)/config/RELEASE.$(HOST_ARCH) -include $(EPICS_BASE)/config/CONFIG -INSTALL_LOCATION = $(TOP) -ifdef INSTALL_LOCATION_APP -INSTALL_LOCATION = $(INSTALL_LOCATION_APP) -endif - -USER_DBDFLAGS += -I. -I.. -I$(EPICS_BASE)/dbd - -ifdef T_A --include $(TOP)/config/O.$(T_A)/CONFIG_APP_INCLUDE -endif - -# Where to install databases -INSTALL_DB = $(INSTALL_LOCATION)/db -# dbst based database optimization (default: NO) -DB_OPT = NO -# May be overridden if not all databases should be installed -INSTALLDB = $(DB) -include $(TOP)/config/CONFIG diff --git a/src/makeBaseApp/top/config/Makefile b/src/makeBaseApp/top/config/Makefile deleted file mode 100644 index ec3a18069..000000000 --- a/src/makeBaseApp/top/config/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -# -# $Id$ -# - -TOP=.. -include $(TOP)/config/CONFIG_APP - -include $(TOP)/config/RULES_ARCHS - diff --git a/src/makeBaseApp/top/config/Makefile.Host b/src/makeBaseApp/top/config/Makefile.Host deleted file mode 100644 index 262bf8c23..000000000 --- a/src/makeBaseApp/top/config/Makefile.Host +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id$ -# - -TOP=../.. -include $(TOP)/config/CONFIG_APP - -TARGETS = CONFIG_APP_INCLUDE - -include $(TOP)/config/RULES.Host - -ifeq ($(wildcard $(TOP)/config/RELEASE.$(HOST_ARCH)),$(TOP)/config/RELEASE.$(HOST_ARCH)) -CONFIG_APP_INCLUDE: $(TOP)/config/RELEASE.$(HOST_ARCH) -endif - -CONFIG_APP_INCLUDE: $(TOP)/config/RELEASE $(TOP)/config/CONFIG_APP - $(RM) $@ - @$(PERL) $(TOP)/config/makeConfigAppInclude.pl $(T_A) $@ $(TOP) - diff --git a/src/makeBaseApp/top/config/Makefile.Vx b/src/makeBaseApp/top/config/Makefile.Vx deleted file mode 100644 index ff8442d47..000000000 --- a/src/makeBaseApp/top/config/Makefile.Vx +++ /dev/null @@ -1,19 +0,0 @@ -# -# $Id$ -# - -TOP=../.. -include $(TOP)/config/CONFIG_APP - -TARGETS = CONFIG_APP_INCLUDE - -include $(TOP)/config/RULES.Vx - -ifeq ($(wildcard $(TOP)/config/RELEASE.$(HOST_ARCH)),$(TOP)/config/RELEASE.$(HOST_ARCH)) -CONFIG_APP_INCLUDE: $(TOP)/config/RELEASE.$(HOST_ARCH) -endif - -CONFIG_APP_INCLUDE: $(TOP)/config/RELEASE $(TOP)/config/CONFIG_APP - $(RM) $@ - @$(PERL) $(TOP)/config/makeConfigAppInclude.pl $(T_A) $@ $(TOP) - diff --git a/src/makeBaseApp/top/config/RULES.Host b/src/makeBaseApp/top/config/RULES.Host deleted file mode 100644 index ffbb575f1..000000000 --- a/src/makeBaseApp/top/config/RULES.Host +++ /dev/null @@ -1,3 +0,0 @@ -#RULES.Host - -include $(EPICS_BASE)/config/RULES.Host diff --git a/src/makeBaseApp/top/config/RULES.Vx b/src/makeBaseApp/top/config/RULES.Vx deleted file mode 100644 index 308a2ef71..000000000 --- a/src/makeBaseApp/top/config/RULES.Vx +++ /dev/null @@ -1,9 +0,0 @@ -#RULES.Vx -include $(EPICS_BASE)/config/RULES.Vx -inc:: $(INSTALL_INCREC) -# -# turn off implicit rules search for all binaries in base -# -#Jeff says this turned off all dependency checking -#????? What to do???? -#$(EPICS_BASE_BIN)/* : ; diff --git a/src/makeBaseApp/top/config/RULES.ioc b/src/makeBaseApp/top/config/RULES.ioc deleted file mode 100644 index c8a3c0a8a..000000000 --- a/src/makeBaseApp/top/config/RULES.ioc +++ /dev/null @@ -1,9 +0,0 @@ -#RULES.ioc -include $(EPICS_BASE)/config/RULES_DIRS -buildInstall:: cdCommands - -cdCommands: Makefile - $(PERL) $(TOP)/config/makeIocCdCommands.pl $(ARCH) - -clean:: - @$(RM) cdCommands diff --git a/src/makeBaseApp/top/config/RULES_ARCHS b/src/makeBaseApp/top/config/RULES_ARCHS deleted file mode 100644 index 812c5c2ee..000000000 --- a/src/makeBaseApp/top/config/RULES_ARCHS +++ /dev/null @@ -1,2 +0,0 @@ -#RULES_ARCHS -include $(EPICS_BASE)/config/RULES_ARCHS diff --git a/src/makeBaseApp/top/config/RULES_DIRS b/src/makeBaseApp/top/config/RULES_DIRS deleted file mode 100644 index 1e1c54ede..000000000 --- a/src/makeBaseApp/top/config/RULES_DIRS +++ /dev/null @@ -1,2 +0,0 @@ -#RULES_DIRS -include $(EPICS_BASE)/config/RULES_DIRS diff --git a/src/makeBaseApp/top/config/CONFIG b/src/makeBaseApp/top/configure/CONFIG similarity index 69% rename from src/makeBaseApp/top/config/CONFIG rename to src/makeBaseApp/top/configure/CONFIG index 56e8f1224..6db905e2c 100644 --- a/src/makeBaseApp/top/config/CONFIG +++ b/src/makeBaseApp/top/configure/CONFIG @@ -1,3 +1,4 @@ #CONFIG +include $(TOP)/configure/CONFIG_APP # Add any changes to make rules here #CROSS_COMPILER_TARGET_ARCHS = mv167 diff --git a/src/makeBaseApp/top/configure/CONFIG_APP b/src/makeBaseApp/top/configure/CONFIG_APP new file mode 100644 index 000000000..5b6dbd575 --- /dev/null +++ b/src/makeBaseApp/top/configure/CONFIG_APP @@ -0,0 +1,35 @@ +#CONFIG_APP +include $(TOP)/configure/RELEASE +-include $(TOP)/configure/RELEASE.$(HOST_ARCH) +CONFIG=$(EPICS_BASE)/configure +include $(EPICS_BASE)/configure/CONFIG +INSTALL_LOCATION = $(TOP) +ifdef INSTALL_LOCATION_APP +INSTALL_LOCATION = $(INSTALL_LOCATION_APP) +endif + +#Other share areas can be added similar to following +#ifdef +#USR_INCLUDES += -I$()/include +#BIN = $()/bin/$(T_A) +#endif + +ifdef SHARE +USR_INCLUDES += -I$(SHARE)/include +SHARE_BIN = $(SHARE)/bin/$(T_A) +USER_DBDFLAGS += -I .. -I $(SHARE)/dbd -I $(EPICS_BASE)/dbd +endif + +#Following only works if host provides soft links +ifdef MASTER_IOCAPPS +USR_INCLUDES += -I$(MASTER_IOCAPPS)/include +MASTER_IOCAPPS_BIN = $(MASTER_IOCAPPS)/bin/$(T_A) +endif + +# Where to install databases +INSTALL_DB = $(INSTALL_LOCATION)/db +# dbst based database optimization (default: NO) +DB_OPT = NO +# May be overridden if not all databases should be installed +INSTALLDB = $(DB) +#######include $(TOP)/configure/CONFIG diff --git a/src/makeBaseApp/top/configure/Makefile b/src/makeBaseApp/top/configure/Makefile new file mode 100644 index 000000000..65fd1d270 --- /dev/null +++ b/src/makeBaseApp/top/configure/Makefile @@ -0,0 +1,19 @@ +# +# $Id$ +# + +TOP=.. +include $(TOP)/configure/CONFIG + +TARGETS = CONFIG_APP_INCLUDE + +include $(TOP)/configure/RULES_BUILD + +ifeq ($(wildcard $(TOP)/configure/RELEASE.$(HOST_ARCH)),$(TOP)/configure/RELEASE.$(HOST_ARCH)) +CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE.$(HOST_ARCH) +endif + +CONFIG_APP_INCLUDE: $(TOP)/configure/RELEASE $(TOP)/configure/CONFIG_APP + $(RM) $@ + @$(PERL) $(TOP)/configure/makeConfigAppInclude.pl $(T_A) $@ $(TOP) + diff --git a/src/makeBaseApp/top/config/RELEASE b/src/makeBaseApp/top/configure/RELEASE similarity index 100% rename from src/makeBaseApp/top/config/RELEASE rename to src/makeBaseApp/top/configure/RELEASE diff --git a/src/makeBaseApp/top/config/RULES.Db b/src/makeBaseApp/top/configure/RULES.Db similarity index 96% rename from src/makeBaseApp/top/config/RULES.Db rename to src/makeBaseApp/top/configure/RULES.Db index c9ac21cb2..ba397394d 100644 --- a/src/makeBaseApp/top/config/RULES.Db +++ b/src/makeBaseApp/top/configure/RULES.Db @@ -1,9 +1,13 @@ #RULES.Db + +include $(CONFIG)/RULES_ARCHS +ifdef T_A + MAKEBPT = $(EPICS_BASE_HOST_BIN)/makeBpt$(EXE) DBEXPAND = $(EPICS_BASE_HOST_BIN)/dbExpand$(EXE) DBST = dbst -MAKEDBDEPENDS = $(PERL) $(TOP)/config/makeDbDepends.pl -REPLACEVAR = $(PERL) $(TOP)/config/replaceVAR.pl +MAKEDBDEPENDS = $(PERL) $(TOP)/configure/makeDbDepends.pl +REPLACEVAR = $(PERL) $(TOP)/configure/replaceVAR.pl ifndef WIN32 TOUCH = touch else @@ -166,3 +170,5 @@ DEPENDS: $(filter $(patsubst %.db, %.substitutions, $(DB)), $(wildcard *.substit @$(MAKEDBDEPENDS) $^ -include DEPENDS + +endif diff --git a/src/makeBaseApp/top/configure/RULES.ioc b/src/makeBaseApp/top/configure/RULES.ioc new file mode 100644 index 000000000..67f622afa --- /dev/null +++ b/src/makeBaseApp/top/configure/RULES.ioc @@ -0,0 +1,9 @@ +#RULES.ioc +include $(EPICS_BASE)/configure/RULES_DIRS +buildInstall:: cdCommands + +cdCommands: Makefile + $(PERL) $(TOP)/configure/makeIocCdCommands.pl $(ARCH) + +clean:: + @$(RM) cdCommands diff --git a/src/makeBaseApp/top/config/RULES.iocBoot b/src/makeBaseApp/top/configure/RULES.iocBoot similarity index 59% rename from src/makeBaseApp/top/config/RULES.iocBoot rename to src/makeBaseApp/top/configure/RULES.iocBoot index 60988fd05..bb7c780fc 100644 --- a/src/makeBaseApp/top/config/RULES.iocBoot +++ b/src/makeBaseApp/top/configure/RULES.iocBoot @@ -1,4 +1,4 @@ #RULES.iocBoot DIRS += $(wildcard ioc*) DIRS += $(wildcard as*) -include $(EPICS_BASE)/config/RULES_DIRS +include $(EPICS_BASE)/configure/RULES_DIRS diff --git a/src/makeBaseApp/top/config/RULES.registerRecordDeviceDriver b/src/makeBaseApp/top/configure/RULES.registerRecordDeviceDriver similarity index 100% rename from src/makeBaseApp/top/config/RULES.registerRecordDeviceDriver rename to src/makeBaseApp/top/configure/RULES.registerRecordDeviceDriver diff --git a/src/makeBaseApp/top/configure/RULES_BUILD b/src/makeBaseApp/top/configure/RULES_BUILD new file mode 100644 index 000000000..116112461 --- /dev/null +++ b/src/makeBaseApp/top/configure/RULES_BUILD @@ -0,0 +1,2 @@ +#RULES_BUILD +include $(EPICS_BASE)/configure/RULES_BUILD diff --git a/src/makeBaseApp/top/configure/RULES_DIRS b/src/makeBaseApp/top/configure/RULES_DIRS new file mode 100644 index 000000000..804faee5e --- /dev/null +++ b/src/makeBaseApp/top/configure/RULES_DIRS @@ -0,0 +1,2 @@ +#RULES_DIRS +include $(EPICS_BASE)/configure/RULES_DIRS diff --git a/src/makeBaseApp/top/config/RULES_TOP b/src/makeBaseApp/top/configure/RULES_TOP similarity index 53% rename from src/makeBaseApp/top/config/RULES_TOP rename to src/makeBaseApp/top/configure/RULES_TOP index d23bc9ca6..03e46a5e0 100644 --- a/src/makeBaseApp/top/config/RULES_TOP +++ b/src/makeBaseApp/top/configure/RULES_TOP @@ -1,5 +1,5 @@ #RULES_TOP -include $(EPICS_BASE)/config/RULES_TOP +include $(EPICS_BASE)/configure/RULES_TOP uninstall:: @$(RMDIR) $(INSTALL_DB) diff --git a/src/makeBaseApp/top/config/makeConfigAppInclude.pl b/src/makeBaseApp/top/configure/makeConfigAppInclude.pl similarity index 95% rename from src/makeBaseApp/top/config/makeConfigAppInclude.pl rename to src/makeBaseApp/top/configure/makeConfigAppInclude.pl index 43bfc58df..d83a1870a 100644 --- a/src/makeBaseApp/top/config/makeConfigAppInclude.pl +++ b/src/makeBaseApp/top/configure/makeConfigAppInclude.pl @@ -15,8 +15,8 @@ print OUT "#Do not modify thie file.\n"; print OUT "#This file is created during the build.\n"; @files =(); -push(@files,"$top/config/RELEASE"); -push(@files,"$top/config/RELEASE.${arch}"); +push(@files,"$top/configure/RELEASE"); +push(@files,"$top/configure/RELEASE.${arch}"); foreach $file (@files) { if (-r "$file") { open(IN, "$file") or die "Cannot open $file\n"; diff --git a/src/makeBaseApp/top/config/makeDbDepends.pl b/src/makeBaseApp/top/configure/makeDbDepends.pl similarity index 100% rename from src/makeBaseApp/top/config/makeDbDepends.pl rename to src/makeBaseApp/top/configure/makeDbDepends.pl diff --git a/src/makeBaseApp/top/config/makeIocCdCommands.pl b/src/makeBaseApp/top/configure/makeIocCdCommands.pl similarity index 97% rename from src/makeBaseApp/top/config/makeIocCdCommands.pl rename to src/makeBaseApp/top/configure/makeIocCdCommands.pl index 0c1962f02..090aadec9 100644 --- a/src/makeBaseApp/top/config/makeIocCdCommands.pl +++ b/src/makeBaseApp/top/configure/makeIocCdCommands.pl @@ -24,7 +24,7 @@ print OUT "top = \"$top\"\n"; $topbin = "${top}/bin/${arch}"; #skip check that top/bin/${arch} exists; src may not have been builT print OUT "topbin = \"$topbin\"\n"; -$release = "$top/config/RELEASE"; +$release = "$top/configure/RELEASE"; if (-r "$release") { open(IN, "$release") or die "Cannot open $release\n"; while ($line = ) { diff --git a/src/makeBaseApp/top/config/replaceVAR.pl b/src/makeBaseApp/top/configure/replaceVAR.pl similarity index 100% rename from src/makeBaseApp/top/config/replaceVAR.pl rename to src/makeBaseApp/top/configure/replaceVAR.pl diff --git a/src/makeBaseApp/top/exampleApp/src/Makefile b/src/makeBaseApp/top/exampleApp/src/Makefile index 625f2ca8d..b5fbe78a0 100644 --- a/src/makeBaseApp/top/exampleApp/src/Makefile +++ b/src/makeBaseApp/top/exampleApp/src/Makefile @@ -3,8 +3,7 @@ include $(TOP)/configure/CONFIG #---------------------------------------- # ADD MACRO DEFINITIONS AFTER THIS LINE -#USER_DBDFLAGS += - +USER_DBDFLAGS += -I .. -I $(EPICS_BASE)/dbd RECTYPES += xxxRecord.h DBDEXPAND = exampleInclude.dbd DBDNAME = exampleApp.dbd @@ -17,12 +16,15 @@ PROD_LIBS += Osi ca_DIR = $(EPICS_BASE_LIB) Db_DIR = $(EPICS_BASE_LIB) Com_DIR = $(EPICS_BASE_LIB) +Osi_DIR = $(EPICS_BASE_LIB) PROD += caExample -LIBOBJS += xxxRecord.o -LIBOBJS += devXxxSoft.o -LIBOBJS += sncExample.o +IOC_LIBRARY = exampleLib + +exampleLib_SRCS += xxxRecord.c +exampleLib_SRCS += devXxxSoft.c +exampleLib_SRCS += sncExample.c LIBOBJS += $(EPICS_BASE_BIN)/iocCore LIBOBJS += $(EPICS_BASE_BIN)/seq @@ -33,23 +35,17 @@ LIBOBJS += $(EPICS_BASE_BIN)/seq # or EXPANDED_DBD = exampleApp.dbd -LIBOBJS += registerRecordDeviceDriver.o +exampleLib_SRCS += registerRecordDeviceDriver.c #end choices - DBD = exampleApp.dbd -include ../baseLIBOBJS - -LIBOBJS += $(EPICS_BASE_BIN)/iocCore -LIBOBJS += $(EPICS_BASE_BIN)/seq - -IOC_LIBRARY = exampleLib +-include ../baseLIBOBJS #Note that the command line that builds the #library $(LIBNAME) may be HUGE (>3kB) # include $(TOP)/configure/RULES_BUILD -include $(TOP)/config/RULES.registerRecordDeviceDriver +include $(TOP)/configure/RULES.registerRecordDeviceDriver #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/src/makeBaseApp/top/exampleBoot/Makefile b/src/makeBaseApp/top/exampleBoot/Makefile index d64511f37..b3d4b6588 100644 --- a/src/makeBaseApp/top/exampleBoot/Makefile +++ b/src/makeBaseApp/top/exampleBoot/Makefile @@ -1,4 +1,4 @@ TOP = .. -include $(TOP)/config/CONFIG_APP +include $(TOP)/configure/CONFIG DIRS += $(wildcard *ioc*) -include $(TOP)/config/RULES.iocBoot +include $(TOP)/configure/RULES.iocBoot diff --git a/src/makeBaseApp/top/exampleBoot/ioc/Makefile b/src/makeBaseApp/top/exampleBoot/ioc/Makefile index 9b94f08d1..59d29efcd 100644 --- a/src/makeBaseApp/top/exampleBoot/ioc/Makefile +++ b/src/makeBaseApp/top/exampleBoot/ioc/Makefile @@ -1,4 +1,4 @@ TOP = ../.. -include $(TOP)/config/CONFIG_APP +include $(TOP)/configure/CONFIG ARCH = _ARCH_ -include $(TOP)/config/RULES.ioc +include $(TOP)/configure/RULES.ioc diff --git a/src/makeBaseApp/top/simpleApp/Db/Makefile b/src/makeBaseApp/top/simpleApp/Db/Makefile index 0380f4bf8..15c24650c 100644 --- a/src/makeBaseApp/top/simpleApp/Db/Makefile +++ b/src/makeBaseApp/top/simpleApp/Db/Makefile @@ -1,3 +1,30 @@ TOP=../.. -include $(TOP)/config/CONFIG_APP -include $(TOP)/config/RULES_ARCHS +include $(TOP)/configure/CONFIG + +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Optimization of DB files using dbst (default: NO) +#DB_OPT = YES + +#---------------------------------------------------- +# Optimization needs the name of the appropriate +# dbd file (compare with ../src/Makefile.Vx) +#DBDNAME = _APPNAME_.dbd + +#---------------------------------------------------- +# Add databases, templates, substitutions like this +#DB += _APPNAME_.db + +#---------------------------------------------------- +# Declare template files which do not show up in DB +#USES_TEMPLATE += _APPNAME_.template + +#---------------------------------------------------- +# The following lines are for local dbd expansion +#DBDEXPAND = _APPNAME_Include.dbd + +include $(TOP)/configure/RULES.Db +#---------------------------------------- +# ADD RULES AFTER THIS LINE diff --git a/src/makeBaseApp/top/simpleApp/Db/Makefile.Host b/src/makeBaseApp/top/simpleApp/Db/Makefile.Host deleted file mode 100644 index e39575a44..000000000 --- a/src/makeBaseApp/top/simpleApp/Db/Makefile.Host +++ /dev/null @@ -1,30 +0,0 @@ -# Makefile.Host -TOP = ../../.. -include $(TOP)/config/CONFIG_APP -#---------------------------------------- -# ADD MACRO DEFINITIONS AFTER THIS LINE - -#---------------------------------------------------- -# Optimization of DB files using dbst (default: NO) -#DB_OPT = YES - -#---------------------------------------------------- -# Optimization needs the name of the appropriate -# dbd file (compare with ../src/Makefile.Vx) -#DBDNAME = _APPNAME_.dbd - -#---------------------------------------------------- -# Add databases, templates, substitutions like this -#DB += _APPNAME_.db - -#---------------------------------------------------- -# Declare template files which do not show up in DB -#USES_TEMPLATE += _APPNAME_.template - -#---------------------------------------------------- -# The following lines are for local dbd expansion -#DBDEXPAND = _APPNAME_Include.dbd - -include $(TOP)/config/RULES.Db -#---------------------------------------- -# ADD RULES AFTER THIS LINE diff --git a/src/makeBaseApp/top/simpleApp/Makefile b/src/makeBaseApp/top/simpleApp/Makefile index e26216db6..60f5ad48e 100644 --- a/src/makeBaseApp/top/simpleApp/Makefile +++ b/src/makeBaseApp/top/simpleApp/Makefile @@ -1,7 +1,7 @@ TOP = .. -include $(TOP)/config/CONFIG_APP +include $(TOP)/configure/CONFIG DIRS += $(wildcard *src*) DIRS += $(wildcard *Src*) DIRS += $(wildcard *db*) DIRS += $(wildcard *Db*) -include $(TOP)/config/RULES_DIRS +include $(TOP)/configure/RULES_DIRS diff --git a/src/makeBaseApp/top/simpleApp/src/Makefile b/src/makeBaseApp/top/simpleApp/src/Makefile index 6536ab853..c92d9e3af 100644 --- a/src/makeBaseApp/top/simpleApp/src/Makefile +++ b/src/makeBaseApp/top/simpleApp/src/Makefile @@ -28,9 +28,8 @@ Osi_DIR = $(EPICS_BASE_LIB) #LIBOBJS += registerRecordDeviceDriver.o #end choices - include $(TOP)/configure/RULES_BUILD -include $(TOP)/config/RULES.registerRecordDeviceDriver +include $(TOP)/configure/RULES.registerRecordDeviceDriver #---------------------------------------- # ADD RULES AFTER THIS LINE diff --git a/src/makeBaseApp/top/simpleBoot/Makefile b/src/makeBaseApp/top/simpleBoot/Makefile index d64511f37..b3d4b6588 100644 --- a/src/makeBaseApp/top/simpleBoot/Makefile +++ b/src/makeBaseApp/top/simpleBoot/Makefile @@ -1,4 +1,4 @@ TOP = .. -include $(TOP)/config/CONFIG_APP +include $(TOP)/configure/CONFIG DIRS += $(wildcard *ioc*) -include $(TOP)/config/RULES.iocBoot +include $(TOP)/configure/RULES.iocBoot diff --git a/src/makeBaseApp/top/simpleBoot/ioc/Makefile b/src/makeBaseApp/top/simpleBoot/ioc/Makefile index 9b94f08d1..59d29efcd 100644 --- a/src/makeBaseApp/top/simpleBoot/ioc/Makefile +++ b/src/makeBaseApp/top/simpleBoot/ioc/Makefile @@ -1,4 +1,4 @@ TOP = ../.. -include $(TOP)/config/CONFIG_APP +include $(TOP)/configure/CONFIG ARCH = _ARCH_ -include $(TOP)/config/RULES.ioc +include $(TOP)/configure/RULES.ioc