Cleanup, throw out unused files.
Warning, cannot access the index:
_darcs/index: opening of '_darcs/index' failed: permission denied (Permission denied)
diff -rN -u old-branch-2-0/configure/CONFIG new-branch-2-0/configure/CONFIG
--- old-branch-2-0/configure/CONFIG 2022-09-28 12:12:29.333633015 +0200
+++ new-branch-2-0/configure/CONFIG 2022-09-28 12:12:29.333633015 +0200
@@ -1,14 +1,26 @@
-#CONFIG
-include $(TOP)/configure/CONFIG_APP
-# Add any changes to make definitions here
-
-#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
-
-# Use this when your IOC and the host use different paths
-# to access the application. Typically this will be
-# used with the Microsoft FTP server or with NFS mounts. Use
-# is indicated by failure of the cdCommands script on
-# vxWorks. You must rebuild in the iocBoot directory
-# before this takes effect.
-#IOCS_APPL_TOP = <the top of the application as seen by the IOC>
-SEQ_VERSION = 2.0.10
+# CONFIG
+
+include $(TOP)/configure/RELEASE
+-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
+
+ifdef T_A
+ -include $(TOP)/configure/RELEASE.Common.$(T_A)
+ -include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A)
+endif
+
+CONFIG=$(EPICS_BASE)/configure
+include $(CONFIG)/CONFIG
+
+# Override for definition in base
+INSTALL_LOCATION = $(TOP)
+
+include $(TOP)/configure/CONFIG_SITE
+-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH)
+
+ifdef T_A
+ -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A)
+ -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A)
+ -include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
+endif
+
+SEQ_VERSION = 2.0.11
diff -rN -u old-branch-2-0/configure/CONFIG_APP new-branch-2-0/configure/CONFIG_APP
--- old-branch-2-0/configure/CONFIG_APP 2022-09-28 12:12:29.333633015 +0200
+++ new-branch-2-0/configure/CONFIG_APP 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-# CONFIG_APP
-
-include $(TOP)/configure/RELEASE
--include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH)
-CONFIG=$(EPICS_BASE)/configure
-include $(CONFIG)/CONFIG
-INSTALL_LOCATION = $(TOP)
-ifdef INSTALL_LOCATION_APP
-INSTALL_LOCATION = $(INSTALL_LOCATION_APP)
-endif
-
-ifdef T_A
--include $(TOP)/configure/O.$(T_A)/CONFIG_APP_INCLUDE
-endif
-
-# dbst based database optimization (default: NO)
-DB_OPT = NO
diff -rN -u old-branch-2-0/configure/CONFIG_SITE new-branch-2-0/configure/CONFIG_SITE
--- old-branch-2-0/configure/CONFIG_SITE 1970-01-01 01:00:00.000000000 +0100
+++ new-branch-2-0/configure/CONFIG_SITE 2022-09-28 12:12:29.333633015 +0200
@@ -0,0 +1,18 @@
+# CONFIG_SITE - site-specific build configuration settings
+
+# Enable build of different process variable access methods
+PVCA = TRUE
+PVFILE = FALSE
+PVTKL = FALSE
+
+# To restrict the architectures to cross-compile for, set this:
+#CROSS_COMPILER_TARGET_ARCHS = vxWorks-68040
+
+# To install somewhere other than $(TOP) set this:
+#INSTALL_LOCATION_APP = <install path>
+
+# Use this when your IOC and the host use different paths
+# to access the application. Typically this will be
+# used with the Microsoft FTP server or with NFS mounts.
+#IOCS_APPL_TOP = <IOC's path to TOP>
+
diff -rN -u old-branch-2-0/configure/Makefile new-branch-2-0/configure/Makefile
--- old-branch-2-0/configure/Makefile 2022-09-28 12:12:29.333633015 +0200
+++ new-branch-2-0/configure/Makefile 2022-09-28 12:12:29.337633113 +0200
@@ -1,10 +1,12 @@
# Makefile
TOP=..
-
include $(TOP)/configure/CONFIG
-CHECK_RELEASE = NO
+# Set the following to NO to disable consistency checking of
+# the support applications defined in $(TOP)/configure/RELEASE
+CHECK_RELEASE = YES
+
TARGETS = $(CONFIG_TARGETS)
CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS)))
diff -rN -u old-branch-2-0/configure/RELEASE new-branch-2-0/configure/RELEASE
--- old-branch-2-0/configure/RELEASE 2022-09-28 12:12:29.333633015 +0200
+++ new-branch-2-0/configure/RELEASE 2022-09-28 12:12:29.337633113 +0200
@@ -1,20 +1,8 @@
-#RELEASE Location of external products
-#Macro substitution is not allowed in the location defintions
+# RELEASE - Location of external products
# You should do a "gnumake clean uninstall install" in the application
# top directory each time changes are made to this file
-# If you don't want to install into $(TOP) then
-# define INSTALL_LOCATION_APP here
-#INSTALL_LOCATION_APP=<fullpathname>
-
-EPICS_BASE=/usr/local/iocapps/R3.14.7/support/base/3-14-7
-TEMPLATE_TOP=$(EPICS_BASE)/templates/makeBaseApp/top
-
-#
-# Enable appropriate process variable access methods
-#
-PVCA = TRUE
-PVFILE = FALSE
-PVTKL = FALSE
+#EPICS_BASE=/usr/local/iocapps/R3.14.8.2/base/3-14-8-2-asd1
+EPICS_BASE=/home/phoebus/ANJ/epics/base/3-14-dev
diff -rN -u old-branch-2-0/configure/RULES.iocBoot new-branch-2-0/configure/RULES.iocBoot
--- old-branch-2-0/configure/RULES.iocBoot 2022-09-28 12:12:29.333633015 +0200
+++ new-branch-2-0/configure/RULES.iocBoot 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-#RULES.iocBoot
-DIRS += $(wildcard ioc*)
-DIRS += $(wildcard as*)
-include $(EPICS_BASE)/configure/RULES_DIRS
diff -rN -u old-branch-2-0/configure/RULES_BUILD new-branch-2-0/configure/RULES_BUILD
--- old-branch-2-0/configure/RULES_BUILD 2022-09-28 12:12:29.333633015 +0200
+++ new-branch-2-0/configure/RULES_BUILD 1970-01-01 01:00:00.000000000 +0100
@@ -1,69 +0,0 @@
-# $Id: RULES_BUILD,v 1.14 2004-07-13 19:39:10 jba Exp $
-#
-# State notation language (snc) rules
-# Each <name>.st (or <name>.stt) produces <name>.c
-
-
-#--------------------------------------------------
-# snc flags
-
-TARGET_SNCFLAGS = $($(basename $@)_SNCFLAGS) $($(basename $@)_SNCFLAGS_$(OS_CLASS))
-
-# addons - concat os specific sequencer flags
-ifneq ($(strip $(SNCFLAGS_$(OS_CLASS))),)
-SNCFLAGS += $(subst -nil-,,$(SNCFLAGS_$(OS_CLASS)))
-else
-ifdef SNCFLAGS_DEFAULT
-SNCFLAGS += $(SNCFLAGS_DEFAULT)
-endif
-endif
-
-#--------------------------------------------------
-# vpath
-
-vpath %.st $(USR_VPATH) $(ALL_SRC_DIRS)
-vpath %.stt $(USR_VPATH) $(ALL_SRC_DIRS)
-
-#--------------------------------------------------
-# depends rule needs .c files
-
-SNC_SRC_FILES = $(basename $(notdir $(filter %.st %.stt,$(SRC_FILES))))
-SNC_CSRC_FILES = $(addsuffix .c,$(SNC_SRC_FILES))
-HDEPENDS_FILES_YES += $(addsuffix $(DEP),$(basename $(SNC_CSRC_FILES)))
-
-#--------------------------------------------------
-# snc executable
-
-
-ifdef RULES_TOP
- # EPICS base R3.14.7 and later
- SNC:=$(RULES_TOP)/bin/$(EPICS_HOST_ARCH)/snc$(HOSTEXE)
-else
- # EPICS base R3.14.6 and earlier
- ifndef SNC
- SNC = $(SNCSEQ_HOST_BIN)/snc$(HOSTEXE)
- endif
-endif
-
-
-#--------------------------------------------------
-# Rules
-
-%.i: ../%.st
- @echo "preprocessing $<"
- @$(RM) $@
- $(PREPROCESS.cpp)
-
-%.c: %.i
- @echo "converting $<"
- $(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $< -o $(@F).tmp
- $(MV) $(@F).tmp $@
-
-%.c: ../%.stt
- @echo "converting $< "
- $(SNC) $(TARGET_SNCFLAGS) $(SNCFLAGS) $< -o $(@F).tmp
- $(MV) $(@F).tmp $@
-
-clean::
- @$(RM) $(SNC_CSRC_FILES)
-
patch 9c10eca00e4c4693dc1043adbf3f3688f62cb40b
Author: Andrew Johnson <anj@aps.anl.gov>
Date: Thu Mar 30 01:17:52 CEST 2006
* Cleanup, throw out unused files.
Reorganized CONFIG_APP -> CONFIG.
Moved PVxxx variables into the new CONFIG_SITE file