begun refactoring travis for tests as well as builds

.travis.yml.off

@@ -2,10 +2,6 @@ language: cpp
 
 sudo: true
 
-os:
-  - linux
-#  - osx
-#  - windows
 
 # for windows *test* of AppImage
 # see https://docs.travis-ci.com/user/build-matrix/#using-different-programming-languages-per-job
@@ -13,8 +9,6 @@ os:
 # and https://docs.travis-ci.com/user/reference/windows/
 # why fuse is not possible on windows: https://superuser.com/questions/179436/is-it-possible-to-use-fuse-with-windows  
 
-dist: bionic
-
 services:
   - docker
 
@@ -81,23 +75,19 @@ matrix:
 #  allow_failures:
 #    - os: osx # Until the build passes, then re-enable.
 
-script:
+jobs:
-  - ./buildScripts/travisEnvs        || travis_terminate 1;
+  include:
-  - ./buildScripts/reportEnvs        || travis_terminate 1;
+    - stage: build
-  - ./buildScripts/getBuildTools     || travis_terminate 1;
+      os:
-  - ./buildScripts/getDevLibraries   || travis_terminate 1;
+        - linux
-  - ./buildScripts/getPoppler        || travis_terminate 1;
+      dist: bionic
-  - ./buildScripts/buildPoppler      || travis_terminate 1;
+      script: ./buildScripts/doItAllTravis
-  - ./buildScripts/installPoppler    || travis_terminate 1;
+    - stage: test
-  - ./buildScripts/getFontforge      || travis_terminate 1;
+      os: 
-  - ./buildScripts/buildFontforge    || travis_terminate 1;
+        - linux
-  - ./buildScripts/installFontforge  || travis_terminate 1;
+        - osx
-  - ./buildScripts/buildPdf2htmlEX   || travis_terminate 1;
+        - windows
-  - ./buildScripts/installPdf2htmlEX || travis_terminate 1;
+      script: ./testScripts/doItAllTravis
-  - ./buildScripts/createAppImage    || travis_terminate 1;
-  - ./buildScripts/createDockerImage || travis_terminate 1;
-  - ./buildScripts/uploadRelease     || travis_terminate 1;
-
 #deploy:
 #  provider: releases
 #  api_key:

buildScripts/doItAll

@@ -8,6 +8,14 @@
 export UNATTENDED="--assume-yes"
 export MAKE_PARALLEL="-j $(nproc)"
 
+# choose one of the following...
+#
+export PDF2HTMLEX_BRANCH=newBuildSystem
+# export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+
+################
+# do the build
+
 ./buildScripts/reportEnvs        || { echo 'reportEnvs FAILED'        ; exit 1 ; }
 
 ./buildScripts/getBuildTools     || { echo 'getBuildTools FAILED'     ; exit 1 ; }

buildScripts/doItAllTravis

@@ -0,0 +1,24 @@
+#!/bin/bash
+
+# This bash script builds everyting on an TravisCI worker
+
+export UNATTENDED="--assume-yes"
+export MAKE_PARALLEL="-j $(nproc)"
+
+export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+
+./buildScripts/reportEnvs        || travis_terminate 1;
+./buildScripts/getBuildTools     || travis_terminate 1;
+./buildScripts/getDevLibraries   || travis_terminate 1;
+./buildScripts/getPoppler        || travis_terminate 1;
+./buildScripts/buildPoppler      || travis_terminate 1;
+./buildScripts/installPoppler    || travis_terminate 1;
+./buildScripts/getFontforge      || travis_terminate 1;
+./buildScripts/buildFontforge    || travis_terminate 1;
+./buildScripts/installFontforge  || travis_terminate 1;
+./buildScripts/buildPdf2htmlEX   || travis_terminate 1;
+./buildScripts/installPdf2htmlEX || travis_terminate 1;
+./buildScripts/createAppImage    || travis_terminate 1;
+./buildScripts/createDockerImage || travis_terminate 1;
+./buildScripts/uploadRelease     || travis_terminate 1;
+

buildScripts/reportEnvs

@@ -10,7 +10,7 @@ echo "        build dir: [$TRAVIS_BUILD_DIR]"
 echo "        repo slug: [$TRAVIS_REPO_SLUG]"
 
 echo "Build env:"
-echo "       unattended: [$UNATTENEDED]"
+echo "       unattended: [$UNATTENDED]"
 echo "    make parallel: [$MAKE_PARALLEL]"
 
 source ./buildScripts/versionEnvs

buildScripts/travisEnvs

@@ -1,3 +0,0 @@
-
-export UNATTENDED="--assume-yes"
-export MAKE_PARALLEL="-j `nproc`"

buildScripts/versionEnvs

@@ -9,7 +9,9 @@ export POPPLER_VERSION=poppler-0.81.0
 #export FONTFORGE_VERSION=20190801
 export FONTFORGE_VERSION=20170731
 
-export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+if [ -n "$PDF2HTMLEX_BRANCH" ]; then
+  export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+fi
 
 export MACHINE_ARCH="$(uname -m)"
 

testScripts/doItAll

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This bash script automates the tests
+
+

testScripts/doItAllTravis

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+# This bash script automates the tests on a TravisCI worker
+
+