Fix make-array transforms.

[sbcl.git] / tools-for-build / wxs.lisp

diff --git a/tools-for-build/wxs.lisp b/tools-for-build/wxs.lisp
index baf16a1..bfe05b4 100644 (file)
--- a/tools-for-build/wxs.lisp
+++ b/tools-for-build/wxs.lisp
@@ -95,7 +95,7 @@
       (free-alien guid))))
 
 (defun list-all-contribs ()
-  (loop for flag in (directory "../contrib/*/test-passed")
+  (loop for flag in (directory "../obj/asdf-cache/*/test-passed.test-report")
         collect (car (last (pathname-directory flag)))))
 
 (defvar *id-char-substitutions* '((#\\ . #\_)
@@ -117,7 +117,7 @@
 (defun file-id (pathname)
   (id (format nil "File_~A" (enough-namestring pathname *sbcl-source-root*))))
 
-(defparameter *ignored-directories* '("CVS" ".svn"))
+(defparameter *ignored-directories* '("CVS" ".svn" "test-output"))
 
 (defparameter *pathname-type-abbrevs*
   '(("lisp" . "lsp")
@@ -170,7 +170,7 @@
                 append (collect-components directory))))
 
 (defun collect-contrib-components ()
-  (loop for contrib in (directory "../contrib/*/test-passed")
+  (loop for contrib in (directory "../obj/asdf-cache/*/test-passed.test-report")
         append (collect-components (make-pathname :name nil
                                                   :type nil
                                                   :version nil
@@ -275,9 +275,10 @@
                   "ConfigurableDirectory" "INSTALLDIR"
                   "Level" 1)
        ("ComponentRef" ("Id" "SBCL_Base"))
-       ("ComponentRef" ("Id" "SBCL_Shortcut"))
        ("Feature" ("Id" "Contrib" "Level" 1 "Title" "Contributed Modules")
                   ,@(ref-all-components))
+       ("Feature" ("Id" "Shortcut" "Level" 1 "Title" "Add Start Menu Shortcut")
+                  ("ComponentRef" ("Id" "SBCL_Shortcut")))
        ("Feature" ("Id" "SetPath" "Level" 1 "Title" "Set Environment Variable: PATH")
                   ("ComponentRef" ("Id" "SBCL_SetPATH")))
        ;; SetHome is still enabled by default (level 1), because SBCL