Эх сурвалжийг харах

HUE-555. Build should not require a system python-setuptools

bc Wong 14 жил өмнө
parent
commit
863966fd27

+ 2 - 2
Makefile.sdk

@@ -48,11 +48,11 @@
 
 include $(ROOT)/Makefile.vars
 
-SETUPTOOLS_NAME := $(shell python setup.py --name)
+SETUPTOOLS_NAME = $(shell $(ENV_PYTHON) setup.py --name)
 
 APP_ROOT := $(realpath .)
 APP_NAME ?= $(SETUPTOOLS_NAME)
-APP_VERSION ?= $(shell python setup.py --version)
+APP_VERSION ?= $(shell $(ENV_PYTHON) setup.py --version)
 APP_FULL_NAME ?= $(APP_NAME)-$(APP_VERSION)
 
 

+ 1 - 0
Makefile.tarball

@@ -27,6 +27,7 @@ PROD_INCLUDES := \
 	maven \
 	tools/app_reg \
 	tools/virtual-bootstrap \
+	VERSION \
 	VERSION_DATA
 
 # Check for things in BDIST_EXCLUDES in various apps

+ 6 - 6
Makefile.vars

@@ -64,12 +64,6 @@ THIRDPARTY_DIR := $(ROOT)/ext/thirdparty
 THIRDPARTY_JS_DIR := $(THIRDPARTY_DIR)/js
 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
 # 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_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
 ##############################

+ 2 - 7
README.rst

@@ -53,10 +53,7 @@ namespace.  See ``apps/hello/src/hello/urls.py`` for an example.
 
 Development Prerequisites
 ===========================
-1. On your host system, you need to have the python "virtualenv" package
-   installed.
-
-2. Also, you'll need these library development packages and tools installed on
+1. Also, you'll need these library development packages and tools installed on
    your system:
 
     Debian:
@@ -70,7 +67,6 @@ Development Prerequisites
       * libxslt-dev
       * maven2
       * python-dev
-      * python-setuptools
       * python-simplejson
 
     CentOS:
@@ -83,7 +79,6 @@ Development Prerequisites
       * mysql
       * mysql-devel
       * python-devel
-      * python-setuptools
       * python-simplejson (for the crepo tool)
       * sqlite-devel
 
@@ -95,7 +90,7 @@ Development Prerequisites
       * simplejson (easy_install)
       * sqlite3
 
-3. You need to have crepo installed, and preferably on your path. If it is not
+2. You need to have crepo installed, and preferably on your path. If it is not
    on your path, set the environment variable ``CREPO`` to point to ``crepo.py``
    from that distribution. You can clone crepo from
    http://github.com/cloudera/crepo.git somewhere else on your system.

+ 2 - 0
apps/shell/src/shell/.gitignore

@@ -0,0 +1,2 @@
+# Build product
+/setuid