Changeset 12729 for trunk/abcl/examples/google-app-engine

Timestamp:

05/24/10 16:38:08 (13 years ago)

Author:

Mark Evenson

Message:

Restore buildable state.

Location:

trunk/abcl/examples/google-app-engine

Files:

• build.xml (modified) (5 diffs)
• src/abcl_ae/AbclInit.java (modified) (1 diff)
• src/abcl_ae/HelloWorldServlet.java (modified) (2 diffs)

trunk/abcl/examples/google-app-engine/build.xml

@@ -1 @@
-<project>
-  <property name="sdk.dir" location="../appengine-java-sdk" />
+<project default="compile">
+
+  <property name="sdk.dir" 
+            location="../../../appengine-java-sdk" />
   <import file="${sdk.dir}/config/user/ant-macros.xml" />
+
   <path id="project.classpath">
   <pathelement path="war/WEB-INF/classes" />
@@ -11 +14 @@
   </fileset>
   </path>
+
   <target name="copyjars"
     description="Copies the App Engine and ABCL JARs to the WAR.">
@@ -19 +23 @@
       <include name="**/*.jar" />
     </fileset>
-    <fileset dir="../abcl">
+    <fileset dir="../..">
       <include name="dist/*.jar" />
     </fileset>
@@ -30 +34 @@
   </copy>
   </target>
-  <target name="compile" depends="copyjars"
+
+  <target name="compile" depends="copyjars,abcl.jar"
     description="Compiles Java source and copies other source files to the WAR.">
   <mkdir dir="war/WEB-INF/classes" />
@@ -42 +47 @@
     destdir="war/WEB-INF/classes"
     classpathref="project.classpath"
+                includeantruntime="false"
     debug="on" />
   </target>
+
+  <target name="abcl.jar">
+    <ant dir="../.." target="abcl.jar"/>
+  </target>
+
   <target name="clean" description="Cleans all the jars and fasls.">
     <delete>

trunk/abcl/examples/google-app-engine/src/abcl_ae/AbclInit.java

@@ -9 +9 @@
 import org.armedbear.lisp.Symbol;
 import org.armedbear.lisp.Pathname;
-import org.armedbear.lisp.ConditionThrowable;
 
 public final class AbclInit {

trunk/abcl/examples/google-app-engine/src/abcl_ae/HelloWorldServlet.java

@@ -10 +10 @@
 import org.armedbear.lisp.Symbol;
 import org.armedbear.lisp.SpecialBinding;
+import org.armedbear.lisp.SpecialBindingsMark;
 import org.armedbear.lisp.Load;
 import org.armedbear.lisp.Stream;
@@ -31 +32 @@
     currentThread.bindSpecial(
       Symbol.STANDARD_OUTPUT, 
-      new Stream(resp.getOutputStream(), Symbol.CHARACTER, false));
+      new Stream(Symbol.SYSTEM_STREAM, resp.getOutputStream(), 
+                                   Symbol.CHARACTER, false));
 
     try {