undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Basic build infrastructure for Python scripts

Browse Source 
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>
This commit is contained in:
Johan Herland 2009-11-18 02:42:31 +01:00 committed by Junio C Hamano
parent f8ec916731
commit d4e1b47a92
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -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. # Define NO_TCLTK if you do not want Tcl/Tk GUI.
# #
# The TCL_PATH variable governs the location of the Tcl interpreter # The TCL_PATH variable governs the location of the Tcl interpreter
@ -308,6 +310,7 @@ LIB_H =
LIB_OBJS = LIB_OBJS =
PROGRAMS = PROGRAMS =
SCRIPT_PERL = SCRIPT_PERL =
SCRIPT_PYTHON =
SCRIPT_SH = SCRIPT_SH =
TEST_PROGRAMS = TEST_PROGRAMS =
@ -345,6 +348,7 @@ SCRIPT_PERL += git-svn.perl
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \ SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \ $(patsubst %.perl,%,$(SCRIPT_PERL)) \
$(patsubst %.py,%,$(SCRIPT_PYTHON)) \
git-instaweb git-instaweb
# Empty... # Empty...
@ -398,8 +402,12 @@ endif
ifndef PERL_PATH ifndef PERL_PATH
PERL_PATH = /usr/bin/perl PERL_PATH = /usr/bin/perl
endif endif
ifndef PYTHON_PATH
PYTHON_PATH = /usr/bin/python
endif
export PERL_PATH export PERL_PATH
export PYTHON_PATH
LIB_FILE=libgit.a LIB_FILE=libgit.a
XDIFF_LIB=xdiff/lib.a XDIFF_LIB=xdiff/lib.a
@ -1308,6 +1316,10 @@ ifeq ($(PERL_PATH),)
NO_PERL=NoThanks NO_PERL=NoThanks
endif endif
ifeq ($(PYTHON_PATH),)
NO_PYTHON=NoThanks
endif
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 = QUIET_SUBDIR1 =
@ -1355,6 +1367,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH))
LIBS = $(GITLIBS) $(EXTLIBS) LIBS = $(GITLIBS) $(EXTLIBS)

3
configure.ac
View File

@ -233,6 +233,9 @@ GIT_ARG_SET_PATH(shell)
# Define PERL_PATH to provide path to Perl. # Define PERL_PATH to provide path to Perl.
GIT_ARG_SET_PATH(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. # Define ZLIB_PATH to provide path to zlib.
GIT_ARG_SET_PATH(zlib) GIT_ARG_SET_PATH(zlib)
# #

1
t/test-lib.sh
View File

@ -729,6 +729,7 @@ case $(uname -s) in
esac esac
test -z "$NO_PERL" && test_set_prereq PERL test -z "$NO_PERL" && test_set_prereq PERL
test -z "$NO_PYTHON" && test_set_prereq PYTHON
# test whether the filesystem supports symbolic links # test whether the filesystem supports symbolic links
ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS ln -s x y 2>/dev/null && test -h y 2>/dev/null && test_set_prereq SYMLINKS