Basic build infrastructure for Python scripts

This patch adds basic boilerplate support (based on corresponding Perl
sections) for enabling the building and installation Python scripts.

There are currently no Python scripts being built, and when Python
scripts are added in future patches, their building and installation
can be disabled by defining NO_PYTHON.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Makefile b/Makefile
index 268aede566c29bdf5f4e19fb2a6819fc197c0fbb..b27a7d603b89699b40d1a907a9891bb54d962e8c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -164,6 +164,8 @@ all::
 #
 # Define NO_PERL if you do not want Perl scripts or libraries at all.
 #
 #
 # Define NO_PERL if you do not want Perl scripts or libraries at all.
 #

+# Define NO_PYTHON if you do not want Python scripts or libraries at all.
+#

 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
 #
 # The TCL_PATH variable governs the location of the Tcl interpreter
 # Define NO_TCLTK if you do not want Tcl/Tk GUI.
 #
 # The TCL_PATH variable governs the location of the Tcl interpreter


@@ -308,6 +310,7 @@ LIB_H =
 LIB_OBJS =
 PROGRAMS =
 SCRIPT_PERL =
 LIB_OBJS =
 PROGRAMS =
 SCRIPT_PERL =

+SCRIPT_PYTHON =

 SCRIPT_SH =
 TEST_PROGRAMS =
 
 SCRIPT_SH =
 TEST_PROGRAMS =
 


@@ -345,6 +348,7 @@ SCRIPT_PERL += git-svn.perl
 
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
          $(patsubst %.perl,%,$(SCRIPT_PERL)) \
 
 SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
          $(patsubst %.perl,%,$(SCRIPT_PERL)) \

+         $(patsubst %.py,%,$(SCRIPT_PYTHON)) \

          git-instaweb
 
 # Empty...
          git-instaweb
 
 # Empty...


@@ -398,8 +402,12 @@ endif
 ifndef PERL_PATH
        PERL_PATH = /usr/bin/perl
 endif
 ifndef PERL_PATH
        PERL_PATH = /usr/bin/perl
 endif

+ifndef PYTHON_PATH
+       PYTHON_PATH = /usr/bin/python
+endif

 
 export PERL_PATH
 
 export PERL_PATH

+export PYTHON_PATH

 
 LIB_FILE=libgit.a
 XDIFF_LIB=xdiff/lib.a
 
 LIB_FILE=libgit.a
 XDIFF_LIB=xdiff/lib.a


@@ -1308,6 +1316,10 @@ ifeq ($(PERL_PATH),)
 NO_PERL=NoThanks
 endif
 
 NO_PERL=NoThanks
 endif
 

+ifeq ($(PYTHON_PATH),)
+NO_PYTHON=NoThanks
+endif
+

 QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 
 QUIET_SUBDIR0  = +$(MAKE) -C # space to separate -C and subdir
 QUIET_SUBDIR1  =
 


@@ -1355,6 +1367,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
 
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
 
 SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
 PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))

+PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))

 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
 LIBS = $(GITLIBS) $(EXTLIBS)
 TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
 
 LIBS = $(GITLIBS) $(EXTLIBS)

diff --git a/configure.ac b/configure.ac
index b09b8e446fbd52c55e6966c611b55ac1baa81f32..84b6cf48a4f9829c32bb14c80b667193a173ae5a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -233,6 +233,9 @@ GIT_ARG_SET_PATH(shell)
 # Define PERL_PATH to provide path to Perl.
 GIT_ARG_SET_PATH(perl)
 #
 # Define PERL_PATH to provide path to Perl.
 GIT_ARG_SET_PATH(perl)
 #

+# Define PYTHON_PATH to provide path to Python.
+GIT_ARG_SET_PATH(python)
+#

 # Define ZLIB_PATH to provide path to zlib.
 GIT_ARG_SET_PATH(zlib)
 #
 # Define ZLIB_PATH to provide path to zlib.
 GIT_ARG_SET_PATH(zlib)
 #

diff --git a/t/test-lib.sh b/t/test-lib.sh
index f2ca5364722e9c85a23bdfdcf1e24122fd5e3a0f..0b991dbd5d771fa2d3a3d21103a0f0a1f63bf93b 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -729,6 +729,7 @@ case $(uname -s) in
 esac
 
 test -z "$NO_PERL" && test_set_prereq PERL
 esac
 
 test -z "$NO_PERL" && test_set_prereq PERL

+test -z "$NO_PYTHON" && test_set_prereq PYTHON

 
 # test whether the filesystem supports symbolic links
 ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS
 
 # test whether the filesystem supports symbolic links
 ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS