cartodb4/crankshaft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deployment Makefile goal

Browse Source 
The virtual environment virtual directory wasn't set properly for
deployment.
Fixes #21
This commit is contained in:
Javier Goizueta
2016-03-29 14:53:51 +02:00
parent 5a7d3178dd
commit b8330dce07
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile.global
+6 -5
View File
@@ -1,6 +1,7 @@
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST))) SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
EXTENSION = crankshaft EXTENSION = crankshaft
PACKAGE = crankshaft PACKAGE = crankshaft
EXTVERSION = $(shell grep default_version $(SELF_DIR)/src/pg/$(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/") EXTVERSION = $(shell grep default_version $(SELF_DIR)/src/pg/$(EXTENSION).control | sed -e "s/default_version[[:space:]]*=[[:space:]]*'\([^']*\)'/\1/")
RELEASE_VERSION ?= $(EXTVERSION) RELEASE_VERSION ?= $(EXTVERSION)
SED = sed SED = sed
VIRTUALENV_PATH := $(realpath $(SELF_DIR)/envs)
src/pg/Makefile
-1
View File
@@ -18,7 +18,6 @@ DATA = $(EXTENSION)--dev.sql \
SOURCES_DATA_DIR = sql SOURCES_DATA_DIR = sql
SOURCES_DATA = $(wildcard $(SOURCES_DATA_DIR)/*.sql) SOURCES_DATA = $(wildcard $(SOURCES_DATA_DIR)/*.sql)
VIRTUALENV_PATH = $(realpath ../../envs)
ESC_VIRVIRTUALENV_PATH = $(subst /,\/,$(VIRTUALENV_PATH)) ESC_VIRVIRTUALENV_PATH = $(subst /,\/,$(VIRTUALENV_PATH))
REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' \ REPLACEMENTS = -e 's/@@VERSION@@/$(EXTVERSION)/g' \