diff --git a/.travis.yml b/.travis.yml index d0825f8..5ab703e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,21 +1,5 @@ language: c sudo: false - -matrix: - include: - - sudo: required - os: linux - env: METHOD=cross XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="--prefix=/usr/i686-w64-mingw32" - - sudo: required - os: linux - env: METHOD=debian - - sudo: required - os: linux - env: METHOD=documents - - sudo: required - os: linux - env: METHOD=valgrind XCFLAGS="-g -O0" - env: global: - PATH=~/.roswell/bin:~/.linuxbrew/bin:$PATH @@ -38,6 +22,23 @@ os: - osx - linux +matrix: + allow_failures: + - env: METHOD=brew + include: + - sudo: required + os: linux + env: METHOD=cross XCC=i686-w64-mingw32-gcc HOST="--host=i686-w64-mingw32" PREFIX="--prefix=/usr/i686-w64-mingw32" + - sudo: required + os: linux + env: METHOD=debian + - sudo: required + os: linux + env: METHOD=documents + - sudo: required + os: linux + env: METHOD=valgrind XCFLAGS="-g -O0" + #branches: # except: # - /^v[0-9]/ @@ -74,7 +75,7 @@ install: script: - if [ "$METHOD" = "documents" ]; then rm documents/man/* documents/html/*; fi - - if [ "$METHOD" = "documents" ]; then sh bootstrap;./configure --enable-manual-generation --enable-html-generation;make clean;make;sudo make install; fi + - if [ "$METHOD" = "documents" ]; then sh bootstrap;./configure --enable-manual-generation --enable-html-generation;make;sudo make install; fi - if [ "$METHOD" = "brew" ]; then brew install roswell --HEAD; fi - if [ "$METHOD" = "ci" ]; then sh ./scripts/install-for-ci.sh; fi - if [ "$METHOD" = "cross" ] || [ "$METHOD" = "valgrind" ] || ([ x$TRAVIS_TAG != x ] && [ $METHOD = debian ]); then @@ -84,7 +85,7 @@ script: - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros version=t run; fi - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros config; fi - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then ros install prove; fi - - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then run-prove roswell-test.asd; fi + - if [ "$METHOD" = "brew" ] || [ "$METHOD" = "ci" ]; then run-prove roswell-test.asd 2>&1 ; fi - if [ "$METHOD" = "ci" ]; then ros -q run && [`ros -q run 2>&1` == ""]; fi - if [ "$METHOD" = "ci" ] && [ "$LISP" = "sbcl-bin" ]; then [`ros -e "(ros:ignore-shebang)" -e '(loop for x in (directory "src/lisp/*.ros") do (load x))' 2>&1` == ""]; fi - if [ x$TRAVIS_TAG != x ] && [ $METHOD = debian ]; then ros install prove;ros ./scripts/debian.ros; fi diff --git a/circle.yml b/circle.yml index 768fe52..7b71ce8 100644 --- a/circle.yml +++ b/circle.yml @@ -5,6 +5,10 @@ dependencies: - sudo apt-get update - sudo apt-get -qq install pandoc ruby-sass + +machine: + environment: + PATH: ~/.roswell/bin:~/.linuxbrew/bin:$PATH test: post: - sh bootstrap @@ -14,6 +18,8 @@ test: - ros version - ros -v setup - ros install + - ros install prove + - run-prove roswell-test.asd - ros install sbcl - ros -v run -- --version - ros install ccl-bin diff --git a/documents/Makefile.am b/documents/Makefile.am index 20a2503..a6eacb8 100644 --- a/documents/Makefile.am +++ b/documents/Makefile.am @@ -5,7 +5,7 @@ # http://pandoc.org/README.html#using-variables-in-templates # https://github.com/jgm/pandoc-templates/blob/master/default.man -MDS = ros.md ros-dump.md ros-init.md ros-install.md ros-list.md ros-setup.md ros-config.md ros-delete.md ros-emacs.md ros-run.md ros-use.md ros-wait.md ros-asdf.md +MDS = ros.md ros-dump.md ros-init.md ros-install.md ros-list.md ros-setup.md ros-config.md ros-delete.md ros-emacs.md ros-run.md ros-use.md ros-wait.md ros-asdf.md ros-template.md # separated by semicolons PANDOC_AUTHORS="Roswell Project Team" @@ -25,7 +25,7 @@ CLEANFILES = $(HTMLS) endif if HTML_GENERATE -HTMLS = $(MDS:%.md=html/%.html) html/ros.css +HTMLS = $(MDS:%.md=html/%.html) html/%.html: %.md which pandoc # awk hack --- check every underlined words for its corresponding md file, replacing it to an appropriate markdown link to html file if it exist (e.g. _ros-use_ -> check ros-use.md -> [ros-use](ros-use.html) ) diff --git a/documents/html/ros-init.html b/documents/html/ros-init.html index f6c2bda..f5f590d 100644 --- a/documents/html/ros-init.html +++ b/documents/html/ros-init.html @@ -20,16 +20,20 @@
ros-init - Create a roswell script (optionally based on a template)
ros init [template] name
- - +ros init NAME [TEMPLATE [ARGS...]]
Specifies the name of a template, defaulted to default template. However, if TEMPLATE is not specified and FILENAME matches one of the templates being stored, then it automatically uses the template. To suppress this behavior, you should explicitly specify TEMPLATE as default.
+Thus you are warned when you use this command from a shell script. In order to achieve a consistent and desired behavior, it is adviced that they should always explicitly specify the template name.
+Specify the output filename, or "-" to indicate stdout. When TEMPLATE is default, it automatically appends a file type ".ros".
Initialises [name].ros.
+Initialises a roswell file based on a template. User-specified templates can be added by ros-template(1).
The default template is something like:
#!/bin/sh
#|-*- mode:lisp -*-|#
@@ -48,7 +52,7 @@ exec ros -Q -- $0 "$@"
SEE ALSO
-sbcl(1) ros(1)
+sbcl(1) ros(1) ros-template(1)
_