Changeset 15262

Timestamp:

04/28/20 06:37:39 (3 years ago)

Author:

Mark Evenson

Message:

abcl-build: further fixes to work under the Travis CI

Location:

trunk/abcl

Files:

• abcl.asd (modified) (1 diff)
• ci/release.lisp (modified) (1 diff)
• contrib/abcl-build/build/ant.lisp (modified) (1 diff)

trunk/abcl/abcl.asd

@@ -177 +177 @@
                         :components ((:static-file "changes.n3")
                                      (:file "changes")))))
+

trunk/abcl/ci/release.lisp

@@ -1 +1 @@
 (require :asdf)
-(require :abcl-contrib)
+(asdf:load-system :abcl-contrib)
+(asdf:load-system :abcl)
 
-(when (asdf:find-system :abcl)
-  (asdf:load-system :abcl-build)
-  (let (ant)
-    (abcl-build:with-ensured-ant (ant)
-      (abcl-build:ant/call "abcl.release"))))
+(if (not (asdf:find-system :abcl-build))
+    (warn "Can't find <urn:abcl.org/contrib/abcl-build> in ASDF.")
+    (let (ant)
+      (asdf:load-system :abcl-build)
+      (abcl-build:with-ensured-ant (ant)
+        (abcl/build:ant/call "build.xml"
+                             '("abcl.release" "abcl.wrapper")))))
+
 
     

trunk/abcl/contrib/abcl-build/build/ant.lisp

@@ -75 +75 @@
 
 (defun ant/call (ant-file target-or-targets)
-  (let (ant)
+  (let ((ant-file-pathname (if (typep ant-file 'pathname)
+                               ant-file
+                               (merge-pathnames ant-file)))
+        ant)
     (with-ensured-ant (ant)
+      (warn "About to invoke synchronous call to run external proccess
")
       (uiop:run-program
        `(,ant "-buildfile"
-              ,(stringify ant-file)
+              ,(stringify ant-file-pathname)
               ,@(listify target-or-targets))
        :output :string))))