Commit 5c4359b0 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Rename make.sh and make.bat to make-asdf.*

This notably avoids confusion on Windows, where `make` might run .\make.bat
instead of looking for make.exe in the %PATH%.

Also update usage documentation in Makefile-lisp-scripting after renaming.
parent aaf1495b
# -*- Makefile -*- This minimal Makefile delegates most work to the asdf-tools script # -*- Makefile -*- This minimal Makefile delegates most work to the asdf-tools script
# #
# End-Users, all you need to do is: # End-Users, all you need to do is:
# make # make -f Makefile-lisp-scripting
# #
# Vendors, you may want to test your implementation with: # Vendors, you may want to test your implementation with:
# make test l=sbcl # make -f Makefile-lisp-scripting test l=sbcl
# BUT you first need have installed the development-time external dependencies of ASDF; # BUT you first need have installed the development-time external dependencies of ASDF;
# this will be done automatically if you are using quicklisp; # this will be done automatically if you are using quicklisp;
# you can do it manually with your favorite tools (e.g. clbuild or git); # you can do it manually with your favorite tools (e.g. clbuild or git);
# or you can do it using `git submodule update` which is also available as: # or you can do it using `git submodule update` which is also available as:
# make ext # make -f Makefile-lisp-scripting ext
# To undo the `git submodule update` you can use: `make noext` # To undo the `git submodule update` you can use: `make noext`
# #
# Other targets are for maintainer use only. If you want a list of all of the targets, use # Other targets are for maintainer use only. If you want a list of all of the targets, use
# make help # make -f Makefile-lisp-scripting help
# #
### Default fall back rule: delegate to asdf-tools. ### Default fall back rule: delegate to asdf-tools.
# Note that the l= L= etc. are the only way I (Faré) have found to # Note that the l= L= etc. are the only way I (Faré) have found to
...@@ -34,18 +34,18 @@ ...@@ -34,18 +34,18 @@
# you may have to use positional parameters instead (unless you use env as below), as in # you may have to use positional parameters instead (unless you use env as below), as in
# ./tools/asdf-tools bump 3.2.1 # ./tools/asdf-tools bump 3.2.1
# instead of # instead of
# make bump v=3.2.1 # make -f Makefile-lisp-scripting bump v=3.2.1
# or # or
# ./make.sh v=3.2.1 bump # ./make-asdf.sh v=3.2.1 bump
# or # or
# ./tools/asdf-tools env v=3.2.1 bump # ./tools/asdf-tools env v=3.2.1 bump
# or # or
# v=3.2.1 ./tools/asdf-tools bump # v=3.2.1 ./tools/asdf-tools bump
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
MAKE_SCRIPT := cmd /c make.bat MAKE_SCRIPT := cmd /c make-asdf.bat
else else
MAKE_SCRIPT := ./make.sh MAKE_SCRIPT := ./make-asdf.sh
endif endif
...@@ -57,7 +57,8 @@ build/asdf-tools build/asdf-tools.exe: build_asdf_tools ...@@ -57,7 +57,8 @@ build/asdf-tools build/asdf-tools.exe: build_asdf_tools
.PHONY: force all ext noext driver_files defsystem_files build_asdf build_asdf_tools .PHONY: force all ext noext driver_files defsystem_files build_asdf build_asdf_tools
# The text below was automaticaly generated by `make --silent makefile-targets` # The text below was automaticaly generated by
# make -f Makefile-lisp-scripting --silent makefile-targets
# then manually inserted here to provide for completion: # then manually inserted here to provide for completion:
.PHONY: archive build-asdf build-asdf-tools bump bump-version check-all-results check-all-scripts-results check-all-upgrade-results clean debian-package doc ext-clear ext-init ext-reset ext-update extract extract-all-tagged-asdf extract-tagged-asdf fix-local-git-tags fix-remote-git-tags git-all-committed-p help install install-asdf link-archive load make-and-publish-archive make-archive makefile-targets merge-master-into-release publish-archive publish-debian-package push re show-commands t test test-all test-all-clean-load test-all-no-stop test-all-no-upgrade test-all-no-upgrade-no-stop test-all-scripts test-all-scripts-no-stop test-all-upgrade test-all-upgrade-no-stop test-ascii test-basic test-clean-load test-load-systems test-scripts test-upgrade u wc website .PHONY: archive build-asdf build-asdf-tools bump bump-version check-all-results check-all-scripts-results check-all-upgrade-results clean debian-package doc ext-clear ext-init ext-reset ext-update extract extract-all-tagged-asdf extract-tagged-asdf fix-local-git-tags fix-remote-git-tags git-all-committed-p help install install-asdf link-archive load make-and-publish-archive make-archive makefile-targets merge-master-into-release publish-archive publish-debian-package push re show-commands t test test-all test-all-clean-load test-all-no-stop test-all-no-upgrade test-all-no-upgrade-no-stop test-all-scripts test-all-scripts-no-stop test-all-upgrade test-all-upgrade-no-stop test-ascii test-basic test-clean-load test-load-systems test-scripts test-upgrade u wc website
......
@echo off @echo off
:: Usage: ./make.sh [keyword=argument ...] <command> :: Usage: ./make-asdf.bat [keyword=argument ...] <command>
:: See the Makefile for the list of acceptable keyword arguments :: See the Makefile for the list of acceptable keyword arguments
set here=%~dp0 set here=%~dp0
......
#!/bin/sh #!/bin/sh
# Usage: ./make.sh [keyword=argument ...] <command> # Usage: ./make-asdf.sh [keyword=argument ...] <command>
# See the Makefile for the list of acceptable keyword arguments # See the Makefile for the list of acceptable keyword arguments
here="$(dirname $0)" here="$(dirname $0)"
......
...@@ -56,13 +56,13 @@ ...@@ -56,13 +56,13 @@
(system-source-file (find-system :asdf))) (system-source-file (find-system :asdf)))
;;; disabling this test on windows since it relies on running make.bat, which ;;; disabling this test on windows since it relies on running make-asdf.bat, which
;;; does not work for me under cygwin. - rpg 2016-03-20 ;;; does not work for me under cygwin. - rpg 2016-03-20
(defun search-makefile (target) (defun search-makefile (target)
(with-open-file (str (merge-pathnames (make-pathname :name "Makefile" :type nil) (with-open-file (str (merge-pathnames (make-pathname :name "Makefile" :type nil)
*asdf-directory* )) *asdf-directory* ))
(let ((line (let ((line
(loop for x = (read-line str) (loop for x = (read-line str)
when (search target x) when (search target x)
return (subseq x (length target)) return (subseq x (length target))
......
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