renamed DEPLY.conf to BUILD.conf

epics-base · May 10, 2019 · 2afdaf1 · 2afdaf1
1 parent 26433a6
commit 2afdaf1
Show file tree

Hide file tree

Showing 23 changed files with 77 additions and 77 deletions.
diff --git a/src/pvaccess/Makefile b/src/pvaccess/Makefile
@@ -1,5 +1,5 @@
 TOP = ../..
-DEPLOY_CONF := $(TOP)/configure/DEPLOY.conf
+BUILD_CONF := $(TOP)/configure/BUILD.conf
 PVACCESS_CONSTANTS_CPP_TEMPLATE := $(TOP)/src/pvaccess/pvaccess.constants.cpp.template
 SPHINX_CONF := $(TOP)/documentation/sphinx/conf.py
 
@@ -25,7 +25,7 @@ USR_LDFLAGS  += $(USR_LDFLAGS_$(T_A))
 # Set our library install location; /$(T_A) will be added
 INSTALL_LOCATION_LIB = $(INSTALL_LOCATION)/lib/python/$(PYTHON_VERSION)
 
-PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
+PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
 ifeq ($(PVA_PY_VERSION),)
     PVA_PY_VERSION=$(shell git rev-parse --short HEAD)
 endif
@@ -180,7 +180,7 @@ include $(TOP)/configure/RULES
 #----------------------------------------
 #  ADD RULES AFTER THIS LINE
 
-pvaccess.constants.cpp: $(PVACCESS_CONSTANTS_CPP_TEMPLATE) $(DEPLOY_CONF)
+pvaccess.constants.cpp: $(PVACCESS_CONSTANTS_CPP_TEMPLATE) $(BUILD_CONF)
 	eval "cat ${PVACCESS_CONSTANTS_CPP_TEMPLATE} | sed 's?PVA_PY_VERSION?${PVA_PY_VERSION}?g' > pvaccess.constants.cpp"
 	eval "cat ${SPHINX_CONF} | sed 's?version =.*?version = \"${PVA_PY_VERSION}\"?g' | sed 's?release =.*?release = \"${PVA_PY_VERSION}\"?g' > ${SPHINX_CONF}.2 && mv ${SPHINX_CONF}.2 ${SPHINX_CONF}"
 
diff --git a/tools/conda/epics-base-conda/Makefile b/tools/conda/epics-base-conda/Makefile
@@ -1,8 +1,8 @@
 
 TOP = ../../..
-DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
-EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
-BUILD_NUMBER=$(shell cat $(DEPLOY_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
+BUILD_CONF = $(TOP)/configure/BUILD.conf
+EPICS_BASE_VERSION=$(shell cat $(BUILD_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
+BUILD_NUMBER=$(shell cat $(BUILD_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
 PACKAGE = epics-base
 CONDA_LIST_FLAGS := $(CONDA_ENV_FLAGS)
 CONDA_ENV_FLAGS += -y

diff --git a/tools/conda/pvapy-boost-conda/Makefile b/tools/conda/pvapy-boost-conda/Makefile
@@ -1,9 +1,9 @@
 
 TOP = ../../..
-DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
-BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
+BUILD_CONF = $(TOP)/configure/BUILD.conf
+BOOST_VERSION=$(shell cat $(BUILD_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
 BOOST_DOWNLOAD_VERSION=$(shell echo $(BOOST_VERSION) | sed 's?\.?_?g')
-BUILD_NUMBER=$(shell cat $(DEPLOY_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
+BUILD_NUMBER=$(shell cat $(BUILD_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
 PACKAGE = pvapy-boost
 CONDA_ENV_FLAGS += -y
 

diff --git a/tools/conda/pvapy-conda/Makefile b/tools/conda/pvapy-conda/Makefile
@@ -1,14 +1,14 @@
 
 TOP = ../../..
-DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
-PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
-EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
-BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
+BUILD_CONF = $(TOP)/configure/BUILD.conf
+PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
+EPICS_BASE_VERSION=$(shell cat $(BUILD_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
+BOOST_VERSION=$(shell cat $(BUILD_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
 ifeq ($(PVA_PY_VERSION),)
     PVA_PY_VERSION=$(shell git rev-parse --short HEAD)
 endif
-PVA_PY_GIT_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_GIT_VERSION | cut -f2 -d'=')
-BUILD_NUMBER=$(shell cat $(DEPLOY_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
+PVA_PY_GIT_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_GIT_VERSION | cut -f2 -d'=')
+BUILD_NUMBER=$(shell cat $(BUILD_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
 PVA_PY_YAML_TEMPLATE ?= meta.yaml.template
 
 PACKAGE = pvapy

diff --git a/tools/local/epics-base-local/Makefile b/tools/local/epics-base-local/Makefile
@@ -1,7 +1,7 @@
 
 TOP = ../../..
-DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
-EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
+BUILD_CONF = $(TOP)/configure/BUILD.conf
+EPICS_BASE_VERSION=$(shell cat $(BUILD_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
 
 default: install
 

diff --git a/tools/local/epics-base-local/build.linux.sh b/tools/local/epics-base-local/build.linux.sh
@@ -8,12 +8,12 @@ PREFIX=${PREFIX:-$DEFAULT_PREFIX}
 BUILD_DIR=$TOP/build
 EPICS_BUILD_DIR=$BUILD_DIR/epics
 EPICS_EXECUTABLES="caget cainfo camonitor caput caRepeater p2p pvcall pvget pvinfo pvlist pvmonitor pvput softIoc softIocPVA"
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 OPT_EPICS_DIR=opt/epics-${EPICS_BASE_VERSION}
 LOCAL_EPICS_DIR=$PREFIX/$OPT_EPICS_DIR

diff --git a/tools/local/pvapy-boost-local/Makefile b/tools/local/pvapy-boost-local/Makefile
@@ -1,7 +1,7 @@
 
 TOP = ../../..
-DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
-BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
+BUILD_CONF = $(TOP)/configure/BUILD.conf
+BOOST_VERSION=$(shell cat $(BUILD_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
 BOOST_DOWNLOAD_VERSION=$(shell echo $(BOOST_VERSION) | sed 's?\.?_?g')
 
 default: install

diff --git a/tools/local/pvapy-boost-local/build.linux.sh b/tools/local/pvapy-boost-local/build.linux.sh
@@ -7,12 +7,12 @@ DEFAULT_PREFIX=$TOP/.. && cd $DEFAULT_PREFIX && DEFAULT_PREFIX=`pwd`
 PREFIX=${PREFIX:-$DEFAULT_PREFIX}
 BUILD_DIR=$TOP/build
 BOOST_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 OPT_BOOST_DIR=opt/boost-python-${BOOST_VERSION}
 LOCAL_BOOST_DIR=$PREFIX/$OPT_BOOST_DIR

diff --git a/tools/local/pvapy-local/Makefile b/tools/local/pvapy-local/Makefile
@@ -1,7 +1,7 @@
 
 TOP = ../../..
-DEPLOY_CONF = ${CURDIR}/../../../configure/DEPLOY.conf
-PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
+BUILD_CONF = ${CURDIR}/../../../configure/BUILD.conf
+PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
 
 default: install
 

diff --git a/tools/local/pvapy-local/build.linux.sh b/tools/local/pvapy-local/build.linux.sh
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
 DEFAULT_PREFIX=$TOP/.. && cd $DEFAULT_PREFIX && DEFAULT_PREFIX=`pwd`
 PREFIX=${PREFIX:-$DEFAULT_PREFIX}
 BUILD_DIR=$TOP/build
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 if [ -z "$PVA_PY_VERSION" ]; then
     PVA_PY_VERSION=local

diff --git a/tools/local/pvapy-local/test.sh b/tools/local/pvapy-local/test.sh
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
 DEFAULT_PREFIX=$TOP/.. && cd $DEFAULT_PREFIX && DEFAULT_PREFIX=`pwd`
 PREFIX=${PREFIX:-$DEFAULT_PREFIX}
 BUILD_DIR=$TOP/build
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 if [ -z "$PVA_PY_VERSION" ]; then
     PVA_PY_VERSION=local

diff --git a/tools/pip/epics-base-pip/Makefile b/tools/pip/epics-base-pip/Makefile
@@ -1,12 +1,12 @@
 
 TOP = ../../..
-DEPLOY_CONF = ${CURDIR}/../../../configure/DEPLOY.conf
+BUILD_CONF = ${CURDIR}/../../../configure/BUILD.conf
 DIST_DIR = dist
 BUILD_DIR = build
 PACKAGE_DIR = epics-base
 
 package: build
-	DEPLOY_CONF=$(DEPLOY_CONF) pip wheel . -w $(DIST_DIR) 
+	BUILD_CONF=$(BUILD_CONF) pip wheel . -w $(DIST_DIR) 
 
 configure:
 

diff --git a/tools/pip/epics-base-pip/build.darwin.sh b/tools/pip/epics-base-pip/build.darwin.sh
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
 BUILD_DIR=$TOP/build
 EPICS_BUILD_DIR=$BUILD_DIR/epics
 EPICS_BASE_DIR=$TOP/epics-base
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 EPICS_BASE_DOWNLOAD_URL=https://epics.anl.gov/download/base/base-${EPICS_BASE_VERSION}.tar.gz
 

diff --git a/tools/pip/epics-base-pip/build.linux.sh b/tools/pip/epics-base-pip/build.linux.sh
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
 BUILD_DIR=$TOP/build
 EPICS_BUILD_DIR=$BUILD_DIR/epics
 EPICS_BASE_DIR=$TOP/epics-base
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 EPICS_BASE_DOWNLOAD_URL=https://epics.anl.gov/download/base/base-${EPICS_BASE_VERSION}.tar.gz
 

diff --git a/tools/pip/epics-base-pip/setup.py b/tools/pip/epics-base-pip/setup.py
@@ -10,7 +10,7 @@
 MODULE = Extension(MODULE_NAME, [])
 PLATFORM = platform.uname()[0].lower()
 BUILD_SCRIPT = './build.%s.sh' % PLATFORM
-DEPLOY_CONF = os.environ.get('DEPLOY_CONF', 'non_existent_file')
+BUILD_CONF = os.environ.get('BUILD_CONF', 'non_existent_file')
 EXECUTABLES=['caget', 'cainfo', 'camonitor', 'caput', 'caRepeater', 'eget', 'pvget', 'pvinfo', 'pvlist', 'pvput', 'softIoc', 'softIocPVA']
 
 ### Workaround for python3 scripts issue with binary files 
@@ -31,8 +31,8 @@ def get_env_var(name, default):
     if value is not None:
         return value
 
-    if os.path.exists(DEPLOY_CONF):
-        vars = open(DEPLOY_CONF).read().split()
+    if os.path.exists(BUILD_CONF):
+        vars = open(BUILD_CONF).read().split()
         for v in vars:
             key = v.split('=')[0].strip()
             value = v.split('=')[1].strip()

diff --git a/tools/pip/pvapy-boost-pip/Makefile b/tools/pip/pvapy-boost-pip/Makefile
@@ -1,12 +1,12 @@
 
 TOP = ../../..
-DEPLOY_CONF = ${CURDIR}/../../../configure/DEPLOY.conf
+BUILD_CONF = ${CURDIR}/../../../configure/BUILD.conf
 DIST_DIR = dist
 BUILD_DIR = build
 PACKAGE_DIR = pvapy-boost
 
 package: build
-	DEPLOY_CONF=$(DEPLOY_CONF) pip wheel . -w $(DIST_DIR) 
+	BUILD_CONF=$(BUILD_CONF) pip wheel . -w $(DIST_DIR) 
 
 configure:
 

diff --git a/tools/pip/pvapy-boost-pip/build.darwin.sh b/tools/pip/pvapy-boost-pip/build.darwin.sh
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
 BUILD_DIR=$TOP/build
 BOOST_DIR=$TOP/pvapy-boost
 BOOST_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 #DEFAULT_PYTHON_VERSION="2"
 #if [ -z "$PYTHON_VERSION" ]; then

diff --git a/tools/pip/pvapy-boost-pip/build.linux.sh b/tools/pip/pvapy-boost-pip/build.linux.sh
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
 BUILD_DIR=$TOP/build
 BOOST_DIR=$TOP/pvapy-boost
 BOOST_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
-DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+BUILD_CONF=$TOP/../../../configure/BUILD.conf
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 #DEFAULT_PYTHON_VERSION="2"
 #if [ -z "$PYTHON_VERSION" ]; then

diff --git a/tools/pip/pvapy-boost-pip/setup.py b/tools/pip/pvapy-boost-pip/setup.py
@@ -9,15 +9,15 @@
 MODULE = Extension(MODULE_NAME, [])
 PLATFORM = platform.uname()[0].lower()
 BUILD_SCRIPT = './build.%s.sh' % PLATFORM
-DEPLOY_CONF = os.environ.get('DEPLOY_CONF', 'non_existent_file')
+BUILD_CONF = os.environ.get('BUILD_CONF', 'non_existent_file')
 
 def get_env_var(name, default):
     value = os.environ.get(name)
     if value is not None:
         return value
 
-    if os.path.exists(DEPLOY_CONF):
-        vars = open(DEPLOY_CONF).read().split()
+    if os.path.exists(BUILD_CONF):
+        vars = open(BUILD_CONF).read().split()
         for v in vars:
             key = v.split('=')[0].strip()
             value = v.split('=')[1].strip()

diff --git a/tools/pip/pvapy-pip/Makefile b/tools/pip/pvapy-pip/Makefile
@@ -1,14 +1,14 @@
 
 TOP = ../../..
-DEPLOY_CONF = ${CURDIR}/../../../configure/DEPLOY.conf
-PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
+BUILD_CONF = ${CURDIR}/../../../configure/BUILD.conf
+PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
 DIST_DIR = dist
 BUILD_DIR = build
 
 PACKAGE_DIRS = pvapy pvaccess
 
 package: build
-	DEPLOY_CONF=$(DEPLOY_CONF) pip wheel . -w $(DIST_DIR) -r requirements.txt
+	BUILD_CONF=$(BUILD_CONF) pip wheel . -w $(DIST_DIR) -r requirements.txt
 
 configure:
 

diff --git a/tools/pip/pvapy-pip/build.darwin.sh b/tools/pip/pvapy-pip/build.darwin.sh
@@ -5,13 +5,13 @@
 
 CURRENT_DIR=`pwd`
 TOP_DIR=`dirname $0` && cd $TOP_DIR && TOP_DIR=`pwd`
-DEPLOY_CONF=$TOP_DIR/../../../configure/DEPLOY.conf
+BUILD_CONF=$TOP_DIR/../../../configure/BUILD.conf
 
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 #DEFAULT_PYTHON_VERSION="2"
 #if [ -z "$PYTHON_VERSION" ]; then

diff --git a/tools/pip/pvapy-pip/build.linux.sh b/tools/pip/pvapy-pip/build.linux.sh
@@ -5,13 +5,13 @@
 
 CURRENT_DIR=`pwd`
 TOP_DIR=`dirname $0` && cd $TOP_DIR && TOP_DIR=`pwd`
-DEPLOY_CONF=$TOP_DIR/../../../configure/DEPLOY.conf
+BUILD_CONF=$TOP_DIR/../../../configure/BUILD.conf
 
-if [ ! -f $DEPLOY_CONF ]; then
-    echo "$DEPLOY_CONF not found"
+if [ ! -f $BUILD_CONF ]; then
+    echo "$BUILD_CONF not found"
     exit 1
 fi
-. $DEPLOY_CONF
+. $BUILD_CONF
 
 #DEFAULT_PYTHON_VERSION="2"
 #if [ -z "$PYTHON_VERSION" ]; then

diff --git a/tools/pip/pvapy-pip/setup.py b/tools/pip/pvapy-pip/setup.py
@@ -19,15 +19,15 @@
 README_FILE = 'pvaccess/doc/README.md'
 if not os.path.exists(README_FILE):
     README_FILE = os.path.join(MY_DIR, '../../../README.md')
-DEPLOY_CONF = os.environ.get('DEPLOY_CONF', 'non_existent_file')
+BUILD_CONF = os.environ.get('BUILD_CONF', 'non_existent_file')
 
 def get_env_var(name, default):
     value = os.environ.get(name)
     if value is not None:
         return value
 
-    if os.path.exists(DEPLOY_CONF):
-        vars = open(DEPLOY_CONF).read().split()
+    if os.path.exists(BUILD_CONF):
+        vars = open(BUILD_CONF).read().split()
         for v in vars:
             key = v.split('=')[0].strip()
             value = v.split('=')[1].strip()