Changeset 11687


Ignore:
Timestamp:
02/23/09 21:26:09 (13 years ago)
Author:
ehuelsmann
Message:

Remove libabcl.so, which is about setting a SIGINT signal handler.

Note: NetBeans? didn't find any usages of Native.java outside of Native.java (?!).

Did this ever work?!

Location:
trunk/abcl
Files:
2 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/abcl/build-abcl.lisp

    r11686 r11687  
    374374    status))
    375375
    376 (defun make-libabcl ()
    377   (and (let* ((javah-namestring (namestring (probe-file (merge-pathnames "bin/javah" *jdk*))))
    378               (command
    379                (format nil "~A -o org/armedbear/lisp/native.h org.armedbear.lisp.Native"
    380                        javah-namestring))
    381               (status
    382                (run-shell-command command :directory *source-root*)))
    383          (unless (zerop status)
    384            (format t "~A returned ~S~%" command status))
    385          (zerop status))
    386        (let* ((jdk-namestring (namestring *jdk*))
    387               (command
    388                (format nil "gcc -shared -o libabcl.so -O -D_REENTRANT -fpic -I~Ainclude -I~Ainclude/~A native.c"
    389                        jdk-namestring jdk-namestring
    390                        (cond ((eq *platform* :linux)
    391                               "linux")
    392                              ((search "SunOS" (software-type))
    393                               "solaris")
    394                              ((search "FreeBSD" (software-type))
    395                               "freebsd"))))
    396               (status
    397                (run-shell-command command :directory *abcl-dir*)))
    398          (unless (zerop status)
    399            (format t "~A returned ~S~%" command status))
    400          (zerop status))))
    401376
    402377;; abcl/abcl.bat
     
    415390         (let ((pathname (merge-pathnames "abcl" *tree-root*)))
    416391           (with-open-file (s pathname :direction :output :if-exists :supersede)
    417              (if (eq *platform* :linux)
    418                  ;; On Linux, set java.library.path for libabcl.so.
    419                  (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -Xrs -Djava.library.path=~A -cp ~A org.armedbear.lisp.Main \"$@\"~%"
    420                          (safe-namestring *java*)
    421                          (safe-namestring (merge-pathnames "org/armedbear/lisp/" *build-root*))
    422                          (safe-namestring (merge-pathnames "abcl.jar" *dist-root*)))
    423                  ;; Not Linux.
    424                  (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -cp ~A org.armedbear.lisp.Main \"$@\"~%"
    425                          (safe-namestring *java*)
    426                          (safe-namestring (merge-pathnames "abcl.jar" *dist-root*)))))
     392             (format s "#!/bin/sh~%exec ~A -Xss4M -Xmx256M -cp ~A org.armedbear.lisp.Main \"$@\"~%"
     393                     (safe-namestring *java*)
     394                     (safe-namestring (merge-pathnames "abcl.jar" *dist-root*))))
    427395           (run-shell-command (format nil "chmod +x ~A" (safe-namestring pathname))
    428396                              :directory *tree-root*)))))
     
    461429                   (list *abcl-dir* "*.class" "*.abcl" "*.cls"
    462430                                    "native.h" "libabcl.so" "build")
     431                   ;; as of 0.14, native.h and libabcl.so have been removed
    463432                   (list (merge-pathnames "util/" *abcl-dir*) "*.class")
    464433                   (list (merge-pathnames "build/classes/org/armedbear/lisp/"
     
    484453                        jar
    485454                        clean
    486                         libabcl
    487455                        full)
    488456  (let ((start (get-internal-real-time)))
     
    520488          (format t "Build failed.~%")
    521489          (return-from build-abcl nil))))
    522     ;; libabcl.so
    523     (when (and (or full libabcl)
    524                (or (eq *platform* :linux)
    525                    (search "SunOS" (software-type))
    526                    (search "FreeBSD" (software-type))))
    527       ;; A failure here is not fatal.
    528       (make-libabcl))
    529490    ;; abcl/abcl.bat
    530491    (make-launch-script)
Note: See TracChangeset for help on using the changeset viewer.