From 97b6abe0de869a81c8e19f707105a8542f57e405 Mon Sep 17 00:00:00 2001
From: Mike Ralphson <mike@abacus.co.uk>
Date: Thu, 21 Aug 2008 10:33:11 +0100
Subject: [PATCH] Allow make_jgit.sh compilation under Cygwin or Mingw
 (MsysGit) with Windows JDK

Signed-off-by: Mike Ralphson <mike@abacus.co.uk>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
 make_jgit.sh | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/make_jgit.sh b/make_jgit.sh
index 13d0e327..c1192021 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 &&
-- 
2.11.4.GIT