Commit 5bcd1a74 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Fix make.bat & test-sysdef-asdf.script on Windows.

parent 7038a24e
......@@ -4,8 +4,8 @@
set here=%~dp0
set header_lisp=header.lisp
set driver_lisp=uiop/package.lisp uiop/common-lisp.lisp uiop/utility.lisp uiop/os.lisp uiop/pathname.lisp uiop/filesystem.lisp uiop/stream.lisp uiop/image.lisp uiop/run-program.lisp uiop/lisp-build.lisp uiop/configuration.lisp uiop/backward-driver.lisp uiop/driver.lisp
set defsystem_lisp=upgrade.lisp component.lisp system.lisp cache.lisp find-system.lisp find-component.lisp operation.lisp action.lisp lisp-action.lisp plan.lisp operate.lisp output-translations.lisp source-registry.lisp parse-defsystem.lisp bundle.lisp concatenate-source.lisp package-inferred-system.lisp backward-internals.lisp backward-interface.lisp interface.lisp user.lisp footer.lisp
set driver_lisp=uiop\package.lisp + uiop\common-lisp.lisp + uiop\utility.lisp + uiop\os.lisp + uiop\pathname.lisp + uiop\filesystem.lisp + uiop\stream.lisp + uiop\image.lisp + uiop\run-program.lisp + uiop\lisp-build.lisp + uiop\configuration.lisp + uiop\backward-driver.lisp + uiop\driver.lisp
set defsystem_lisp=upgrade.lisp + component.lisp + system.lisp + cache.lisp + find-system.lisp + find-component.lisp + operation.lisp + action.lisp + lisp-action.lisp + plan.lisp + operate.lisp + output-translations.lisp + source-registry.lisp + parse-defsystem.lisp + bundle.lisp + concatenate-source.lisp + package-inferred-system.lisp + backward-internals.lisp + backward-interface.lisp + interface.lisp + user.lisp + footer.lisp
%~d0
cd %~p0
......@@ -30,7 +30,7 @@ goto :end
:: That's the only thing that we really need before we may invoke asdf-builder.
if not exist build mkdir build
set a=build\asdf.lisp
copy /b %header_lisp% %driver_lisp% %defsystem_lisp% %a%.tmp
copy /b %header_lisp% + %driver_lisp% + %defsystem_lisp% %a%.tmp
if not exist %a% goto clobber
fc /b /0 %a%.tmp %a% > nul
if errorlevel 1 goto clobber
......@@ -39,7 +39,7 @@ goto :end
:clobber
if exist %a% del /f /q %a%
ren %a%.tmp %a%
rename %a%.tmp asdf.lisp
goto end
:ext
......
......@@ -62,10 +62,11 @@
(defun bootstrap-lisp-files (target)
(mapcar
'parse-unix-namestring
(remove-if 'emptyp
'parse-native-namestring
(remove-if (lambda (x) (or (emptyp x) #+os-windows (equal x "+")))
(split-string ;; don't use make(1), use the bootstrap script
(run-program `(#+os-unix "./make.sh" #+os-windows "make.bat" ,target)
#+os-windows :force-shell #+os-windows t
:directory *asdf-directory* :output :string :error-output t)
:separator #(#\space #\newline #\return #\tab)))))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment