find and add tools.jar to classpath of x10doc if it is available

git-svn-id: svn://svn.code.sf.net/p/x10/code/trunk@27393 a326200e-df2c-42e0-81fa-597e909af41d
x10-lang · Feb 8, 2014 · ea50aee · ea50aee
1 parent ee62420
commit ea50aee
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/x10.dist/bin/x10c.in b/x10.dist/bin/x10c.in
@@ -95,13 +95,13 @@ WALA_JARS="${WALA_JARS}${PATH_SEP}${LIB_DIR}${FILE_SEP}org.eclipse.equinox.commo
 
 classpath="${CP_OVERRIDE}"
 if [[ "$DEXT" == "x10doc.ExtensionInfo" ]]; then
-   if [[ "$UNAME" == Darwin* ]]; then 
-       # on Mac don't need to find & add tools.jar
-       classpath="${classpath}${LIB_DIR}${FILE_SEP}x10doc.jar${PATH_SEP}"
+    classpath="${classpath}${LIB_DIR}${FILE_SEP}x10doc.jar${PATH_SEP}"
+    [ -z "$TOOLSJAR" ] && TOOLSJAR="${JAVA_HOME}${FILE_SEP}lib${FILE_SEP}tools.jar"
+    if [ -f "$TOOLSJAR" ]; then
+        classpath="${classpath}${TOOLSJAR}${PATH_SEP}"
     else
-       [ -z "$TOOLSJAR" ] && export TOOLSJAR="${JAVA_HOME}${FILE_SEP}lib${FILE_SEP}tools.jar"
-       classpath="${classpath}${LIB_DIR}${FILE_SEP}x10doc.jar${PATH_SEP}${TOOLSJAR}${PATH_SEP}"
-   fi
+        echo "Warning: x10doc requires javadoc framework in JDK"
+    fi
 fi
 
 classpath="${classpath}${LIB_DIR}${FILE_SEP}x10c.jar${PATH_SEP}${LIB_DIR}${FILE_SEP}${LPG_JAR}${PATH_SEP}${WALA_JARS}"