Commit 408ccf50 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau Committed by Elias Pipping

Fix asdf-tools for Windows

parent c68f0926
...@@ -109,7 +109,7 @@ as in for instance: ...@@ -109,7 +109,7 @@ as in for instance:
Or you can make that your local default (assuming GNU make) using: Or you can make that your local default (assuming GNU make) using:
ln -s Makefile-lisp-scripting GNUmakefile echo "include Makefile-lisp-scripting" > GNUmakefile
These Lisp tools by default use Clozure Common Lisp (CCL) to build and run a binary These Lisp tools by default use Clozure Common Lisp (CCL) to build and run a binary
`build/asdf-tools` that will orchestrate the tests. `build/asdf-tools` that will orchestrate the tests.
......
...@@ -8,7 +8,7 @@ set driver_lisp=uiop\package.lisp + uiop\common-lisp.lisp + uiop\utility.lisp + ...@@ -8,7 +8,7 @@ set driver_lisp=uiop\package.lisp + uiop\common-lisp.lisp + uiop\utility.lisp +
set defsystem_lisp=upgrade.lisp + cache.lisp + component.lisp + system.lisp + find-system.lisp + find-component.lisp + operation.lisp + action.lisp + lisp-action.lisp + plan.lisp + operate.lisp + parse-defsystem.lisp + bundle.lisp + concatenate-source.lisp + output-translations.lisp + source-registry.lisp + package-inferred-system.lisp + backward-interface.lisp + backward-internals.lisp + interface.lisp + user.lisp + footer.lisp set defsystem_lisp=upgrade.lisp + cache.lisp + component.lisp + system.lisp + find-system.lisp + find-component.lisp + operation.lisp + action.lisp + lisp-action.lisp + plan.lisp + operate.lisp + parse-defsystem.lisp + bundle.lisp + concatenate-source.lisp + output-translations.lisp + source-registry.lisp + package-inferred-system.lisp + backward-interface.lisp + backward-internals.lisp + interface.lisp + user.lisp + footer.lisp
%~d0 %~d0
cd %~p0 cd "%~p0"
if "%~1"=="" goto all if "%~1"=="" goto all
if "%~1"=="all" goto all if "%~1"=="all" goto all
...@@ -19,8 +19,8 @@ if "%~1"=="noext" goto noext ...@@ -19,8 +19,8 @@ if "%~1"=="noext" goto noext
if "%~1"=="driver_files" goto driver_files if "%~1"=="driver_files" goto driver_files
if "%~1"=="defsystem_files" goto defsystem_files if "%~1"=="defsystem_files" goto defsystem_files
call %0 build_asdf_tools call "%0" build_asdf_tools
%here%\build\asdf-tools.exe env %* "%here%\build\asdf-tools.exe" env %*
goto end goto end
...@@ -40,9 +40,9 @@ goto end ...@@ -40,9 +40,9 @@ goto end
:build_asdf_tools :build_asdf_tools
:: Building a binary for asdf-tools :: Building a binary for asdf-tools
if exists build\asdf-tools.exe goto end if exist build\asdf-tools.exe goto end
call %0 build_asdf call "%0" build_asdf
%here%\tools\asdf-tools.bat build-asdf-tools "%here%\tools\asdf-tools.bat" build-asdf-tools
goto end goto end
:clobber :clobber
......
...@@ -8,8 +8,7 @@ ...@@ -8,8 +8,7 @@
(:version "cl-scripting" "0.2") (:version "cl-scripting" "0.2")
(:feature :sbcl (:require "sb-introspect"))) (:feature :sbcl (:require "sb-introspect")))
:build-operation program-op :build-operation program-op
:build-pathname #.(format nil "../build/asdf-tools~@[.~A~]" :build-pathname "../build/asdf-tools"
(asdf/bundle:bundle-pathname-type :program))
:entry-point "asdf-tools::entry-point" :entry-point "asdf-tools::entry-point"
:components :components
((:file "package") ((:file "package")
......
@echo off ::@echo off
::: By default. We use CCL, because SBCL doesn't have a good enough run-program on Windows. ::: By default. We use CCL, because SBCL doesn't have a good enough run-program on Windows.
if "%LISP%" == "" goto ccl if "%LISP%" == "" goto ccl
...@@ -9,22 +9,22 @@ if "%LISP%" == "sbcl" goto sbcl ...@@ -9,22 +9,22 @@ if "%LISP%" == "sbcl" goto sbcl
:ccl :ccl
if "%CCL%" == "" set CCL=ccl if "%CCL%" == "" set CCL=ccl
%CCL% --no-init --load %~dp0asdf-tools -- %* "%CCL%" --no-init --load "%~dp0asdf-tools" -- %*
goto end goto end
:sbcl :sbcl
::: As of SBCL 1.2.13, SBCL's run-program fails to call CMD.EXE directly, so can't fully run asdf-tools ::: As of SBCL 1.2.13, SBCL's run-program fails to call CMD.EXE directly, so can't fully run asdf-tools
if "%SBCL%" == "" set SBCL=sbcl if "%SBCL%" == "" set SBCL=sbcl
%SBCL% --noinform --no-userinit --no-sysinit --script %~dp0asdf-tools %* "%SBCL%" --noinform --no-userinit --no-sysinit --script "%~dp0asdf-tools" %*
goto end goto end
:allegro :allegro
if "%ALLEGRO%" == "" set ALLEGRO=alisp.exe if "%ALLEGRO%" == "" set ALLEGRO=alisp.exe
if "%~1" == "get_allegro_dir" goto get_allegro_dir if "%~1" == "get_allegro_dir" goto get_allegro_dir
call %0 get_allegro_dir %ALLEGRO% %ALLEGRO%.exe call %0 get_allegro_dir "%ALLEGRO%" "%ALLEGRO%.exe"
%ALLEGRODIR%buildi.exe -I %ALLEGRODIR%alisp.dxl -qq -e "(setf *load-verbose* nil)" -L %~dp0asdf-tools. -- %* "%ALLEGRODIR%buildi.exe" -I "%ALLEGRODIR%alisp.dxl" -qq -e "(setf *load-verbose* nil)" -L "%~dp0asdf-tools." -- %*
goto end goto end
:get_allegro_dir :get_allegro_dir
if not "%~dp$PATH:2" == "" ( set ALLEGRODIR=%~dp$PATH:2& goto end ) if not "%~dp$PATH:2" == "" ( set ALLEGRODIR=%~dp$PATH:2& goto end )
......
...@@ -14,8 +14,12 @@ ...@@ -14,8 +14,12 @@
(defun system-source-files (system &key monolithic) (defun system-source-files (system &key monolithic)
(let ((system (find-system system))) (let ((system (find-system system)))
(enough-namestrings (system-source-directory system) (enough-namestrings
(input-files 'concatenate-source-op system)))) (system-source-directory system)
(input-files (if monolithic
'monolithic-concatenate-source-op
'concatenate-source-op)
system))))
;;; Making release tarballs for asdf, asdf/defsystem, uiop. ;;; Making release tarballs for asdf, asdf/defsystem, uiop.
......
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