This is the mail archive of the kawa@sources.redhat.com mailing list for the Kawa project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

Last tweaks for Ant build (was Re: updated kawa 1.7 files)


Per Bothner wrote:

Again in ftp://bothner.com/pub.
Last call for testing.

Attached is a patch that fixes all the missing things I can find:


Add gnu/ecmascript.
Add gnu/jemacs/swing.
Name change to XStrings.scm.
Check for Servlet 2.3 API for enable-servlet (HttpServletResponse.resetBuffer and HttpServletRequest.getRequestURL are only since 2.3).
Init of tmp directory moved so that clean will work ok.


Sorry I couldn't get to this last night, but I was too tired to check everything. Now I've checked by comparing the jar toc listings to verify that the jar from the Ant build matches the one from the ftp. Later I should come up with a patch to add that as a check step in the makefile.

Jim
--
"I love deadlines. I love the whooshing sound they make as they fly by." -- Douglas Adams
--- /Users/jim/Software/archives/kawa-1.7/build.xml	Fri Jun  6 14:31:18 2003
+++ build.xml	Fri Jun  6 17:47:55 2003
@@ -161,7 +161,10 @@
        If javax.servlet.http.HttpServlet is in the classpath, then we'll
        compile Kawa' servlet interface, unless you override enable-servlet.
     -->
-    <available property="enable-servlet" classname="javax.servlet.http.HttpServlet"/>
+    <!-- The servlet code uses methods from the 2.3 specification now.
+         So test for a class that is new for the 2.3 API.
+    -->
+    <available property="enable-servlet" classname="javax.servlet.Filter"/>
     <property name="enable-servlet" value="false"/>
   
     <echo>
@@ -198,6 +201,7 @@
   
   <target name="build-tools">
     <mkdir dir="${build.tools}"/>
+    <mkdir dir="${build.tmp}"/>
     <!-- 
       This didn't work in NetBeans for some reason. 
       (Even the includejavaruntime/includeantruntime attributes do no good.
@@ -229,7 +233,6 @@
   </target>
   
   <target name="select-java1" depends="build-tools">
-    <mkdir dir="${build.tmp}"/>
     <xcopy todir="${build.tmp}" overwrite="true">
  	   <fileset dir="${src.dir}">
        	 <patternset refid="build.selectjava"/>
@@ -401,6 +404,7 @@
            optimize="${optimize}" >
       <include name="gnu/bytecode/"/>
       <include name="gnu/commonlisp/lang/"/>
+      <include name="gnu/ecmascript/"/>
       <include name="gnu/expr/"/>
       <include name="gnu/kawa/functions/"/>
       <include name="gnu/kawa/lispexpr/"/>
@@ -581,7 +585,7 @@
       <arg line="-P gnu.kawa.slib. --module-static -C"/>
       <fileset dir="${src.dir}/gnu/kawa/slib"> 
         <include name="XML.scm"/>
-        <include name="XString.scm"/>
+        <include name="XStrings.scm"/>
       </fileset>
     </apply>
   </target>
@@ -666,6 +670,7 @@
            optimize="${optimize}" >
       <include name="gnu/jemacs/buffer/"/>
       <include name="gnu/jemacs/lang/"/>
+      <include name="gnu/jemacs/swing/"/>
     </javac>
   </target>
    

Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]