Skip to content
Snippets Groups Projects
Commit fc0a8017 authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

4.0.0.3: *properly* remove :cl-launched from *features* before dump.

Add -E as alias for --entry.
Makefile: at Xach's request, have the tarball make a versioned directory.
parent f80eca5c
No related branches found
No related tags found
No related merge requests found
...@@ -59,9 +59,10 @@ mrproper: clean ...@@ -59,9 +59,10 @@ mrproper: clean
-rm -rf debian/cl-launch .pc/ build-stamp debian/patches/ debian/debhelper.log # debian crap -rm -rf debian/cl-launch .pc/ build-stamp debian/patches/ debian/debhelper.log # debian crap
debian-package: mrproper debian-package: mrproper
git clean -xfd git clean -xfd && \
RELEASE="$$(git tag -l '[4-.9].[0-9].[0-9]' | tail -n 1)" ; \ RELEASE="$$(git tag -l '[4-9].*' | tail -n 1)" ; \
git-buildpackage --git-debian-branch=master --git-upstream-branch=master --git-upstream-tag=$$RELEASE --git-tag --git-retag --git-ignore-branch rm -f ../cl-launch_$${RELEASE}.orig.tar.gz ; \
git-buildpackage --git-debian-branch=master --git-upstream-branch=master --git-upstream-tag=$$RELEASE --git-tag --git-retag --git-ignore-branch && \
lintian -c --fail-on-warnings ../cl-launch_*.changes lintian -c --fail-on-warnings ../cl-launch_*.changes
git clean -xfd git clean -xfd
...@@ -71,6 +72,7 @@ reinstall: ...@@ -71,6 +72,7 @@ reinstall:
# This might fit your system, installing from same directory # This might fit your system, installing from same directory
reinstall_here: reinstall_here:
-git clean -xfd
make install_source install_binary_standalone INSTALL_SOURCE=$$PWD INSTALL_BIN=$$PWD make install_source install_binary_standalone INSTALL_SOURCE=$$PWD INSTALL_BIN=$$PWD
test: test:
...@@ -96,9 +98,11 @@ debian-package-all: debian-package ...@@ -96,9 +98,11 @@ debian-package-all: debian-package
./cl-launch.sh --no-include -o cl-launch -B install_bin ./cl-launch.sh --no-include -o cl-launch -B install_bin
VER=$$(git describe --tags --match '4.*') ; \ VER=$$(git describe --tags --match '4.*') ; \
cd .. && \ cd .. && \
tar zcf ~/files/cl-launch/cl-launch-$${VER}.tar.gz --exclude .git cl-launch && \ { rm -f cl-launch-$${VER} ; ln -s cl-launch cl-launch-$${VER} ;} && \
tar zcfh ~/files/cl-launch/cl-launch-$${VER}.tar.gz --exclude .git cl-launch-$${VER} && \
cp cl-launch/cl-launch.sh ~/files/cl-launch/cl-launch.sh && \ cp cl-launch/cl-launch.sh ~/files/cl-launch/cl-launch.sh && \
mv cl-launch_$${VER}* ~/files/cl-launch/ && \ mv cl-launch_$${VER}* ~/files/cl-launch/ && \
rm -f cl-launch-$${VER} && \
cd ~/files/cl-launch && \ cd ~/files/cl-launch && \
ln -sf cl-launch-$${VER}.tar.gz cl-launch.tar.gz && \ ln -sf cl-launch-$${VER}.tar.gz cl-launch.tar.gz && \
gpg -b -a cl-launch-$${VER}.tar.gz && \ gpg -b -a cl-launch-$${VER}.tar.gz && \
...@@ -108,8 +112,10 @@ debian-package-all: debian-package ...@@ -108,8 +112,10 @@ debian-package-all: debian-package
rsync -av --delete ~/files/cl-launch/ common-lisp.net:/project/xcvb/public_html/cl-launch/ rsync -av --delete ~/files/cl-launch/ common-lisp.net:/project/xcvb/public_html/cl-launch/
quickrelease: reinstall_here quickrelease: reinstall_here
VER=`./cl-launch.sh --version | ( read a b ; echo $$b )` ; \ VER=$$(./cl-launch.sh --version | ( read a b ; echo $$b )) ; \
cd .. && \ cd .. && \
tar zcf cl-launch-$${VER}.tar.gz --exclude .git cl-launch && \ { rm -f cl-launch-$${VER} ; ln -s cl-launch cl-launch-$${VER} ;} && \
tar zcfh cl-launch-$${VER}.tar.gz --exclude .git cl-launch-$${VER} && \
rsync -av cl-launch/cl-launch.sh cl-launch-$${VER}.tar.gz common-lisp.net:/project/xcvb/public_html/cl-launch/ && \ rsync -av cl-launch/cl-launch.sh cl-launch-$${VER}.tar.gz common-lisp.net:/project/xcvb/public_html/cl-launch/ && \
ssh common-lisp.net ln -sf cl-launch-$${VER}.tar.gz /project/xcvb/public_html/cl-launch/cl-launch.tar.gz ssh common-lisp.net ln -sf cl-launch-$${VER}.tar.gz /project/xcvb/public_html/cl-launch/cl-launch.tar.gz && \
rm -f cl-launch-$${VER} cl-launch-$${VER}.tar.gz
#!/bin/sh #!/bin/sh
#| cl-launch.sh -- shell wrapper generator for Common Lisp software -*- Lisp -*- #| cl-launch.sh -- shell wrapper generator for Common Lisp software -*- Lisp -*-
CL_LAUNCH_VERSION='4.0.0.2' CL_LAUNCH_VERSION='4.0.0.3'
license_information () { license_information () {
AUTHOR_NOTE="\ AUTHOR_NOTE="\
# Please send your improvements to the author: # Please send your improvements to the author:
...@@ -122,7 +122,7 @@ Software specification: ...@@ -122,7 +122,7 @@ Software specification:
-e FORM --eval FORM evaluate FORM while building -e FORM --eval FORM evaluate FORM while building
--require MODULE require MODULE while building --require MODULE require MODULE while building
-r FUNC --restart FUNC restart from build by funcalling FUNC -r FUNC --restart FUNC restart from build by funcalling FUNC
--entry FUNC (FUNC argv) after restart (buildapp compat.) -E FUNC --entry FUNC (FUNC argv) after restart (buildapp compat.)
-i FORM --init FORM evaluate FORM after restart -i FORM --init FORM evaluate FORM after restart
-ip FORM --print FORM evaluate and princ FORM after restart -ip FORM --print FORM evaluate and princ FORM after restart
-iw FORM --write FORM evaluate and write FORM after restart -iw FORM --write FORM evaluate and write FORM after restart
...@@ -892,7 +892,7 @@ process_options () { ...@@ -892,7 +892,7 @@ process_options () {
add_init_form "(uiop:println(progn $1))" ; shift ;; add_init_form "(uiop:println(progn $1))" ; shift ;;
-iw|--write) -iw|--write)
add_init_form "(uiop:writeln(progn $1))" ; shift ;; add_init_form "(uiop:writeln(progn $1))" ; shift ;;
--entry) -E|--entry)
add_init_form "($1 uiop:*command-line-arguments*)" ; shift ;; add_init_form "($1 uiop:*command-line-arguments*)" ; shift ;;
"("*) "("*)
add_init_form "(uiop:println(progn $x))" ;; add_init_form "(uiop:println(progn $x))" ;;
...@@ -1494,7 +1494,7 @@ BEGIN_TESTS='(in-package :cl-user)(defvar *f* ())(defvar *err* 0)(defvar *begin* ...@@ -1494,7 +1494,7 @@ BEGIN_TESTS='(in-package :cl-user)(defvar *f* ())(defvar *err* 0)(defvar *begin*
(uiop:implementation-identifier))) (uiop:implementation-identifier)))
' '
END_TESTS="$(foo_require t begin)"' END_TESTS="$(foo_require t begin)"'
(tst t(if (equal "won" (first uiop::*command-line-arguments*)) (tst t(if (equal "won" (first uiop:*command-line-arguments*))
(format t "argument passing worked, ") (format t "argument passing worked, ")
(progn (incf *err*) (format t "argument passing failed (got ~S), " (cl-launch::raw-command-line-arguments)))) (progn (incf *err*) (format t "argument passing failed (got ~S), " (cl-launch::raw-command-line-arguments))))
(if (equal "doh" (cl-launch::getenv "DOH")) (if (equal "doh" (cl-launch::getenv "DOH"))
...@@ -2535,7 +2535,7 @@ Returns two values: the fasl path, and T if the file was (re)compiled" ...@@ -2535,7 +2535,7 @@ Returns two values: the fasl path, and T if the file was (re)compiled"
#-ecl #-ecl
(defun build-and-dump (dump build restart final init quit) (defun build-and-dump (dump build restart final init quit)
(build-and-load build restart final init quit) (build-and-load build restart final init quit)
(remove :cl-launched *features*) (setf *features* (remove :cl-launched *features*))
(dump-image dump :executable (getenvp "CL_LAUNCH_STANDALONE")) (dump-image dump :executable (getenvp "CL_LAUNCH_STANDALONE"))
(quit 0)) (quit 0))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment