@@ -34,7 +34,7 @@ top of a source file" (mapcan #'handle-slot slots))) `(module (,@(when (build-grain-p grain) - `(:fullname ,(subseq (fullname grain) 1))) + `(:fullname ,(fullname grain))) ,@(handle-slots '(author maintainer version licence description long-description)) ,@(with-slots (load-depends-on compile-depends-on depends-on) grain (if (equivalent-deps-p grain) @@ -322,9 +322,9 @@ so that the system can now be compiled with XCVB." (mapcar 'asdf::coerce-name (get-dependencies-from-components (mapcar 'asdf:find-system systems)))) (system-components - (with-open-file (s (cl-launch:apply-output-pathname-translations - (merge-pathnames components-path))) - (read s))) + (read-first-file-form + (cl-launch:apply-output-pathname-translations + (merge-pathnames components-path)))) (asdf-system (progn (remhash system asdf::*defined-systems*) asdf-converter.lisp @@ -2,4 +2,5 @@ (module (:fullname "/xcvb/test/a2x" :supersedes-asdf ("xcvb-test-a2x") + :build-depends-on ("/cl-launch") :depends-on ("main" "help"))) test/a2x/build.xcvb @@ -1,4 +1,4 @@ #+xcvb (module ()) -(cl:defpackage :xcvb-hello - (:use :common-lisp :xcvb-hello-lib)) +(cl:defpackage :a2x-test + (:use :common-lisp :cl-launch)) test/a2x/pkgdcl.lisp @@ -125,12 +125,15 @@ validate_x2a () { validate_hello_build make hello-using-asdf $ENV } -validate_rmx_a2x () { +validate_rmx () { cd $XCVB_DIR/test/a2x - xcvb rmx --build /xcvb/test/a2x - git diff $XCVB/test/a2x | cmp - rmx.diff xcvb a2x --system a2x-test - git diff $XCVB/test/a2x | cmp - /dev/null + git diff $XCVB_DIR/test/a2x | cmp - /dev/null +} + +validate_a2x () { + xcvb rmx --build /xcvb/test/a2x + git diff $XCVB_DIR/test/a2x | grep -v '^index' | cmp - rmx.diff } validate_master () { test/runme.zsh @@ -1,3 +1,3 @@ #+xcvb (module (:depends-on ("pkgdcl"))) (cl:defparameter xcvb:*xcvb-version* - "0.421") + "0.423") version.lisp 4f8b528b5c5da934aea68c9d7a68c5beb3dc3192 Francois-Rene Rideau fare@tunes.org http://github.com/fare/xcvb/commit/aa70f52168a68cd27745fc5c361f01dcd1b4cbba aa70f52168a68cd27745fc5c361f01dcd1b4cbba 2009-11-08T16:49:12-08:00 2009-11-08T16:49:12-08:00 XCVB .423: more work on the test suite. c478b8a7d39ae88f1d692a003a5b2bbe63df53a5 Francois-Rene Rideau fare@tunes.org