Skip to content

Commit 2afdaf1

Browse files
sveselisveseli
committed
renamed DEPLY.conf to BUILD.conf
1 parent 26433a6 commit 2afdaf1

23 files changed

Lines changed: 77 additions & 77 deletions

File tree

‎src/pvaccess/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
TOP = ../..
2-
DEPLOY_CONF := $(TOP)/configure/DEPLOY.conf
2+
BUILD_CONF := $(TOP)/configure/BUILD.conf
33
PVACCESS_CONSTANTS_CPP_TEMPLATE := $(TOP)/src/pvaccess/pvaccess.constants.cpp.template
44
SPHINX_CONF := $(TOP)/documentation/sphinx/conf.py
55

@@ -25,7 +25,7 @@ USR_LDFLAGS += $(USR_LDFLAGS_$(T_A))
2525
# Set our library install location; /$(T_A) will be added
2626
INSTALL_LOCATION_LIB = $(INSTALL_LOCATION)/lib/python/$(PYTHON_VERSION)
2727

28-
PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
28+
PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
2929
ifeq ($(PVA_PY_VERSION),)
3030
PVA_PY_VERSION=$(shell git rev-parse --short HEAD)
3131
endif
@@ -180,7 +180,7 @@ include $(TOP)/configure/RULES
180180
#----------------------------------------
181181
# ADD RULES AFTER THIS LINE
182182

183-
pvaccess.constants.cpp: $(PVACCESS_CONSTANTS_CPP_TEMPLATE) $(DEPLOY_CONF)
183+
pvaccess.constants.cpp: $(PVACCESS_CONSTANTS_CPP_TEMPLATE) $(BUILD_CONF)
184184
eval "cat ${PVACCESS_CONSTANTS_CPP_TEMPLATE} | sed 's?PVA_PY_VERSION?${PVA_PY_VERSION}?g' > pvaccess.constants.cpp"
185185
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}"
186186

