[jbpm-commits] JBoss JBPM SVN: r3770 - jbpm4/trunk/hudson/jboss/bin.
Author: heiko.braun(a)jboss.com
Date: 2009-02-04 06:32:03 -0500 (Wed, 04 Feb 2009)
New Revision: 3770
Modified:
jbpm4/trunk/hudson/jboss/bin/runjboss.sh
Log:
Respect platform specific settings (cygwin & Mac OS)
Modified: jbpm4/trunk/hudson/jboss/bin/runjboss.sh
===================================================================
--- jbpm4/trunk/hudson/jboss/bin/runjboss.sh 2009-02-04 11:19:31 UTC (rev 3769)
+++ jbpm4/trunk/hudson/jboss/bin/runjboss.sh 2009-02-04 11:32:03 UTC (rev 3770)
@@ -29,6 +29,34 @@
exit 1
}
+# OS specific support (must be 'true' or 'false').
+cygwin=false;
+darwin=false;
+linux=false;
+case "`uname`" in
+ CYGWIN*)
+ cygwin=true
+ ;;
+
+ Darwin*)
+ darwin=true
+ ;;
+
+ Linux)
+ linux=true
+ ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JBOSS_HOME" ] &&
+ JBOSS_HOME=`cygpath --unix "$JBOSS_HOME"`
+ [ -n "$JAVA_HOME" ] &&
+ JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$JAVAC_JAR" ] &&
+ JAVAC_JAR=`cygpath --unix "$JAVAC_JAR"`
+fi
+
# Setup JBOSS_HOME
if [ "x$JBOSS_HOME" = "x" ]; then
# get the full path (without any relative bits)
@@ -60,14 +88,21 @@
fi
JBOSS_BOOT_CLASSPATH="$runjar"
-# Include the JDK javac compiler for JSP pages. The default is for a Sun JDK
+# Tomcat uses the JDT Compiler
+# Only include tools.jar if someone wants to use the JDK instead.
# compatible distribution which JAVA_HOME points to
if [ "x$JAVAC_JAR" = "x" ]; then
- JAVAC_JAR="$JAVA_HOME/lib/tools.jar"
+ JAVAC_JAR_FILE="$JAVA_HOME/lib/tools.jar"
+else
+ JAVAC_JAR_FILE="$JAVAC_JAR"
fi
-if [ ! -f "$JAVAC_JAR" ]; then
- warn "Missing file: $JAVAC_JAR"
- warn "Unexpected results may occur. Make sure JAVA_HOME points to a JDK and not
a JRE."
+if [ ! -f "$JAVAC_JAR_FILE" ]; then
+ # MacOSX does not have a seperate tools.jar
+ if [ "$darwin" != "true" -a "x$JAVAC_JAR" !=
"x" ]; then
+ warn "Missing file: JAVAC_JAR=$JAVAC_JAR"
+ warn "Unexpected results may occur."
+ fi
+ JAVAC_JAR_FILE=
fi
if [ "x$JBOSS_CLASSPATH" = "x" ]; then