(Arne Babenhauserheide)
2014-01-22: merge default into stable for release. stable v0.5.5 merge default into stable for release.
diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,13 @@
wisp = wisp.scm language/wisp/spec.scm
wisp_SOURCES = wisp-guile.w wisp-reader.w
EXTRA_DIST = $(wisp_SOURCES) $(wisp_DATA) bootstrap.sh wisp.py examples tests runtests.sh
-CLEANFILES = ${wisp}
+CLEANFILES = ${wisp} ChangeLog
DISTCLEANFILES = ${CLEANFILES} @abs_top_builddir@/1 @abs_top_builddir@/2 @abs_top_builddir@/test.sh
-all : ${wisp} $(changelog)
+all : ${wisp}
+
+ChangeLog :
+ hg log --style changelog > ChangeLog
# emacs org-mode beamer build instructions
${wisp} : input.in.intermediate
diff --git a/bootstrap.sh b/bootstrap.sh
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -14,7 +14,10 @@ if [[ ! x"${diff}" == x"success" ]]; the
fi
echo "successfully bootstrapped wisp.scm"
echo preparing the reader: wisp at the REPL
+echo parsing the spec file...
mkdir -p language/wisp
guile wisp.scm ${srcdir}/wisp-reader.w 2>/dev/null > language/wisp/spec.scm \
+ && echo ...precompiling the spec file... \
+ && guile -L . -s language/wisp/spec.scm \
&& echo ...succeeded \
- && echo 'to use wisp at the REPL, run `guile -L` . and then in guile `,L wisp`'
+ && echo 'to use wisp at the REPL, run `guile -L . --language=wisp`'