Commit 3ccdcb9a authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

Don't forget tools/ in the path to asdf-tools.

Also, no, at least the unix shell doesn't like - in function names.
parent 75093284
......@@ -10,21 +10,21 @@ cd %~p0
if "%1" == "" goto all
if "%1" == "all" goto all
if "%1" == "build-asdf" goto build-asdf
if "%1" == "build_asdf" goto build_asdf
if "%1" == "ext" goto ext
if "%1" == "noext" goto noext
if "%1" == "driver-files" goto driver-files
if "%1" == "defsystem-files" goto defsystem-files
if "%1" == "driver_files" goto driver_files
if "%1" == "defsystem_files" goto defsystem_files
call %0 build-asdf
%here%\asdf-tools.bat env %*
call %0 build_asdf
%here%\tools\asdf-tools.bat env %*
goto :end
:all
:: Default action: bootstrap asdf.lisp
:build-asdf
:build_asdf
:: 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
......@@ -50,12 +50,12 @@ goto :end
git submodule deinit .
goto end
:driver-files
:driver_files
:: These targets are used during tests to ensure the Makefile is in synch with the .asd files.
echo %driver_lisp%
goto end
:defsystem-files
:defsystem_files
:: These targets are used during tests to ensure the Makefile is in synch with the .asd files.
echo %defsystem_lisp%
goto end
......
......@@ -8,9 +8,9 @@ defsystem_lisp="upgrade.lisp component.lisp system.lisp cache.lisp find-system.l
all () {
# Default action: bootstrap asdf.lisp
build-asdf
build_asdf
}
build-asdf () {
build_asdf () {
# That's the only thing that we really need before we may invoke asdf-builder.
mkdir -p build
a=build/asdf.lisp
......@@ -29,17 +29,17 @@ noext () {
# Remove all the development-time dependencies of ASDF:
git submodule deinit .
}
driver-files () {
driver_files () {
# These targets are used during tests to ensure the Makefile is in synch with the .asd files.
echo ${driver_lisp}
}
defsystem-files () {
defsystem_files () {
# These targets are used during tests to ensure the Makefile is in synch with the .asd files.
echo ${defsystem_lisp}
}
case "$1" in
"") all ;;
all|build-asdf|ext|noext|driver-files|defsystem-files) "$@" ;;
*) build-asdf ; exec ${here}/asdf-tools env "$@" ;;
all|build_asdf|ext|noext|driver_files|defsystem_files) "$@" ;;
*) build_asdf ; exec ${here}/tools/asdf-tools env "$@" ;;
esac ; exit
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