[JGIT PATCH] Allow make_jgit.sh compilation under Cygwin or Mingw (MsysGit) with Windows JDK
From: Mike Ralphson <hidden>
Date: 2016-06-15 22:45:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Mike Ralphson <redacted> --- make_jgit.sh | 24 +++++++++++++++++------- 1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/make_jgit.sh b/make_jgit.sh
index 13d0e32..c119202 100755
--- a/make_jgit.sh
+++ b/make_jgit.sh@@ -10,14 +10,24 @@ JARS=" org.spearce.jgit.pgm/lib/args4j-2.0.9.jar " -if [ -n "$JAVA_HOME" ] -then - PATH=$JAVA_HOME/bin:$PATH -fi - +PSEP=":" T=".temp$$.$O" T_MF="$T.MF" R=`pwd` +if [ "$OSTYPE" = "cygwin" ] +then + R=`cygpath -m $R` + PSEP=";" +fi +if [ "$MSYSTEM" = "MINGW" ] +then + PSEP=";" +fi + +if [ -n "$JAVA_HOME" ] +then + PATH=${JAVA_HOME}/bin${PSEP}${PATH} +fi cleanup_bin() { rm -f $T $O+ $T_MF
@@ -44,7 +54,7 @@ do then CLASSPATH="$R/$j" else - CLASSPATH="$CLASSPATH:$R/$j" + CLASSPATH="${CLASSPATH}${PSEP}$R/$j" fi done export CLASSPATH
@@ -61,7 +71,7 @@ do -encoding UTF-8 \ -g \ -d ../bin2) || die "Building $p failed." - CLASSPATH="$CLASSPATH:$R/$p/bin2" + CLASSPATH="${CLASSPATH}${PSEP}$R/$p/bin2" done echo Manifest-Version: 1.0 >$T_MF &&
--
1.5.6.4