In preparation to have both old and new cvsimport during the transition period, rename the cvsimport script to cvsimport-2 and introduce a small wrapper that we can later change it to allow users to run either frontend (with their corresponding cvsps backends).
Signed-off-by: Junio C Hamano <gits...@pobox.com> --- .gitignore | 1 + Makefile | 9 ++++++++- git-cvsimport.perl => git-cvsimport-2.perl | 0 git-cvsimport.sh | 5 +++++ 4 files changed, 14 insertions(+), 1 deletion(-) rename git-cvsimport.perl => git-cvsimport-2.perl (100%) create mode 100755 git-cvsimport.sh diff --git a/.gitignore b/.gitignore index aa258a6..8cb799c 100644 --- a/.gitignore +++ b/.gitignore @@ -40,6 +40,7 @@ /git-credential-store /git-cvsexportcommit /git-cvsimport +/git-cvsimport-2 /git-cvsserver /git-daemon /git-diff diff --git a/Makefile b/Makefile index dd2a024..f3113a9 100644 --- a/Makefile +++ b/Makefile @@ -253,6 +253,9 @@ all:: # # Define NO_PYTHON if you do not want Python scripts or libraries at all. # +# Define CVSPS2_PATH if you cannot invoke cvsps (version 2.x) as "cvsps" +# using your $PATH; if you do not have any, define CVSPS2_PATH=NoThanks. +# # Define NO_TCLTK if you do not want Tcl/Tk GUI. # # The TCL_PATH variable governs the location of the Tcl interpreter @@ -440,6 +443,7 @@ unexport CDPATH SCRIPT_SH += git-am.sh SCRIPT_SH += git-bisect.sh +SCRIPT_SH += git-cvsimport.sh SCRIPT_SH += git-difftool--helper.sh SCRIPT_SH += git-filter-branch.sh SCRIPT_SH += git-lost-found.sh @@ -468,12 +472,15 @@ SCRIPT_PERL += git-add--interactive.perl SCRIPT_PERL += git-difftool.perl SCRIPT_PERL += git-archimport.perl SCRIPT_PERL += git-cvsexportcommit.perl -SCRIPT_PERL += git-cvsimport.perl +ifneq ($(CVSPS2_PATH),NoThanks) +SCRIPT_PERL += git-cvsimport-2.perl +endif SCRIPT_PERL += git-cvsserver.perl SCRIPT_PERL += git-relink.perl SCRIPT_PERL += git-send-email.perl SCRIPT_PERL += git-svn.perl +SCRIPT_PYTHON += git-p4.py SCRIPT_PYTHON += git-remote-testpy.py SCRIPT_PYTHON += git-p4.py diff --git a/git-cvsimport.perl b/git-cvsimport-2.perl similarity index 100% rename from git-cvsimport.perl rename to git-cvsimport-2.perl diff --git a/git-cvsimport.sh b/git-cvsimport.sh new file mode 100755 index 0000000..71ba11d --- /dev/null +++ b/git-cvsimport.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +GIT_CVSPS_VERSION=2 + +exec git cvsimport-$GIT_CVSPS_VERSION "$@" -- 1.8.1.421.g6236851 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
