[armedbear-cvs] r11556 - trunk/abcl

[Mark Evenson]

Author: mevenson
Date: Thu Jan 15 10:07:39 2009
New Revision: 11556

Log:
Fix the Lisp based build system to include with the new Java classes in src/org/armedbear/util.

Fix 'abcl.asd' to work with the ASDF distributed with SBCL/CLISP by
removing obsoleted ':documentation' keywords.  ABCL's version of
'asdf.lisp' is really old, so should be replaced.

Add the location of src/org/armedbear/util classes to the auxillary
jar scripts.


Modified:
   trunk/abcl/abcl.asd
   trunk/abcl/build-abcl.lisp
   trunk/abcl/customizations.lisp.in
   trunk/abcl/make-jar.bat.in
   trunk/abcl/make-jar.in

Modified: trunk/abcl/abcl.asd
==============================================================================
--- trunk/abcl/abcl.asd	(original)
+++ trunk/abcl/abcl.asd	Thu Jan 15 10:07:39 2009
@@ -6,8 +6,8 @@
   (:use :cl :asdf))
 (in-package :abcl-asdf)
 
+;;; Wrapper for all ABCL ASDF definitions.
 (defsystem :abcl
-  :documentation "Wrapper for all ABCL ASDF definitions."
   :version "0.2.0")
 
 (defmethod perform :after ((o load-op) (c (eql (find-system 'abcl))))
@@ -18,8 +18,9 @@
   ;;; Additional test suite invocations would go here.
   (asdf:oos 'asdf:test-op :ansi-test-compiled :force t))
 
+;;; A collection of test suites for ABCL.
 (defsystem :test-abcl
-  :documentation "A collection of test suites for ABCL." 
+
   :version "0.3"
   :depends-on (:ansi-test-compiled :ansi-test-interpreted))
 
@@ -28,10 +29,9 @@
   (asdf:oos 'asdf:load-op :ansi-test-compiled :force t))
 
 (defsystem :ansi-test :version "0.1" :components
-     ((:module ansi-tests :pathname "test/lisp/ansi/"
-	       :documentation "GCL ANSI test suite."
-	       :components
-	      ((:file "package")))))
+     ;;; GCL ANSI test suite.
+     ((:module ansi-tests :pathname "test/lisp/ansi/" :components
+	       ((:file "package")))))
 (defsystem :ansi-test-interpreted :version "0,1" :depends-on (ansi-test))
 (defsystem :ansi-test-compiled :version "0.1" :depends-on (ansi-test))
 
@@ -43,9 +43,9 @@
   (funcall (intern (symbol-name 'run) :abcl.tests.ansi-tests)
 	   :compile-tests t))
 
-;;; Works for: abcl, sbcl, clisp
+;;; Build ABCL from a Lisp.
+;;; Works for: abcl, sbcl, clisp, cmu, lispworks, allegro, openmcl
 (defsystem :build-abcl 
-  :documentation "Build ABCL from a Lisp."
   :components 
 	   ((:module build :pathname ""  :components
 		     ((:file "build-abcl") 

Modified: trunk/abcl/build-abcl.lisp
==============================================================================
--- trunk/abcl/build-abcl.lisp	(original)
+++ trunk/abcl/build-abcl.lisp	Thu Jan 15 10:07:39 2009
@@ -258,7 +258,7 @@
   (let* ((source-files
           (append (with-current-directory (*abcl-dir*)
                     (directory "*.java"))
-                  (with-current-directory ((merge-pathnames "java/awt/" *abcl-dir*))
+                  (with-current-directory ((merge-pathnames "util/" *abcl-dir*))
                     (directory "*.java"))))
          (to-do ()))
     (if force

Modified: trunk/abcl/customizations.lisp.in
==============================================================================
--- trunk/abcl/customizations.lisp.in	(original)
+++ trunk/abcl/customizations.lisp.in	Thu Jan 15 10:07:39 2009
@@ -27,12 +27,12 @@
 (case *platform*
   (:windows
    (setq *jdk*           "C:\\Program Files\\Java\\jdk1.5.0_16\\")
-   #+(or) (setq *java-compiler* "jikes")
+   #+nil  (setq *java-compiler* "jikes")
    )
   (:darwin
    (setq *jdk*           "/usr/")
-   (setq *java-compiler* "jikes")
-   #+(or) (setq *jar*    "jar"))
+   #+nil (setq *java-compiler* "jikes")
+   #+nil (setq *jar*    "jar"))
   ((:linux :unknown)
    (setq *jdk*           "/home/peter/sun/jdk1.5.0_16/")
    (setq *jar*           "fastjar")))

Modified: trunk/abcl/make-jar.bat.in
==============================================================================
--- trunk/abcl/make-jar.bat.in	(original)
+++ trunk/abcl/make-jar.bat.in	Thu Jan 15 10:07:39 2009
@@ -1,6 +1,7 @@
 cd src
 @JAR@ cmf manifest-abcl ..\abcl.jar org\armedbear\lisp\*.class
- at JAR@ uf ..\abcl.jar org\armedbear\lisp\java\awt\*.class
- at JAR@ uf ..\abcl.jar org\armedbear\lisp\*.lisp org\armedbear\lisp\LICENSE
+ at JAR@ uf ..\abcl.jar org\armedbear\lisp\util\*.class
+ at JAR@ uf ..\abcl.jar org\armedbear\lisp\LICENSE
+ at JAR@ uf ..\abcl.jar org\armedbear\lisp\*.lisp 
 @JAR@ uf ..\abcl.jar org\armedbear\lisp\*.abcl
 @JAR@ uf ..\abcl.jar org\armedbear\lisp\*.cls

Modified: trunk/abcl/make-jar.in
==============================================================================
--- trunk/abcl/make-jar.in	(original)
+++ trunk/abcl/make-jar.in	Thu Jan 15 10:07:39 2009
@@ -1,8 +1,8 @@
 #!/bin/sh
 cd src
 @JAR@ cmf manifest-abcl ../abcl.jar org/armedbear/lisp/*.class
- at JAR@ uf ../abcl.jar org/armedbear/lisp/java/awt/*.class
 @JAR@ uf ../abcl.jar org/armedbear/lisp/LICENSE
 @JAR@ uf ../abcl.jar org/armedbear/lisp/*.lisp
 @JAR@ uf ../abcl.jar org/armedbear/lisp/*.abcl
+ at JAR@ uf ../abcl.jar org/armedbear/lisp/util/*.class
 find . -name '*.cls' | xargs @JAR@ uf ../abcl.jar