started using reSourceVersionEnvs

.travis.yml.off

@@ -85,8 +85,8 @@ jobs:
     - stage: test
       os: 
         - linux
-        - osx
-        - windows
+        #- osx
+        #- windows
       script: ./testScripts/doItAllTravis
 #deploy:
 #  provider: releases

buildScripts/buildFontforge

@@ -2,8 +2,7 @@
 
 # This bash script build FontForge
 
-source buildScripts/versionEnvs
-
+source buildScripts/reSourceVersionEnvs
 
 # This is a work-around to fix TravisCI's declaration of PYTHON_CFLAGS
 # which is then honoured exactly as is by the fontforge bootstrap and

buildScripts/createAppImage

@@ -2,7 +2,7 @@
 
 # This bash script creates an AppImage for pdf2htmlEX
 
-source buildScripts/versionEnvs
+source ./buildScripts/reSourceVersionEnvs
 
 # For appimage output plugin
 #

buildScripts/createDockerImage

@@ -4,7 +4,7 @@
 
 if [ -x "$(which docker)" ]; then
 
-  source buildScripts/versionEnvs
+  source buildScripts/reSourceVersionEnvs
 
   source buildScripts/dockerFunctions
 

buildScripts/doItAll

@@ -7,6 +7,7 @@
 #
 export UNATTENDED="--assume-yes"
 export MAKE_PARALLEL="-j $(nproc)"
+export TRAVIS_REPO_SLUG=stephengaito/pdf2htmlEX
 
 # choose one of the following...
 #

buildScripts/getFontforge

@@ -2,7 +2,7 @@
 
 # This bash script gets and unpacks the latest fontforge AppImage
 
-source buildScripts/versionEnvs
+source buildScripts/reSourceVersionEnvs
 
 FONTFORGE_SRC=$FONTFORGE_VERSION.tar.gz
 

buildScripts/getPoppler

@@ -2,7 +2,7 @@
 
 # This bash script gets and unpacks the latest Poppler source code
 
-source buildScripts/versionEnvs
+source buildScripts/reSourceVersionEnvs
 
 echo "Getting poppler version: $POPPLER_VERSION"
 

buildScripts/reportEnvs

@@ -13,7 +13,7 @@ echo "Build env:"
 echo "       unattended: [$UNATTENDED]"
 echo "    make parallel: [$MAKE_PARALLEL]"
 
-source ./buildScripts/versionEnvs
+source ./buildScripts/reSourceVersionEnvs
 
 echo "pdf2htmlEX env:"
 echo "          poppler: [$POPPLER_VERSION]"

buildScripts/uploadRelease

@@ -11,10 +11,14 @@
 #    UPLOADTOOL_BODY  (the text of the github release message)
 #
 
+source ./buildScripts/reSourceVersionEnvs
+
 ##################################
 # upload github release artefacts
 #
 
+cd imageBuild
+
 if [ -n "$GITHUB_TOKEN" ]; then
   wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
 
@@ -34,10 +38,14 @@ See: https://appimage.org/ for details
 RELEASE_MESSAGE
   fi
 
-  bash upload.sh $APPIMAGE_NAME appImageName dockerImageName
+  bash upload.sh	\
+    $($APPIMAGE_NAME)	\
+    ../appImageName	\
+    ../dockerImageName	\
+    ../buildTime
 
 else
-  echo "GITHUG_TOKEN not set... so we can not upload release artefacts."
+  echo "GITHUB_TOKEN not set... so we can not upload release artefacts."
 fi
 
 ##################################

buildScripts/versionEnvs

@@ -23,4 +23,13 @@ export DOCKER_NAME="$DOCKER_USERNAME/pdf2htmlex:$PDF2HTMLEX_BRANCH-$BUILD_TIME"
 
 export APPIMAGE_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$MACHINE_ARCH.AppImage"
 
-
+echo > buildScripts/reSourceVersionEnvs <<RESOURCE_VERSION_ENVS
+export POPPLER_VERSION="$POPPERL_VERSION"
+export FONTFORGE_VERSION="$FONTFORGE_VERSION"
+export PDF2HTMLEX_BRANCH="$PDF2HTMLEX_BRANCH"
+export MACHINE_ARCH="$MACHINE_ARCH"
+export BUILD_TIME="$BUILD_TIME"
+export DOCKER_FROM="$DOCKER_FROM"
+export DOCKER_NAME="$DOCKER_NAME"
+export APPIMAGE_NAME="$APPIMAGE_NAME"
+RESOURCE_VERSION_ENVS

testScripts/doItAll

@@ -2,4 +2,31 @@
 
 # This bash script automates the tests
 
+wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/appImageName
+
+export APP_IMAGE_NAME=$(cat appImageName)
+
+wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/$APP_IMAGE_NAME
+
+chmod a+x $APP_IMAGE_NAME
+
+if ! ./$APP_IMAGE_NAME --version ; then
+  echo "COULD NOT run the AppImage"
+  exit(-1)
+fi
+
+if [ -x "$(which docker)" ]; then
+
+  wget https://github.com/stephengaito/pdf2htmlEX/releases/download/continuous/dockerImageName
+
+  export DOCKER_IMAGE_NAME=$(cat dockerImageName)
+
+  if ! docker run $DOCKER_IMAGE_NAME --version ; then
+    echo "COULD NOT run the AppImage"
+    exit(-1)
+  fi
+
+fi
+
+