From: Sverre Rabbelier <srabbelier@gmail.com>
To: Git List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Daniel Barkalow <barkalow@iabervon.org>,
Johan Herland <johan@herland.net>
Cc: Johan Herland <johan@herland.net>
Subject: [PATCH v3 11/12] Basic build infrastructure for Python scripts
Date: Fri, 6 Nov 2009 23:52:45 +0100 [thread overview]
Message-ID: <1257547966-14603-12-git-send-email-srabbelier@gmail.com> (raw)
In-Reply-To: <1257547966-14603-11-git-send-email-srabbelier@gmail.com>
From: Johan Herland <johan@herland.net>
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>
---
Unchanged.
Makefile | 13 +++++++++++++
configure.ac | 3 +++
t/test-lib.sh | 1 +
3 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 5d5976f..6d1593f 100644
--- a/Makefile
+++ b/Makefile
@@ -168,6 +168,8 @@ 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
@@ -312,6 +314,7 @@ LIB_H =
LIB_OBJS =
PROGRAMS =
SCRIPT_PERL =
+SCRIPT_PYTHON =
SCRIPT_SH =
TEST_PROGRAMS =
@@ -349,6 +352,7 @@ SCRIPT_PERL += git-svn.perl
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
git-instaweb
# Empty...
@@ -402,8 +406,12 @@ endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
+ifndef PYTHON_PATH
+ PYTHON_PATH = /usr/bin/python
+endif
export PERL_PATH
+export PYTHON_PATH
LIB_FILE=libgit.a
XDIFF_LIB=xdiff/lib.a
@@ -1315,6 +1323,10 @@ ifeq ($(PERL_PATH),)
NO_PERL=NoThanks
endif
+ifeq ($(PYTHON_PATH),)
+NO_PYTHON=NoThanks
+endif
+
QUIET_SUBDIR0 = +$(MAKE) -C # space to separate -C and subdir
QUIET_SUBDIR1 =
@@ -1362,6 +1374,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
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)
diff --git a/configure.ac b/configure.ac
index b09b8e4..84b6cf4 100644
--- 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 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)
#
diff --git a/t/test-lib.sh b/t/test-lib.sh
index f2ca536..0b991db 100644
--- 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
+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
--
1.6.5.2.158.g6dacb
next prev parent reply other threads:[~2009-11-06 22:55 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-06 22:52 [PATCH v3 00/12] Reroll of the remote-vcs-helper series Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 01/12] Fix memory leak in helper method for disconnect Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 02/12] Allow programs to not depend on remotes having urls Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 03/12] Use a function to determine whether a remote is valid Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 04/12] Allow fetch to modify refs Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 05/12] Add a config option for remotes to specify a foreign vcs Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 06/12] Allow specifying the remote helper in the url Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 07/12] Add support for "import" helper command Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 08/12] Allow helper to map private ref names into normal names Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 09/12] Allow helpers to report in "list" command that the ref is unchanged Sverre Rabbelier
2009-11-06 22:52 ` [PATCH v3 10/12] Allow helpers to request the path to the .git directory Sverre Rabbelier
2009-11-06 22:52 ` Sverre Rabbelier [this message]
2009-11-06 22:52 ` [PATCH v3 12/12] Add Python support library for remote helpers Sverre Rabbelier
2009-11-06 23:23 ` [PATCH v3 11/12] Basic build infrastructure for Python scripts Andrzej K. Haczewski
2009-11-06 23:25 ` Sverre Rabbelier
2009-11-07 12:13 ` Johannes Schindelin
2009-11-06 23:12 ` [PATCH v3 08/12] Allow helper to map private ref names into normal names Daniel Barkalow
2009-11-06 23:19 ` Sverre Rabbelier
2009-11-09 6:42 ` Sverre Rabbelier
2009-11-09 16:44 ` Junio C Hamano
2009-11-09 17:10 ` Sverre Rabbelier
2009-11-09 20:32 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1257547966-14603-12-git-send-email-srabbelier@gmail.com \
--to=srabbelier@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=johan@herland.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).