[PATCH 1/3] cvsimport: allow setting a custom cvsps (2.x) program name
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jan 14, 2013, 01:40 UTC
- Message-ID
- <1358127629-7500-2-git-send-email-gitster@pobox.com>
- In-Reply-To
- <1358127629-7500-1-git-send-email-gitster@pobox.com>
Distros may ship old cvsps under a different name, or the user may install it outside the normal $PATH. Allow setting CVSPS2_PATH from the build environment.
Signed-off-by: Junio C Hamano <gitster@pobox.com> --- Makefile | 9 +++++++-- git-cvsimport.perl | 4 +++- t/lib-cvs.sh | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile index 1b30d7b..8cb4a1b 100644 --- a/Makefile +++ b/Makefile @@ -571,9 +571,11 @@ endif ifndef PYTHON_PATH PYTHON_PATH = /usr/bin/python endif +ifndef CVSPS2_PATH + CVSPS2_PATH = cvsps +endif -export PERL_PATH -export PYTHON_PATH +export PERL_PATH PYTHON_PATH CVSPS2_PATH LIB_FILE = libgit.a XDIFF_LIB = xdiff/lib.a @@ -1511,6 +1513,7 @@ SHELL_PATH_SQ = $(subst ','\'',$(SHELL_PATH)) PERL_PATH_SQ = $(subst ','\'',$(PERL_PATH)) PYTHON_PATH_SQ = $(subst ','\'',$(PYTHON_PATH)) TCLTK_PATH_SQ = $(subst ','\'',$(TCLTK_PATH)) +CVSPS2_PATH_SQ = $(subst ','\'',$(CVSPS2_PATH)) DIFF_SQ = $(subst ','\'',$(DIFF)) LIBS = $(GITLIBS) $(EXTLIBS) @@ -1724,6 +1727,7 @@ $(patsubst %.perl,%,$(SCRIPT_PERL)): % : %.perl GIT-VERSION-FILE -e ' H' \ -e ' x' \ -e '}' \ + -e 's|@@CVSPS2_PATH@@|$(CVSPS2_PATH_SQ)|g' \ -e 's/@@GIT_VERSION@@/$(GIT_VERSION)/g' \ $@.perl >$@+ && \ chmod +x $@+ && \ @@ -2102,6 +2106,7 @@ GIT-LDFLAGS: FORCE GIT-BUILD-OPTIONS: FORCE @echo SHELL_PATH=\''$(subst ','\'',$(SHELL_PATH_SQ))'\' >$@ @echo PERL_PATH=\''$(subst ','\'',$(PERL_PATH_SQ))'\' >>$@ + @echo CVSPS2_PATH=\''$(subst ','\'',$(CVSPS2_PATH_SQ))'\' >>$@ @echo DIFF=\''$(subst ','\'',$(subst ','\'',$(DIFF)))'\' >>$@ @echo PYTHON_PATH=\''$(subst ','\'',$(PYTHON_PATH_SQ))'\' >>$@ @echo TAR=\''$(subst ','\'',$(subst ','\'',$(TAR)))'\' >>$@ diff --git a/git-cvsimport.perl b/git-cvsimport.perl index 0a31ebd..ad460a5 100755 --- a/git-cvsimport.perl +++ b/git-cvsimport.perl @@ -33,6 +33,8 @@ our ($opt_h,$opt_o,$opt_v,$opt_k,$opt_u,$opt_d,$opt_p,$opt_C,$opt_z,$opt_i,$opt_P, $opt_s,$opt_m,@opt_M,$opt_A,$opt_S,$opt_L, $opt_a, $opt_r, $opt_R); my (%conv_author_name, %conv_author_email, %conv_author_tz); +my $cvsps2 = "@@CVSPS2_PATH@@"; + sub usage(;$) { my $msg = shift; print(STDERR "Error: $msg\n") if $msg; @@ -751,7 +753,7 @@ sub munge_user_filename { unless (defined($opt_p) && $opt_p =~ m/--no-cvs-direct/) { push @opt, '--cvs-direct'; } - exec("cvsps","--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree); + exec($cvsps2,"--norc",@opt,"-u","-A",'--root',$opt_d,$cvs_tree); die "Could not start cvsps: $!\n"; } ($cvspsfh, $cvspsfile) = tempfile('gitXXXXXX', SUFFIX => '.cvsps', diff --git a/t/lib-cvs.sh b/t/lib-cvs.sh index 44263ad..bdab63c 100644 --- a/t/lib-cvs.sh +++ b/t/lib-cvs.sh @@ -13,7 +13,9 @@ fi CVS="cvs -f" export CVS -cvsps_version=`cvsps -h 2>&1 | sed -ne 's/cvsps version //p'` +CVSPS="$CVSPS2_PATH" + +cvsps_version=`$CVSPS -h 2>&1 | sed -ne 's/cvsps version //p'` case "$cvsps_version" in 2.1 | 2.2*) ;;
-- 1.8.1.421.g6236851