‎tools/conda/epics-base-conda/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
TOP = ../../..
3-
DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
4-
EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
5-
BUILD_NUMBER=$(shell cat $(DEPLOY_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
3+
BUILD_CONF = $(TOP)/configure/BUILD.conf
4+
EPICS_BASE_VERSION=$(shell cat $(BUILD_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
5+
BUILD_NUMBER=$(shell cat $(BUILD_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
66
PACKAGE = epics-base
77
CONDA_LIST_FLAGS := $(CONDA_ENV_FLAGS)
88
CONDA_ENV_FLAGS += -y

‎tools/conda/pvapy-boost-conda/Makefile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11

22
TOP = ../../..
3-
DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
4-
BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
3+
BUILD_CONF = $(TOP)/configure/BUILD.conf
4+
BOOST_VERSION=$(shell cat $(BUILD_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
55
BOOST_DOWNLOAD_VERSION=$(shell echo $(BOOST_VERSION) | sed 's?\.?_?g')
6-
BUILD_NUMBER=$(shell cat $(DEPLOY_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
6+
BUILD_NUMBER=$(shell cat $(BUILD_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
77
PACKAGE = pvapy-boost
88
CONDA_ENV_FLAGS += -y
99

‎tools/conda/pvapy-conda/Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11

22
TOP = ../../..
3-
DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
4-
PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
5-
EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
6-
BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
3+
BUILD_CONF = $(TOP)/configure/BUILD.conf
4+
PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
5+
EPICS_BASE_VERSION=$(shell cat $(BUILD_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
6+
BOOST_VERSION=$(shell cat $(BUILD_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
77
ifeq ($(PVA_PY_VERSION),)
88
PVA_PY_VERSION=$(shell git rev-parse --short HEAD)
99
endif
10-
PVA_PY_GIT_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_GIT_VERSION | cut -f2 -d'=')
11-
BUILD_NUMBER=$(shell cat $(DEPLOY_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
10+
PVA_PY_GIT_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_GIT_VERSION | cut -f2 -d'=')
11+
BUILD_NUMBER=$(shell cat $(BUILD_CONF) | grep BUILD_NUMBER | cut -f2 -d'=')
1212
PVA_PY_YAML_TEMPLATE ?= meta.yaml.template
1313

1414
PACKAGE = pvapy

‎tools/local/epics-base-local/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
TOP = ../../..
3-
DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
4-
EPICS_BASE_VERSION=$(shell cat $(DEPLOY_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
3+
BUILD_CONF = $(TOP)/configure/BUILD.conf
4+
EPICS_BASE_VERSION=$(shell cat $(BUILD_CONF) | grep EPICS_BASE_VERSION | cut -f2 -d'=')
55

66
default: install
77

‎tools/local/epics-base-local/build.linux.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ PREFIX=${PREFIX:-$DEFAULT_PREFIX}
88
BUILD_DIR=$TOP/build
99
EPICS_BUILD_DIR=$BUILD_DIR/epics
1010
EPICS_EXECUTABLES="caget cainfo camonitor caput caRepeater p2p pvcall pvget pvinfo pvlist pvmonitor pvput softIoc softIocPVA"
11-
DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
12-
if [ ! -f $DEPLOY_CONF ]; then
13-
echo "$DEPLOY_CONF not found"
11+
BUILD_CONF=$TOP/../../../configure/BUILD.conf
12+
if [ ! -f $BUILD_CONF ]; then
13+
echo "$BUILD_CONF not found"
1414
exit 1
1515
fi
16-
. $DEPLOY_CONF
16+
. $BUILD_CONF
1717

1818
OPT_EPICS_DIR=opt/epics-${EPICS_BASE_VERSION}
1919
LOCAL_EPICS_DIR=$PREFIX/$OPT_EPICS_DIR

‎tools/local/pvapy-boost-local/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
TOP = ../../..
3-
DEPLOY_CONF = $(TOP)/configure/DEPLOY.conf
4-
BOOST_VERSION=$(shell cat $(DEPLOY_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
3+
BUILD_CONF = $(TOP)/configure/BUILD.conf
4+
BOOST_VERSION=$(shell cat $(BUILD_CONF) | grep BOOST_VERSION | cut -f2 -d'=')
55
BOOST_DOWNLOAD_VERSION=$(shell echo $(BOOST_VERSION) | sed 's?\.?_?g')
66

77
default: install

‎tools/local/pvapy-boost-local/build.linux.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ DEFAULT_PREFIX=$TOP/.. && cd $DEFAULT_PREFIX && DEFAULT_PREFIX=`pwd`
77
PREFIX=${PREFIX:-$DEFAULT_PREFIX}
88
BUILD_DIR=$TOP/build
99
BOOST_HOST_ARCH=`uname | tr [A-Z] [a-z]`-`uname -m`
10-
DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
11-
if [ ! -f $DEPLOY_CONF ]; then
12-
echo "$DEPLOY_CONF not found"
10+
BUILD_CONF=$TOP/../../../configure/BUILD.conf
11+
if [ ! -f $BUILD_CONF ]; then
12+
echo "$BUILD_CONF not found"
1313
exit 1
1414
fi
15-
. $DEPLOY_CONF
15+
. $BUILD_CONF
1616

1717
OPT_BOOST_DIR=opt/boost-python-${BOOST_VERSION}
1818
LOCAL_BOOST_DIR=$PREFIX/$OPT_BOOST_DIR

‎tools/local/pvapy-local/Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
TOP = ../../..
3-
DEPLOY_CONF = ${CURDIR}/../../../configure/DEPLOY.conf
4-
PVA_PY_VERSION=$(shell cat $(DEPLOY_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
3+
BUILD_CONF = ${CURDIR}/../../../configure/BUILD.conf
4+
PVA_PY_VERSION=$(shell cat $(BUILD_CONF) | grep PVA_PY_VERSION | cut -f2 -d'=')
55

66
default: install
77

‎tools/local/pvapy-local/build.linux.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ TOP=`dirname $0` && cd $TOP && TOP=`pwd`
66
DEFAULT_PREFIX=$TOP/.. && cd $DEFAULT_PREFIX && DEFAULT_PREFIX=`pwd`
77
PREFIX=${PREFIX:-$DEFAULT_PREFIX}
88
BUILD_DIR=$TOP/build
9-
DEPLOY_CONF=$TOP/../../../configure/DEPLOY.conf
10-
if [ ! -f $DEPLOY_CONF ]; then
11-
echo "$DEPLOY_CONF not found"
9+
BUILD_CONF=$TOP/../../../configure/BUILD.conf
10+
if [ ! -f $BUILD_CONF ]; then
11+
echo "$BUILD_CONF not found"
1212
exit 1
1313
fi
14-
. $DEPLOY_CONF
14+
. $BUILD_CONF
1515

1616
if [ -z "$PVA_PY_VERSION" ]; then
1717
PVA_PY_VERSION=local

0 commit comments

Comments
 (0)