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]

Re: Kawa-1.7beta1 available


Per Bothner wrote:
I've made a beta available that will hopefully be
close to Kawa 1.7.
... There are still some minor issues: I need to test
that ant builds work; ...

Attached is a small patch that fixes the Ant build (additions in gnu/kawa/slib and gui.scm was missing for jemacs) and adds a few missing string functions to Qexo (which I'm using in a XML Forms project - http://www.pagesmiths.com/webforms).


I ran Ant and get the same output for jemacs as make produces (see below).

Running 'make check' works fine with the Qexo string function changes and following an Ant build too.

The only big caveat to the above is that I didn't enable servlets (and there doesn't seem to be any change in that area).

Jim

jemacs-classes:
[kawa] (compiling /Users/jim/Software/kawa/gnu/jemacs/lang/MiscOps.scm)
[kawa] (compiling /Users/jim/Software/kawa/gnu/jemacs/lang/NumberOps.scm)
[kawa] (compiling /Users/jim/Software/kawa/gnu/jemacs/buffer/emacs.scm)
[kawa] /Users/jim/Software/kawa/gnu/jemacs/buffer/emacs.scm:461:4: warning - no method `removeRegion' in gnu.jemacs.buffer.Buffer
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/alist.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/autoloads.el)
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/autoloads.el:1:2: warning - unsupported ;;;###autoload followed by: {interaction-environment.1}defvar
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el)
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el:2:4: warning - no method `getPointMarker' in java.lang.Object
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el:5:4: warning - no method `isBeginningOfLine' in java.lang.Object
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el:8:4: warning - no method `isEndOfLine' in java.lang.Object
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el:11:4: warning - no method `forwardChar' in java.lang.Object
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el:14:4: warning - no method `backwardChar' in java.lang.Object
[elisp] /Users/jim/Software/kawa/gnu/jemacs/lisp/editfns.el:28:4: warning - no method `getMarkMarker' in java.lang.Object
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/hanoi.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/keydefs.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/keymap.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/primitives.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/rect.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/simple.el)
[elisp] (compiling /Users/jim/Software/kawa/gnu/jemacs/lisp/subr.el)


Jim
Index: build.xml
===================================================================
RCS file: /cvs/kawa/kawa/build.xml,v
retrieving revision 1.13
diff -u -r1.13 build.xml
--- build.xml	6 Mar 2003 16:55:18 -0000	1.13
+++ build.xml	10 Mar 2003 05:48:10 -0000
@@ -528,6 +528,8 @@
         <include name="printf.scm"/>
         <include name="srfi1.scm"/>
         <include name="readtable.scm"/>
+        <include name="DefineRecordType.scm"/>
+        <include name="cut.scm"/>
       </fileset>
 
   <target name="check-slib-scm-classes">
@@ -630,6 +632,9 @@
       <fileset id="jemacs-buffer-scm" dir="${src.dir}/gnu/jemacs/buffer"> 
         <include name="emacs.scm"/>
       </fileset>
+      <fileset id="jemacs-slib-scm" dir="${src.dir}/gnu/kawa/slib"> 
+        <include name="gui.scm"/>
+      </fileset>
       <fileset id="jemacs-el" dir="${src.dir}/gnu/jemacs/lisp"> 
         <include name="primitives.el"/>
         <include name="alist.el"/>
@@ -656,6 +661,10 @@
           <srcfiles refid="jemacs-buffer-scm"/>
         </uptodate>
         <uptodate>
+          <mapper type="glob" from="*.scm" to="*.class"/>
+          <srcfiles refid="jemacs-slib-scm"/>
+        </uptodate>
+        <uptodate>
           <mapper type="glob" from="*.el" to="*.class"/>
           <srcfiles refid="jemacs-el"/>
         </uptodate>
@@ -698,6 +707,15 @@
       <arg value="-d"/> <arg path="${build.classes}"/>
       <arg line="-P gnu.jemacs.buffer. --module-static -C"/>
       <fileset refid="jemacs-buffer-scm"/>
+    </apply>
+
+    <apply taskname="kawa" executable="java" 
+           failonerror="true" parallel="true">
+      <arg value="-classpath"/> <arg path="${build.classes}"/>
+      <arg value="kawa.repl"/>
+      <arg value="-d"/> <arg path="${build.classes}"/>
+      <arg line="-P gnu.kawa.slib. --module-static -C"/>
+      <fileset refid="jemacs-slib-scm"/>
     </apply>
 
     <apply taskname="elisp" executable="java" 
Index: gnu/xquery/lang/XQuery.java
===================================================================
RCS file: /cvs/kawa/kawa/gnu/xquery/lang/XQuery.java,v
retrieving revision 1.34
diff -u -r1.34 XQuery.java
--- gnu/xquery/lang/XQuery.java	5 Mar 2003 08:11:13 -0000	1.34
+++ gnu/xquery/lang/XQuery.java	10 Mar 2003 05:48:12 -0000
@@ -187,6 +187,9 @@
     define("string-value", gnu.xquery.util.StringValue.stringValue);
     define("string", gnu.xquery.util.StringValue.string);
     define("concat", new kawa.standard.string_append());
+    define("substring", gnu.xquery.util.StringValue.substring);
+    define("upper-case", gnu.xquery.util.StringValue.upperCase);
+    define("lower-case", gnu.xquery.util.StringValue.lowerCase);
 
     define("write-to", gnu.kawa.xml.WriteTo.writeTo);
     define_field("iterator-items",
Index: gnu/xquery/util/StringValue.java
===================================================================
RCS file: /cvs/kawa/kawa/gnu/xquery/util/StringValue.java,v
retrieving revision 1.4
diff -u -r1.4 StringValue.java
--- gnu/xquery/util/StringValue.java	10 Jan 2003 04:54:02 -0000	1.4
+++ gnu/xquery/util/StringValue.java	10 Mar 2003 05:48:12 -0000
@@ -12,6 +12,43 @@
   = new StringValue("string-value");
   public static final StringValue string = new StringValue("string");
 
+  public static final Procedure1 upperCase
+    = new Procedure1("upper-case")
+    {
+  public Object apply1 (Object node)
+  {
+     return node.toString().toUpperCase();
+  }
+    };
+    
+  public static final Procedure1 lowerCase
+    = new Procedure1("lower-case")
+    {
+  public Object apply1 (Object node)
+  {
+     return node.toString().toLowerCase();
+  }
+    };
+    
+  public static final Procedure3 substring
+    = new Procedure3("substring")
+    {
+  public Object apply2 (final Object str, final Object start)
+  {
+     final int i = ((Number) start).intValue() - 1;
+     
+     return str.toString().substring(i);
+  }
+
+  public Object apply3 (final Object str, final Object start, final Object length)
+  {
+     final int i = ((Number) start).intValue() - 1;
+     final int len = ((Number) length).intValue();
+     
+     return str.toString().substring(i, i + len);
+  }
+    };
+    
   public StringValue(String name)
   {
     super(name);

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