|
@@ -64,12 +64,6 @@ THIRDPARTY_DIR := $(ROOT)/ext/thirdparty
|
|
|
THIRDPARTY_JS_DIR := $(THIRDPARTY_DIR)/js
|
|
THIRDPARTY_JS_DIR := $(THIRDPARTY_DIR)/js
|
|
|
ASPECTJ_DIR := $(THIRDPARTY_DIR)/java/aspectj-1.6.5/
|
|
ASPECTJ_DIR := $(THIRDPARTY_DIR)/java/aspectj-1.6.5/
|
|
|
|
|
|
|
|
-##############################
|
|
|
|
|
-# This version is substituted through to the tarballs and packages.
|
|
|
|
|
-##############################
|
|
|
|
|
-DESKTOP_VERSION := $(shell cd $(ROOT)/desktop/core && $(SYS_PYTHON) setup.py --version)
|
|
|
|
|
-MAVEN_VERSION = $(DESKTOP_VERSION)-SNAPSHOT
|
|
|
|
|
-
|
|
|
|
|
##############################
|
|
##############################
|
|
|
# ENV_PYTHON is the Python installed in the virtual environment. App
|
|
# ENV_PYTHON is the Python installed in the virtual environment. App
|
|
|
# installation should always use the ENV_PYTHON.
|
|
# installation should always use the ENV_PYTHON.
|
|
@@ -77,6 +71,12 @@ MAVEN_VERSION = $(DESKTOP_VERSION)-SNAPSHOT
|
|
|
ENV_PYTHON := $(BLD_DIR_ENV)/bin/$(notdir $(SYS_PYTHON))
|
|
ENV_PYTHON := $(BLD_DIR_ENV)/bin/$(notdir $(SYS_PYTHON))
|
|
|
ENV_PYTHON_VERSION = $(shell $(ENV_PYTHON) -c 'import sys; print "python%d.%d"% sys.version_info[:2]')
|
|
ENV_PYTHON_VERSION = $(shell $(ENV_PYTHON) -c 'import sys; print "python%d.%d"% sys.version_info[:2]')
|
|
|
|
|
|
|
|
|
|
+##############################
|
|
|
|
|
+# This version is substituted through to the tarballs and packages.
|
|
|
|
|
+##############################
|
|
|
|
|
+DESKTOP_VERSION := $(shell python <(cat $(ROOT)/VERSION; echo print VERSION))
|
|
|
|
|
+MAVEN_VERSION = $(DESKTOP_VERSION)-SNAPSHOT
|
|
|
|
|
+
|
|
|
##############################
|
|
##############################
|
|
|
# Path to the desktop hadoop plugin jar
|
|
# Path to the desktop hadoop plugin jar
|
|
|
##############################
|
|
##############################
|