Fix travis (and local) builds

.gitignore

@@ -1,5 +1,6 @@
 /book-result/
 /pillarPostExport.sh
+/download.sh
 
 # Pharo stuff
 /Pharo.changes

.travis.yml

@@ -1,16 +1,11 @@
-language: pillar
-sudo: false
-cache:
-  directories:
-  - /tmp/texlive
-addons:
-  apt:
-    packages:
-    - libc6-i386
+
+before_install:
+ - sudo apt-get -qq update
+ - sudo apt-get install libc6-i386
+ - sudo apt-get install --no-install-recommends texlive-fonts-recommended texlive-latex-extra texlive-fonts-extra texlive-latex-recommended dvipng
+
 install:
-  - if [ ! -d "/tmp/texlive/CURRENT" ]; then mkdir -p /tmp/texlive && cd /tmp/texlive && wget https://gist.github.com/urdh/ca8ffcf7cb7c6eace9ad/raw/57718dd299f2e0cd4a2966c17222330624ec9383/texlive.profile -O - | sed -e sX/usr/localX/tmpX > texlive.profile && wget http://mirror.ctan.org/systems/texlive/tlnet/install-tl-unx.tar.gz && tar -xvf install-tl-unx.tar.gz && cd install-tl-* && ./install-tl --profile=../texlive.profile; else echo "LaTeX is already in the cache. If necessary, clean it with http://docs.travis-ci.com/user/caching/#Clearing-Caches"; fi
-  - cd $TRAVIS_BUILD_DIR
-  - ./download.sh
+ - ./prepare.sh
 
 script:
-  - PATH=/tmp/texlive/CURRENT/bin/x86_64-linux:$PATH ./compile.sh
+ - ./compile.sh --to="HTML by chapter"

PharoByExample.pillar

@@ -0,0 +1,18 @@
+
+${inputFile:Preface/Preface.pillar}$
+${inputFile:PharoTour/PharoTour.pillar}$
+${inputFile:FirstApplication/FirstApplication.pillar}$
+${inputFile:SyntaxNutshell/SyntaxNutshell.pillar}$
+${inputFile:UnderstandingMessage/UnderstandingMessage.pillar}$
+${inputFile:PharoObjectModel/PharoObjectModel.pillar}$
+${inputFile:Environment/Environment.pillar}$
+${inputFile:SharingCode/SharingCode.pillar}$
+${inputFile:SUnit/SUnit.pillar}$
+${inputFile:BasicClasses/BasicClasses.pillar}$
+${inputFile:Collections/Collections.pillar}$
+${inputFile:Streams/Streams.pillar}$
+${inputFile:Morphic/Morphic.pier}$
+${inputFile:Seaside/Seaside.pier}$
+${inputFile:Metaclasses/Metaclasses.pillar}$
+${inputFile:Reflection/Reflection.pier}$
+${inputFile:Regex/Regex.pier}$

pillar.conf

@@ -48,24 +48,6 @@ fi",
             }
         }
     },
-    "inputFiles" : [
-        "Preface/Preface.pillar",
-        "PharoTour/PharoTour.pillar",
-        "FirstApplication/FirstApplication.pillar",
-        "SyntaxNutshell/SyntaxNutshell.pillar",
-        "UnderstandingMessage/UnderstandingMessage.pillar",
-        "PharoObjectModel/PharoObjectModel.pillar",
-        "Environment/Environment.pillar",
-        "SharingCode/SharingCode.pillar",
-        "SUnit/SUnit.pillar",
-        "BasicClasses/BasicClasses.pillar",
-        "Collections/Collections.pillar",
-        "Streams/Streams.pillar",
-        "Morphic/Morphic.pier",
-        "Seaside/Seaside.pier",
-        "Metaclasses/Metaclasses.pillar",
-        "Reflection/Reflection.pier",
-        "Regex/Regex.pier"
-    ],
+    "inputFile" : "PharoByExample.pillar",
     "support" : [ "support" , "*/figures", ".latexmkrc" ]
 }

prepare.sh

@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# prepare.sh - prepare recent versions of Pillar (and Pharo VM) for book
+#              compilation.
+#
+
+DEPENDENCIES=(wget)
+
+check_dependencies() {
+    for app in ${DEPENDENCIES[*]}; do
+        if ! type "${app}" &> /dev/null; then
+            echo "Cannot find: ${app}"
+            echo "Install it to continue..."
+            exit 127 # command not found
+        fi
+    done
+}
+
+check_dependencies
+
+wget https://raw.githubusercontent.com/pillar-markup/pillar/master/download.sh
+chmod +x download.sh
+./download.sh