1.1 --- a/tools/JavaServlet/compile.sh Sat Oct 13 22:36:40 2007 +0000
1.2 +++ b/tools/JavaServlet/compile.sh Sat Oct 13 22:37:17 2007 +0000
1.3 @@ -19,5 +19,7 @@
1.4 exit 1
1.5 fi
1.6
1.7 +cd `dirname $0`/classes
1.8 CLASSPATH=$SERVLET_LIB:$JYTHON_LIB \
1.9 - javac `dirname $0`/classes/uk/org/boddie/webstack/util/PyServlet.java
1.10 + javac uk/org/boddie/webstack/util/PyServlet.java
1.11 +find uk/org/boddie/webstack/util -name "*.class" | jar -cvf webstack-pyservlet.jar -@
2.1 --- a/tools/JavaServlet/webstack_java_build.py Sat Oct 13 22:36:40 2007 +0000
2.2 +++ b/tools/JavaServlet/webstack_java_build.py Sat Oct 13 22:37:17 2007 +0000
2.3 @@ -104,8 +104,11 @@
2.4
2.5 # Copy the special PyServlet classes.
2.6
2.7 - copy_directory(os.path.join(webstack_tools_home, "tools", "JavaServlet", "classes"),
2.8 - os.path.join(appname, "WEB-INF"))
2.9 + #copy_directory(os.path.join(webstack_tools_home, "tools", "JavaServlet", "classes"),
2.10 + # os.path.join(appname, "WEB-INF"))
2.11 +
2.12 + copy_file(os.path.join(webstack_tools_home, "tools", "JavaServlet", "classes", "webstack-pyservlet.jar"),
2.13 + os.path.join(appname, "WEB-INF", "lib", "webstack-pyservlet.jar"))
2.14
2.15 # Copy the WebStack package.
2.16