wisp 1.0.11: make multi-job make reliable
4 files changed, 37 insertions(+), 30 deletions(-)

M Makefile.am
M NEWS
M configure.ac
M tests/runtests-scripts.sh
M Makefile.am +4 -3
@@ 61,16 61,17 @@ syntaxtests.sh : wisp.scm tests/runtests
 	chmod +x @abs_top_builddir@/$@
 
 .INTERMEDIATE: syntaxtestsreader.sh
-syntaxtestsreader.sh : ${WISP} wisp.scm tests/runtests-scheme-reader.sh
+syntaxtestsreader.sh : ${WISP} wisp.scm tests/runtests-scheme-reader.sh language/wisp.scm language/wisp/spec.scm language/wisp.go language/wisp/spec.go
 	echo '#!/usr/bin/env bash' > @abs_top_builddir@/$@
 	echo @abs_top_srcdir@/tests/runtests-scheme-reader.sh @abs_top_srcdir@ @abs_top_builddir@ >> @abs_top_builddir@/$@
 	chmod +x @abs_top_builddir@/$@
 
 .INTERMEDIATE: scripttests.sh
-scripttests.sh : .wisp-repl wisp.scm tests/runtests-scripts.sh
+scripttests.sh : .wisp-repl wisp.scm tests/runtests-scripts.sh language/wisp.scm language/wisp/spec.scm language/wisp.go language/wisp/spec.go
 	echo '#!/usr/bin/env bash' > @abs_top_builddir@/$@
-	echo @abs_top_srcdir@/tests/runtests-scripts.sh $(realpath $<) >> @abs_top_builddir@/$@
+	echo @abs_top_srcdir@/tests/runtests-scripts.sh "$(realpath $<)" "@abs_top_builddir@" "@abs_top_srcdir@" >> @abs_top_builddir@/$@
 	chmod +x @abs_top_builddir@/$@
+	cat @abs_top_builddir@/$@
 
 TESTS=syntaxtests.sh syntaxtestsreader.sh scripttests.sh
 

          
M NEWS +28 -25
@@ 1,47 1,50 @@ 
-wisp 1.0.10
+wisp 1.0.11 (2023-03-20):
+- increase resilience of make check for multi-job make in Guix
+
+wisp 1.0.10 (2023-02-16):
 - only extend the reader for ## while reading wisp. Thanks to Maxime Devos for help to use fluids!
 
-wisp 1.0.9
+wisp 1.0.9 (2023-02-16):
 - remove limitation of the number of prefix underscores (_). Thanks to Maxime Devos for a much cleaner algorithm!
 - only set *port* encoding to UTF-8, do not change encoding for the application. Thanks to Maxime Devos!
 
-wisp 1.0.8
+wisp 1.0.8 (2022-12-09):
 - wisp2lisp can now process stdin when called with - as filename.
   And it has help output.
 
-wisp-mode 0.3.0
+wisp-mode 0.3.0 (2022-02-04):
 - provide wisp-color-indentation-minor-mode that highlights the
   indentation levels, following wisp-semantics (period and colon)
 
-wisp 1.0.7
+wisp 1.0.7 (2021-12-20):
 - fix: a lisp-style comment in the bash-cript had broken the wisp REPL
 
-wisp 1.0.6
+wisp 1.0.6 (2021-11-30):
 - allow (and ignore!) a single space indentation for the first line of a chunk to support meta-commands
 - ensure that (language wisp) is compiled in the wisp REPL
 
-wisp 1.0.5
+wisp 1.0.5 (2021-05-02):
 - explicitly allow using wisp as language under the expat-license for easier embedding in Guile-using games like Tsukundere Shitsumon: https://gitlab.com/leoprikler/tsukundere-shitsumon/
 
-wisp-mode 0.2.9
+wisp-mode 0.2.9 (2021-04-05):
 - support imenu, thanks to Greg Reagle
 - fixes for melpa
 - bind keys to RET and TAB, not (kbd "<return>") and (kbd "<tab>") to allow completion to work.
 - use define key instead of local-set-key
 - cleanup ob-wisp; compatibility
 
-wisp-mode 0.2.8:
+wisp-mode 0.2.8 (2021-04-02):
 - use electric-indent-inhibit instead of electric-indent-local-mode
 - rename gpl.txt to COPYING for melpa
 - use the variable defined by define-derived-mode
 
-wisp-mode 0.2.7
+wisp-mode 0.2.7 (2020-12-07):
 - dependency declared, always use wisp--prefix, homepage url
 
-wisp 1.0.4
+wisp 1.0.4 (2021-02-08):
 - add one more setlocale fallback: If it cannot use unicode, wisp now proceeds with degraded operation rather than failing outright.
 
