Changeset 11556

Timestamp:

01/15/09 10:07:39 (15 years ago)

Author:

Mark Evenson

Message:

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.

Location:

trunk/abcl

Files:

• abcl.asd (modified) (4 diffs)
• build-abcl.lisp (modified) (1 diff)
• customizations.lisp.in (modified) (1 diff)
• make-jar.bat.in (modified) (1 diff)
• make-jar.in (modified) (1 diff)

trunk/abcl/abcl.asd

@@ -7 +7 @@
 (in-package :abcl-asdf)
 
+;;; Wrapper for all ABCL ASDF definitions.
 (defsystem :abcl
-  :documentation "Wrapper for all ABCL ASDF definitions."
   :version "0.2.0")
 
@@ -19 +19 @@
   (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))
@@ -29 +30 @@
 
 (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))
@@ -44 +44 @@
      :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

trunk/abcl/build-abcl.lisp

@@ -259 +259 @@
           (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 ()))

trunk/abcl/customizations.lisp.in

@@ -28 +28 @@
   (: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/")

trunk/abcl/make-jar.bat.in

@@ -1 +1 @@
 cd src
 @JAR@ cmf manifest-abcl ..\abcl.jar org\armedbear\lisp\*.class
-@JAR@ uf ..\abcl.jar org\armedbear\lisp\java\awt\*.class
-@JAR@ uf ..\abcl.jar org\armedbear\lisp\*.lisp org\armedbear\lisp\LICENSE
+@JAR@ uf ..\abcl.jar org\armedbear\lisp\util\*.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
 @JAR@ uf ..\abcl.jar org\armedbear\lisp\*.cls

trunk/abcl/make-jar.in

@@ -2 +2 @@
 cd src
 @JAR@ cmf manifest-abcl ../abcl.jar org/armedbear/lisp/*.class
-@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
+@JAR@ uf ../abcl.jar org/armedbear/lisp/util/*.class
 find . -name '*.cls' | xargs @JAR@ uf ../abcl.jar