- finally java6 has support for wildcards... seriously, how fricking long did it take for this to happen?!

- so require java6 since it's also a lot faster and a lot more reliable for us for profiling


git-svn-id: http://google-refine.googlecode.com/svn/trunk@68 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-02-08 19:48:28 +00:00
parent bf938d4a9c
commit 6d4425c696

View File

@ -74,11 +74,7 @@ run() {
echo "" echo ""
fi fi
CLASSPATH="$GRIDWORKS_BUILD_DIR/classes" CLASSPATH="$GRIDWORKS_BUILD_DIR/classes:$GRIDWORKS_LIB_DIR/*"
for i in `ls $GRIDWORKS_LIB_DIR/*.jar` ; do
CLASSPATH=$CLASSPATH:$i
done
RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks" RUN_CMD="$JAVA -cp $CLASSPATH $OPTS com.metaweb.gridworks.Gridworks"
@ -116,6 +112,12 @@ else
fi fi
fi fi
JAVA_VERSION=`java -version 2>&1 | grep version | cut -d ' ' -f 3 | egrep ^\"1.6`
if [ -z "$JAVA_VERSION" ] ; then
echo "Gridworks requires java version 6 or later."
exit 1
fi
# ----- Parse the command line args ------------------------------------------ # ----- Parse the command line args ------------------------------------------
while [ $# -ne 0 ] ; do while [ $# -ne 0 ] ; do