s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build.xml
View File

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

6
gridworks
View File

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

5
src/server/java/com/metaweb/gridworks/Gridworks.java
View File

@ -102,6 +102,11 @@ public class Gridworks {
// tell the signpost library to log // tell the signpost library to log
System.setProperty("debug","true"); 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 // initialize the log4j system
Appender console = new ConsoleAppender(new IndentingLayout()); Appender console = new ConsoleAppender(new IndentingLayout());
root.setLevel(Level.ALL); root.setLevel(Level.ALL);