Changeset 11556


Ignore:
Timestamp:
01/15/09 10:07:39 (12 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:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/abcl.asd

    r11546 r11556  
    77(in-package :abcl-asdf)
    88
     9;;; Wrapper for all ABCL ASDF definitions.
    910(defsystem :abcl
    10   :documentation "Wrapper for all ABCL ASDF definitions."
    1111  :version "0.2.0")
    1212
     
    1919  (asdf:oos 'asdf:test-op :ansi-test-compiled :force t))
    2020
     21;;; A collection of test suites for ABCL.
    2122(defsystem :test-abcl
    22   :documentation "A collection of test suites for ABCL."
     23
    2324  :version "0.3"
    2425  :depends-on (:ansi-test-compiled :ansi-test-interpreted))
     
    2930
    3031(defsystem :ansi-test :version "0.1" :components
    31      ((:module ansi-tests :pathname "test/lisp/ansi/"
    32          :documentation "GCL ANSI test suite."
    33          :components
    34         ((:file "package")))))
     32     ;;; GCL ANSI test suite.
     33     ((:module ansi-tests :pathname "test/lisp/ansi/" :components
     34         ((:file "package")))))
    3535(defsystem :ansi-test-interpreted :version "0,1" :depends-on (ansi-test))
    3636(defsystem :ansi-test-compiled :version "0.1" :depends-on (ansi-test))
     
    4444     :compile-tests t))
    4545
    46 ;;; Works for: abcl, sbcl, clisp
     46;;; Build ABCL from a Lisp.
     47;;; Works for: abcl, sbcl, clisp, cmu, lispworks, allegro, openmcl
    4748(defsystem :build-abcl
    48   :documentation "Build ABCL from a Lisp."
    4949  :components
    5050     ((:module build :pathname ""  :components
  • trunk/abcl/build-abcl.lisp

    r11549 r11556  
    259259          (append (with-current-directory (*abcl-dir*)
    260260                    (directory "*.java"))
    261                   (with-current-directory ((merge-pathnames "java/awt/" *abcl-dir*))
     261                  (with-current-directory ((merge-pathnames "util/" *abcl-dir*))
    262262                    (directory "*.java"))))
    263263         (to-do ()))
  • trunk/abcl/customizations.lisp.in

    r11354 r11556  
    2828  (:windows
    2929   (setq *jdk*           "C:\\Program Files\\Java\\jdk1.5.0_16\\")
    30    #+(or) (setq *java-compiler* "jikes")
     30   #+nil (setq *java-compiler* "jikes")
    3131   )
    3232  (:darwin
    3333   (setq *jdk*           "/usr/")
    34    (setq *java-compiler* "jikes")
    35    #+(or) (setq *jar*    "jar"))
     34   #+nil (setq *java-compiler* "jikes")
     35   #+nil (setq *jar*    "jar"))
    3636  ((:linux :unknown)
    3737   (setq *jdk*           "/home/peter/sun/jdk1.5.0_16/")
  • trunk/abcl/make-jar.bat.in

    r11354 r11556  
    11cd src
    22@JAR@ cmf manifest-abcl ..\abcl.jar org\armedbear\lisp\*.class
    3 @JAR@ uf ..\abcl.jar org\armedbear\lisp\java\awt\*.class
    4 @JAR@ uf ..\abcl.jar org\armedbear\lisp\*.lisp org\armedbear\lisp\LICENSE
     3@JAR@ uf ..\abcl.jar org\armedbear\lisp\util\*.class
     4@JAR@ uf ..\abcl.jar org\armedbear\lisp\LICENSE
     5@JAR@ uf ..\abcl.jar org\armedbear\lisp\*.lisp
    56@JAR@ uf ..\abcl.jar org\armedbear\lisp\*.abcl
    67@JAR@ uf ..\abcl.jar org\armedbear\lisp\*.cls
  • trunk/abcl/make-jar.in

    r11354 r11556  
    22cd src
    33@JAR@ cmf manifest-abcl ../abcl.jar org/armedbear/lisp/*.class
    4 @JAR@ uf ../abcl.jar org/armedbear/lisp/java/awt/*.class
    54@JAR@ uf ../abcl.jar org/armedbear/lisp/LICENSE
    65@JAR@ uf ../abcl.jar org/armedbear/lisp/*.lisp
    76@JAR@ uf ../abcl.jar org/armedbear/lisp/*.abcl
     7@JAR@ uf ../abcl.jar org/armedbear/lisp/util/*.class
    88find . -name '*.cls' | xargs @JAR@ uf ../abcl.jar
Note: See TracChangeset for help on using the changeset viewer.