diff options
| author | Simon Pepping <spepping@apache.org> | 2006-10-13 07:07:21 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2006-10-13 07:07:21 +0000 |
| commit | 4250e5c3094d0fe50400fbb92e9a10b88b0d0d22 (patch) | |
| tree | 6600d2d7458f948cc11e9f7dbad353e205b26d48 /fop | |
| parent | cf184e6c725a4318bd5468991ca9f3786ebda359 (diff) | |
| download | xmlgraphics-fop-4250e5c3094d0fe50400fbb92e9a10b88b0d0d22.tar.gz xmlgraphics-fop-4250e5c3094d0fe50400fbb92e9a10b88b0d0d22.zip | |
Improve the invocation of cygpath for cygwin. This fixes bug
40583. Patch contributed by Mark C. Allman <mcallman at allmanpc dot
com>.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@463578 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'fop')
| -rwxr-xr-x | fop | 23 |
1 files changed, 20 insertions, 3 deletions
@@ -115,6 +115,22 @@ if $cygwin ; then JAVA_HOME=`cygpath --unix "$JAVA_HOME"` fi + +######################## +# Experimental code +######################## + +if [ "$OS" = "Windows_NT" ] ; then + pathSepChar=";" +else + pathSepChar=":" +fi +echo Path Sep Char set to ${pathSepChar} + +######################## +######################## + + if [ -z "$JAVACMD" ] ; then if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -142,7 +158,7 @@ if [ -n "$CLASSPATH" ] ; then fi # add fop.jar, fop-sandbox and fop-hyph.jar, which reside in $FOP_HOME/build -LOCALCLASSPATH=${FOP_HOME}/build/fop.jar:${FOP_HOME}/build/fop-sandbox.jar:${FOP_HOME}/build/fop-hyph.jar:$LOCALCLASSPATH +LOCALCLASSPATH=${FOP_HOME}/build/fop.jar${pathSepChar}${FOP_HOME}/build/fop-sandbox.jar${pathSepChar}${FOP_HOME}/build/fop-hyph.jar${pathSepChar}$LOCALCLASSPATH # add in the dependency .jar files, which reside in $FOP_HOME/lib DIRLIBS=${FOP_HOME}/lib/*.jar @@ -154,14 +170,14 @@ do if [ -z "$LOCALCLASSPATH" ] ; then LOCALCLASSPATH=$i else - LOCALCLASSPATH="$i":$LOCALCLASSPATH + LOCALCLASSPATH="$i"${pathSepChar}$LOCALCLASSPATH fi fi done # add in user-defined hyphenation JARs if [ -n "$FOP_HYPHENATION_PATH" ] ; then - LOCALCLASSPATH=$LOCALCLASSPATH:$FOP_HYPHENATION_PATH + LOCALCLASSPATH=$LOCALCLASSPATH${pathSepChar}$FOP_HYPHENATION_PATH fi # For Cygwin, switch paths to appropriate format before running java @@ -184,6 +200,7 @@ if $cygwin; then fi CYGHOME=`cygpath --$format "$HOME"` fi +echo local class path: $LOCALCLASSPATH # Show script help if requested if $show_help ; then |