allow for possibility of building from local source

epics-base · Jan 24, 2019 · 5b3039c · 5b3039c
1 parent c63d25a
commit 5b3039c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/tools/conda/pvapy-conda/Makefile b/tools/conda/pvapy-conda/Makefile
@@ -8,13 +8,13 @@ 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'=')
-  
+PVA_PY_YAML_TEMPLATE ?= meta.yaml.template
 
 PACKAGE = pvapy
 CONDA_ENV_FLAGS += -y
 
 configure:
-	eval "cat meta.yaml.template | sed 's?PVA_PY_VERSION?${PVA_PY_VERSION}?g' | sed 's?PVA_PY_GIT_VERSION?${PVA_PY_GIT_VERSION}?g' | sed 's?EPICS_BASE_VERSION?${EPICS_BASE_VERSION}?g' | sed 's?BOOST_VERSION?${BOOST_VERSION}?g' > meta.yaml"
+	eval "cat ${PVA_PY_YAML_TEMPLATE} | sed 's?PVA_PY_VERSION?${PVA_PY_VERSION}?g' | sed 's?PVA_PY_GIT_VERSION?${PVA_PY_GIT_VERSION}?g' | sed 's?EPICS_BASE_VERSION?${EPICS_BASE_VERSION}?g' | sed 's?BOOST_VERSION?${BOOST_VERSION}?g' > meta.yaml"
 
 build: configure
 	conda build .

diff --git a/tools/conda/pvapy-conda/meta.yaml b/tools/conda/pvapy-conda/meta.yaml
@@ -3,9 +3,9 @@ package:
   version: 1.3.0
 
 source:
-#  git_rev: master
-#  git_url: https://github.com/epics-base/pvaPy
-  path: ../../..
+  git_rev: master
+  git_url: https://github.com/epics-base/pvaPy
+#  path: ../../..
 
 
 build:

diff --git a/tools/conda/pvapy-conda/meta.yaml.template b/tools/conda/pvapy-conda/meta.yaml.template
@@ -3,9 +3,9 @@ package:
   version: PVA_PY_VERSION
 
 source:
-#  git_rev: PVA_PY_GIT_VERSION
-#  git_url: https://github.com/epics-base/pvaPy
-  path: ../../..
+  git_rev: PVA_PY_GIT_VERSION
+  git_url: https://github.com/epics-base/pvaPy
+#  path: ../../..
 
 
 build: