From: Eygene Ryabinkin <rea-git@codelabs.ru>
To: Junio C Hamano <junkio@cox.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Jakub Narebski <jnareb@gmail.com>,
git@vger.kernel.org
Subject: [PATCH] Add the WITH_P4IMPORT knob to the Makefile.
Date: Tue, 27 Mar 2007 14:26:01 +0400 [thread overview]
Message-ID: <20070327102601.GN14837@codelabs.ru> (raw)
In-Reply-To: <7v1wjcz9x1.fsf@assigned-by-dhcp.cox.net>
WITH_P4IMPORT: enables the installation of the Perforce import
script.
Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru>
---
Makefile | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/Makefile b/Makefile
index 51c1fed..a294ec8 100644
--- a/Makefile
+++ b/Makefile
@@ -110,6 +110,8 @@ all::
# Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
# MakeMaker (e.g. using ActiveState under Cygwin).
#
+# Define WITH_P4IMPORT to build and install Python git-p4import script.
+#
GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -196,9 +198,20 @@ SCRIPT_PERL = \
git-svnimport.perl git-cvsexportcommit.perl \
git-send-email.perl git-svn.perl
+SCRIPT_PYTHON = \
+ git-p4import.py
+
+ifdef WITH_P4IMPORT
SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
$(patsubst %.perl,%,$(SCRIPT_PERL)) \
+ $(patsubst %.py,%,$(SCRIPT_PYTHON)) \
git-status git-instaweb
+else
+SCRIPTS = $(patsubst %.sh,%,$(SCRIPT_SH)) \
+ $(patsubst %.perl,%,$(SCRIPT_PERL)) \
+ git-status git-instaweb
+endif
+
# ... and all the rest that could be moved out of bindir to gitexecdir
PROGRAMS = \
@@ -241,6 +254,9 @@ endif
ifndef PERL_PATH
PERL_PATH = /usr/bin/perl
endif
+ifndef PYTHON_PATH
+ PYTHON_PATH = /usr/local/bin/python
+endif
export PERL_PATH
@@ -646,6 +662,7 @@ prefix_SQ = $(subst ','\'',$(prefix))
SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH))
PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH))
+PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH))
LIBS = $(GITLIBS) $(EXTLIBS)
@@ -699,6 +716,15 @@ $(patsubst %.sh,%,$(SCRIPT_SH)) : % : %.sh
$(patsubst %.perl,%,$(SCRIPT_PERL)): perl/perl.mak
+$(patsubst %.py,%,$(SCRIPT_PYTHON)) : % : %.py
+ rm -f $@ $@+
+ sed -e '1s|#!.*/python|#!$(PYTHON_PATH_SQ)|' \
+ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \
+ -e 's/@@NO_CURL@@/$(NO_CURL)/g' \
+ $@.py >$@+
+ chmod +x $@+
+ mv $@+ $@
+
perl/perl.mak: GIT-CFLAGS
$(QUIET_SUBDIR0)perl $(QUIET_SUBDIR1) PERL_PATH='$(PERL_PATH_SQ)' prefix='$(prefix_SQ)' $(@F)
--
1.5.0.3-dirty
next prev parent reply other threads:[~2007-03-27 10:26 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-03-20 11:45 [PATCH] Added make options NO_GUI and WITH_P4IMPORT Eygene Ryabinkin
2007-03-21 0:35 ` Jakub Narebski
2007-03-21 5:14 ` Eygene Ryabinkin
2007-03-21 11:16 ` Johannes Schindelin
2007-03-21 11:50 ` Eygene Ryabinkin
2007-03-21 14:25 ` Johannes Schindelin
2007-03-21 14:38 ` Paolo Bonzini
2007-03-21 14:42 ` Eygene Ryabinkin
2007-03-21 14:49 ` Paolo Bonzini
2007-03-21 14:58 ` Alex Riesen
2007-03-24 23:16 ` Jakub Narebski
2007-03-21 14:40 ` Eygene Ryabinkin
2007-03-21 15:35 ` Johannes Schindelin
2007-03-21 16:01 ` Eygene Ryabinkin
2007-03-21 16:17 ` Junio C Hamano
2007-03-26 7:31 ` Eygene Ryabinkin
2007-03-26 7:32 ` [PATCH] Added options NO_TCLTK, WITH_P4IMPORT and --with-tcltk/--without-tcltk Eygene Ryabinkin
2007-03-26 8:27 ` Junio C Hamano
2007-03-27 10:26 ` Eygene Ryabinkin [this message]
2007-03-27 10:54 ` [PATCH] Add the WITH_P4IMPORT knob to the Makefile Junio C Hamano
2007-03-27 11:22 ` Eygene Ryabinkin
2007-03-27 11:25 ` [PATCH] Added git-p4 package to the list of git RPMs Eygene Ryabinkin
2007-03-27 16:03 ` [PATCH] Remove unused WITH_OWN_SUBPROCESS_PY from RPM spec Brian Gernhardt
2007-04-04 18:30 ` [PATCH] Added git-p4 package to the list of git RPMs Junio C Hamano
2007-04-05 12:50 ` Eygene Ryabinkin
2007-03-26 8:30 ` [PATCH] Added options NO_TCLTK, WITH_P4IMPORT and --with-tcltk/--without-tcltk Jakub Narebski
2007-03-26 8:36 ` Junio C Hamano
2007-03-26 10:03 ` Eygene Ryabinkin
2007-03-27 4:12 ` Junio C Hamano
2007-03-27 6:59 ` Eygene Ryabinkin
2007-03-27 10:24 ` [PATCH] Added configure options --with-tcltk/--without-tcltk Eygene Ryabinkin
2007-03-27 10:53 ` Junio C Hamano
2007-03-27 11:07 ` Eygene Ryabinkin
2007-03-28 1:52 ` Junio C Hamano
2007-03-28 9:12 ` [PATCH] Add --with-tcltk and --without-tcltk to configure Eygene Ryabinkin
2007-03-28 9:13 ` [PATCH] Added Tcl/Tk interpreter path rewriting for the GUI tools Eygene Ryabinkin
2007-03-28 19:48 ` [PATCH] Add --with-tcltk and --without-tcltk to configure Junio C Hamano
2007-03-29 7:44 ` Eygene Ryabinkin
2007-03-29 8:00 ` Junio C Hamano
2007-03-29 8:29 ` Eygene Ryabinkin
2007-03-29 8:35 ` Junio C Hamano
2007-03-29 8:58 ` Eygene Ryabinkin
2007-03-29 9:12 ` Tom Prince
2007-03-29 10:06 ` Eygene Ryabinkin
2007-03-29 10:06 ` [PATCH] Eliminate checks of user-specified Tcl/Tk interpreter Eygene Ryabinkin
2007-03-29 10:07 ` [PATCH] Added correct Python path to the RPM specfile Eygene Ryabinkin
2007-03-26 8:25 ` [PATCH] Added make options NO_GUI and WITH_P4IMPORT 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=20070327102601.GN14837@codelabs.ru \
--to=rea-git@codelabs.ru \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jnareb@gmail.com \
--cc=junkio@cox.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).