[Gsrc-commit] /srv/bzr/gsrc/trunk r1440: do not hardcode the Python binary name

[Brandon Invergo]

------------------------------------------------------------
revno: 1440
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Sun 2012-12-16 00:17:24 +0100
message:
  do not hardcode the Python binary name
modified:
  gar.env.mk
  gar.lib.mk

=== modified file 'gar.env.mk'
--- a/gar.env.mk        2012-12-10 08:14:37 +0000
+++ b/gar.env.mk        2012-12-15 23:17:24 +0000
@@ -41,6 +41,12 @@
 # Make XDG data files available.
 XDG_DATA_DIRS := $(prefix)/share
 
+# Choose your Python binary
+PYTHON := python
+PYTHON2_VER := 2.7
+PYTHON3_VER := 3.3
+PYTHON_PATH := 
$(prefix)/lib/python${PYTHON2_VER}/site-packages/:$(prefix)/lib/python${PYTHON3_VER}:$(PYTHON_PATH)
+
 # Export variables to the build environment.
 unexport CFLAGS
 export CPLUS_INCLUDE_PATH
@@ -57,6 +63,8 @@
 export PKG_CONFIG
 export PKG_CONFIG_PATH
 export XDG_DATA_DIRS
+export PYTHON
+export PYTHON_PATH
 
 # Make sure these variables aren't in the build environment.
 unexport DISPLAY

=== modified file 'gar.lib.mk'
--- a/gar.lib.mk        2012-12-13 21:43:22 +0000
+++ b/gar.lib.mk        2012-12-15 23:17:24 +0000
@@ -380,7 +380,7 @@
 
 help-%/setup.py:
        @echo -e "[$(OK)help$(OFF)] $(MSG)Running python setup.py --help in 
$(OFF)$*"
-       @cd $* && python setup.py --help
+       @cd $* && $(PYTHON) setup.py --help
 
 #################### CONFIGURE RULES ####################
 
@@ -454,7 +454,7 @@
 # configure using Python distutils
 configure-%/setup.py:
        @echo -e "[$(OK)configure$(OFF)] $(MSG)Running setup.py config in 
$(OFF)$*"
-       @cd $* && $(BUILD_ENV) python setup.py config $(PY_BUILD_ARGS) $(OUTPUT)
+       @cd $* && $(BUILD_ENV) $(PYTHON) setup.py config $(PY_BUILD_ARGS) 
$(OUTPUT)
        $(MAKECOOKIE)
 
 RUBY_DIRPATHS = --prefix=$(packageprefix)
@@ -529,7 +529,7 @@
 # build using Python distutils
 build-%/setup.py:
        @echo -e "[$(OK)build$(OFF)] $(MSG)Running setup.py build in $(OFF)$*"
-       @cd $* && $(BUILD_ENV) python setup.py build $(PY_BUILD_ARGS) $(OUTPUT) 
\
+       @cd $* && $(BUILD_ENV) $(PYTHON) setup.py build $(PY_BUILD_ARGS) 
$(OUTPUT) \
                || $(BUILD_FAIL)
        $(MAKECOOKIE)
 
@@ -582,9 +582,9 @@
 # Not all setup.py instances have a test command...
 test-%/setup.py:
        @set -e; cd $* && \
-               if python setup.py --help test >/dev/null 2>&1; then \
+               if $(PYTHON) setup.py --help test >/dev/null 2>&1; then \
                        echo -e "[$(OK)test$(OFF)] $(MSG)Running setup.py test 
in $(OFF)$*"; \
-                       $(TEST_ENV) python setup.py test $(PY_TEST_ARGS) 
$(OUTPUT); \
+                       $(TEST_ENV) $(PYTHON) setup.py test $(PY_TEST_ARGS) 
$(OUTPUT); \
                else \
                        echo -e "[$(ERR)test$(OFF)] $(MSG)No test support in 
$(OFF)$*"; \
                fi
@@ -703,7 +703,7 @@
 install-%/setup.py:
        @echo -e "[$(OK)install$(OFF)] $(MSG)Running setup.py install in 
$(OFF)$*"
        @mkdir -p $(packageDESTDIR)`python -c 'from distutils.sysconfig import 
get_python_lib; print get_python_lib()'`
-       @cd $* && $(INSTALL_ENV) python setup.py install 
--root=$(packageDESTDIR) $(PY_INSTALL_ARGS) $(OUTPUT)
+       @cd $* && $(INSTALL_ENV) $(PYTHON) setup.py install 
--root=$(packageDESTDIR) $(PY_INSTALL_ARGS) $(OUTPUT)
        $(MAKECOOKIE)
 
 # install using Ruby setup.rb
@@ -895,12 +895,12 @@
        @set -e; for user in $(NEED_USERS) -; do \
                [ "$$user" = "-" ] && continue; \
                echo -e "[$(OK)depcheck-users$(OFF)] $(MSG)Checking user" 
$$user "exists"; \
-               python -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null; \
+               $(PYTHON) -c "import pwd; pwd.getpwnam('$$user')" 2>/dev/null; \
        done $(OUTPUT)
        @set -e; for group in $(NEED_GROUPS) -; do \
                [ "$$group" = "-" ] && continue; \
                echo "[$(OK)depcheck-users$(OFF)] $(MSG)Checking group" $$group 
"exists"; \
-               python -c "import grp; grp.getgrnam('$$group')" 2>/dev/null; \
+               $(PYTHON) -c "import grp; grp.getgrnam('$$group')" 2>/dev/null; 
\
        done $(OUTPUT)
        $(MAKECOOKIE)