Changeset 15022

Timestamp:

05/29/17 11:53:46 (6 years ago)

Author:

Mark Evenson

Message:

contrib/abcl-build: now runs on new build download infrastructure

Incomplete implementation of probing for working local exectuables.
Currently we always download and use a private ABCL unzip of binary
archives to the XDG user space allocated to such persistence.

All tests succeed under macOS/Windows.

Location:

trunk/abcl/contrib/abcl-build/build

Files:

• abcl-build.lisp (modified) (1 diff)
• ant.lisp (modified) (2 diffs)
• install.lisp (modified) (2 diffs)
• maven.lisp (modified) (1 diff)
• t/abcl-build.lisp (modified) (1 diff)
• t/ant.lisp (modified) (1 diff)
• t/maven.lisp (modified) (1 diff)
• t/util.lisp (modified) (1 diff)

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

@@ -4 +4 @@
   (warn "Unimplemented"))
 
-(defun build-abcl (&key force
-                        (batch t)
-                        compile-system
-                        jar
-                        clean
-                     full)
-  (warn "Unimplemented"))
+(defun build-abcl (&key
+                     force ;; DEPRECATED: not sure of meaning in new underlying API
+                     (batch t) ;; DEPRECATED: lack of meaning
+                     compile-system ;; DEPRECATED: COMPILE-SYSTEM is always invoked
+                     jar ;; DEPRECATED: a jar archive is always built
+                     clean
+                     full) ;; DEPRECATED:  a full build is always performed
+  (unless (ignore-errors (asdf:find-system :abcl))
+    (return-from build-abcl
+      nil))
+  (let ((targets '("abcl")))
+    (when clean
+      (push "abcl.clean" targets))
+    (ant/call (asdf:system-relative-pathname :abcl "build.xml")
+              (nreverse targets))))
 
 
 
+

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

@@ -12 +12 @@
 
 (defun xdg/ant-executable ()
+  (xdg/executable (ant-zip-uri) "bin/ant"))
+
+#+(or)
+(defun xdg/ant-executable ()
   (let* ((uri (ant-zip-uri))
          (directory (xdg/abcl-install-root uri))
@@ -17 +21 @@
                           (subseq name 0 (- (length name) (length "-bin")))))
          (ant-home (merge-pathnames (make-pathname :directory `(:relative ,ant-root-name))
-                                    directory)))
+                                    directory))
+         (ant (merge-pathnames #p"bin/ant" ant-home))
+         result)
+    (dolist (p (possible-executable-names ant))
+      (when (probe-file p)
+        (return-from xdg/ant-executable
+          (values
+           (probe-file p)
+           ant))))
+    ;; failure
     (values
-     (probe-file
-      (localize-executable-name
-       (merge-pathnames #p"bin/ant" ant-home)))
-     ant-home)))
+     nil
+     ant)))
 
 (defun ant/install ()

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

@@ -32 +32 @@
          (download uri))
         (root
-         (xdg/abcl-download-root :for-uri uri)))
+         (xdg/abcl-install-root uri)))
     (ensure-directories-exist root)
     (sys:unzip archive root)
@@ -52 +52 @@
   destination)
 
+(defun xdg/executable (uri relative-path)
+  (let* ((directory (xdg/abcl-install-root uri))
+         (root (let ((name (pathname-name uri)))
+                 (subseq name 0 (- (length name) (length "-bin")))))
+         (home (merge-pathnames (make-pathname :directory `(:relative ,root))
+                                    directory))
+         (path (merge-pathnames relative-path home)))
+    (dolist (p (possible-executable-names path))
+      (when (probe-file p)
+        (return-from xdg/executable
+          (values
+           (probe-file p)
+           path))))
+    ;; failure
+    (values
+     nil
+     path)))
+
+
+  
+
   
 

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

@@ -5 +5 @@
 
 (defun xdg/mvn-executable ()
-  (probe-file
-   (localize-executable-name
-    (merge-pathnames "bin/mvn"
-                     (xdg/abcl-install-root (maven-zip-uri))))))
+  (xdg/executable (maven-zip-uri) "bin/mvn"))
 
 (defparameter *maven-install-root* nil)

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

@@ -8 +8 @@
        (abcl-build:build-abcl)
        "Testing BUILD-ABCL
")
-      (prove:diag )
       (prove:ok
        (abcl-build:make-dist (format nil "test-" (random (expt 2 32))))

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

@@ -2 +2 @@
 
 (prove:plan 1)
-(prove:diag "Testing private installation of Ant
")
-(prove:ok (build-abcl:ant/install))
+(prove:ok
+ (build-abcl:ant/install)
+ "Testing ABCL-specific Ant installation of Ant into XDG hierarchy
")
 
 (if (not (ignore-errors (asdf:find-system :abcl)))

trunk/abcl/contrib/abcl-build/build/t/maven.lisp

@@ -2 +2 @@
 
 (prove:plan 1)
-(prove:diag "Testing private installation of Maven
")
 (prove:ok
- (abcl/build:mvn/install))
+ (abcl/build:mvn/install)
+ "Testing ABCL-specific Ant installation of Maven into XDG hierarchy
")
 
 (if (not (ignore-errors (asdf:find-system :abcl)))

trunk/abcl/contrib/abcl-build/build/t/util.lisp

@@ -1 +1 @@
 (in-package :abcl/build/t)
 
-(let ((possible-executables
-       (abcl/build:possible-executable-names "java"))) 
-  (prove:plan 1)
-  (prove:is-type possible-executables
-                 'cons))
+(prove:plan 1)
+(prove:is-type (abcl/build:possible-executable-names "java")
+               'cons)
 
 (prove:plan 1)
 (prove:is (length (abcl/build:split-string "one.two.three." #\.))
-          3)
+          4)
 
 (prove:finalize)