make sure the jython stuff is copied in the various distributions and that it can be found even when no environment parameter is sett

git-svn-id: http://google-refine.googlecode.com/svn/trunk@518 7d457c2a-affb-35e4-300a-418c747d4874
This commit is contained in:
Stefano Mazzocchi 2010-04-22 21:36:32 +00:00
parent 2363d6de43
commit 531431a869
3 changed files with 23 additions and 5 deletions

View File

@ -131,6 +131,9 @@
<resourcefileset dir="${webapp.dir}/..">
<include name="${webapp.name}/**" />
</resourcefileset>
<resourcefileset dir="${lib.dir}/..">
<include name="lib/jython/**" />
</resourcefileset>
</jarbundler>
</target>
@ -179,6 +182,11 @@
</fileset>
</copy>
<copy file="${build.dir}/gridworks.jar" tofile="${windows.dir}/lib/gridworks-${version}-${revision}.jar"/>
<copy todir="${windows.dir}/lib/jython">
<fileset dir="${lib.dir}/jython">
<include name="**"/>
</fileset>
</copy>
<copy todir="${windows.dir}/webapp">
<fileset dir="${webapp.dir}">
<include name="**"/>
@ -209,7 +217,12 @@
</copy>
<copy file="${build.dir}/gridworks.jar" tofile="${linux.dir}/lib/gridworks-${version}-${revision}.jar"/>
<copy todir="${linux.dir}/lib/jython">
<fileset dir="${lib.dir}/jython">
<include name="**"/>
</fileset>
</copy>
<copy todir="${linux.dir}/src/main/webapp">
<fileset dir="${webapp.dir}">
<include name="**"/>

View File

@ -414,7 +414,7 @@ mac_dist() {
mkdir -p "$GRIDWORKS_BUILD_DIR/mac/.background"
cp src/graphics/dmg_background/dmg_background.png "$GRIDWORKS_BUILD_DIR/mac/.background/dmg_background.png"
SIZE=30
SIZE=40
if [ -f "$GRIDWORKS_BUILD_DIR/temp_gridworks.dmg" ]; then
rm "$GRIDWORKS_BUILD_DIR/temp_gridworks.dmg"
@ -760,9 +760,9 @@ if [ -z "$GRIDWORKS_DIST_DIR" ]; then
fi
if [ -z "$JYTHONPATH" ]; then
JYTHONPATH="$GRIDWORKS_LIB_DIR/jython-2.5.1"
JYTHONPATH="$GRIDWORKS_LIB_DIR/jython"
else
JYTHONPATH="$GRIDWORKS_LIB_DIR/jython-2.5.1/${SEP}$JYTHONPATH"
JYTHONPATH="$GRIDWORKS_LIB_DIR/jython/${SEP}$JYTHONPATH"
fi
add_option "-Dpython.path=$JYTHONPATH"

View File

@ -101,7 +101,12 @@ public class Gridworks {
// tell the signpost library to log
System.setProperty("debug","true");
// if not already set, make sure jython can find its python stuff
if (System.getProperty("python.path") == null) {
System.setProperty("python.path","lib/python");
}
// initialize the log4j system
Appender console = new ConsoleAppender(new IndentingLayout());
root.setLevel(Level.ALL);