-wisp 1.0.3
+wisp 1.0.3 (2020-09-15):
 - provide wisp script that wraps guile --language=wisp -x .w
 - add Guile 3.0 to supported versions
 - fix documentation: wisp allows up to 12 underscores

          
@@ 63,27 66,27 @@ wisp-mode 0.2.5
 wisp-mode 0.2.4
 - improve tabbing behaviour
 
-wisp 1.0.2
+wisp 1.0.2 (2019-04-09):
 - guild compile is missing the load path
 
-wisp 1.0.1
+wisp 1.0.1 (2019-03-23):
 - fix install directory, thanks to James-Adam Renquinha Henri and Ludovic Courtès who both
   discovered a mistake in the paths: correct module path is /usr/share/guile/site/<version>/…,
   but I used /usr/share/guile/<version>/site
 - simplify install logic and pre-compile installed modules.
 - add beautiful make help
 
-wisp 1.0:
+wisp 1.0 (2019-02-08):
 - add FOSDEM 2019 slides: docs/fosdem2019.org
 - As presented at FOSDEM, wisp the language is complete.
   Tooling, documentation, and porting are still work in progress.
 
-wisp 0.9.9.1:
+wisp 0.9.9.1 (2019-01-27):
 - add missing emacs support files
 - wisp-mode.el: highlighting and basic editing for wisp files
 - ob-wisp.el: basic org-mode babel support
 
-wisp 0.9.9:
+wisp 0.9.9 (2019-01-22):
 - use ## for literal arrays in wisp to avoid stumbling over newline issues
 - add ob-wisp.el for org-babel which can at least execute wisp code on my machine
 - speed up starttime of examples from 1-5 seconds to <100ms by importing the module instead of running the file as script

          
@@ 105,33 108,33 @@ wisp 0.9.9:
 - examples: literal vector example for doctests.w
 - examples: update comment-server.w to the reader
 
-wisp 0.9.8:
+wisp 0.9.8 (2017-11-10):
 - fix installing wisp in local datarootdir
 - make install provides wisp2lisp as program:
   convert any wisp program to lisp.
 
-wisp 0.9.7:
+wisp 0.9.7 (2017-10-17):
 - FIX: install language/wisp.scm instead of wisp-scheme.scm
 
-wisp 0.9.6:
+wisp 0.9.6 (2017-10-08):
 - Add a warning with undefined indentation levels: they can
   produce surprising behaviour when changing existing code.
 
-wisp 0.9.5:
+wisp 0.9.5 (2017-09-25):
 - Fix bug with using not yet defined lower indentation levels.
   See tests/partial-indent.{w,scm}
 - move wisp-scheme.scm to language/wisp.scm
   this allows creating a wisp-project by simply copying language/
 
-wisp 0.9.4:
+wisp 0.9.4 (2017-09-19):
 - provide realpath on OSX to get the tests to run
 - change installation to guile/site/(guile version)/language/wisp
 - evaluation for the r7rs benchmarks
 
-wisp 0.9.3:
+wisp 0.9.3 (2017-09-18):
 - fix autotools for platforms with wissing or old Guile aclocal.
 
-wisp 0.9.2:
+wisp 0.9.2 (2017-08-20):
 - README: note the releases and split usage into setup+usage
 - also add examples argparse, y-combinator, unbiased-std, ild, duel,
   commandline-handling, cartesian-sets, advent-2016-day-7

          
@@ 142,7 145,7 @@ wisp 0.9.2:
 - enter three witches: multiple scenes, whitespace in names, colors
   and .. as escape for .
 
-wisp 0.9.1:
+wisp 0.9.1 (2016-07-12):
 - add enter three witches: minimum overhead for a theater script
 - examples/with.w: syntax for a with keyword
   which works like with in Python

          
M configure.ac +1 -1
@@ 1,7 1,7 @@ 
 dnl run `autoreconf -i` to generate a configure script. 
 dnl Then run ./configure to generate a Makefile.
 dnl Finally run make to generate the project.
-AC_INIT([wisp], [1.0.10],
+AC_INIT([wisp], [1.0.11],
         [arne_bab@web.de])
 # Add macros in m4/ to ensure that wisp builds without having Guile in the aclocal path
 AC_CONFIG_MACRO_DIR([m4])

          
M tests/runtests-scripts.sh +4 -1
@@ 1,9 1,12 @@ 
 #!/usr/bin/env bash
+set -x
 WISP="${1}"
+BUILDDIR="${2}"
+SRCDIR="${3}"
 
 function die () {
     echo $1
     exit 1
 }
 
-${WISP} -c 'display 1' | grep -q 1 || die 'failed to display output'
+${WISP} -L "${SRCDIR}" -C "${BUILDDIR}" -c 'display 1' | grep -q 1 || die 'failed to display output'