From 3e835a38e293fb034128dd3dae4373565d1ae3c9 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Tue, 2 Jun 2020 11:58:27 +0000 Subject: [PATCH] refactored use of set ev --- buildScripts/buildFontforge | 4 ++-- buildScripts/buildPdf2htmlEX | 5 +++-- buildScripts/buildPdf2htmlEXClang | 2 ++ buildScripts/buildPoppler | 14 +++++++------- buildScripts/cleanPdf2htmlEX | 1 - buildScripts/createAppImage | 2 ++ buildScripts/createDebianPackage | 2 ++ buildScripts/createDockerImage | 1 + buildScripts/createImages | 2 ++ buildScripts/getBuildToolsApt | 4 ++-- buildScripts/getBuildToolsBrew | 4 ++-- buildScripts/getDevLibrariesApt | 4 ++-- buildScripts/getDevLibrariesBrew | 4 ++-- buildScripts/getFontforge | 4 ++-- buildScripts/getPdf2htmlEXApt | 1 + buildScripts/getPdf2htmlEXBrew | 1 + buildScripts/getPoppler | 4 ++-- buildScripts/installFontforge | 4 ++-- buildScripts/installPdf2htmlEX | 4 ++-- buildScripts/installPoppler | 4 ++-- buildScripts/travisLinuxAptDoItAll | 30 ++++++++++++++++-------------- buildScripts/uploadImages | 2 ++ 22 files changed, 59 insertions(+), 44 deletions(-) diff --git a/buildScripts/buildFontforge b/buildScripts/buildFontforge index 638607d..26cf38a 100755 --- a/buildScripts/buildFontforge +++ b/buildScripts/buildFontforge @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script build FontForge source buildScripts/reSourceVersionEnvs @@ -12,6 +10,8 @@ echo "BUILDING FontForge (using CMake)" echo "-------------------------------------------------------------------" echo "" +set -ev + cd fontforge mkdir build diff --git a/buildScripts/buildPdf2htmlEX b/buildScripts/buildPdf2htmlEX index 0c855a5..5a048bb 100755 --- a/buildScripts/buildPdf2htmlEX +++ b/buildScripts/buildPdf2htmlEX @@ -1,15 +1,16 @@ #!/bin/bash -set -ev - # This bash script builds pdf2htmlEX echo "" echo "-------------------------------------------------------------------" echo "BUILDING pdf2htmlEX (using gcc)" echo "-------------------------------------------------------------------" + echo "" +set -ev + cd pdf2htmlEX mkdir build cd build diff --git a/buildScripts/buildPdf2htmlEXClang b/buildScripts/buildPdf2htmlEXClang index eb65509..ab3fd6c 100755 --- a/buildScripts/buildPdf2htmlEXClang +++ b/buildScripts/buildPdf2htmlEXClang @@ -8,6 +8,8 @@ echo "BUILDING pdf2htmlEX (using CLang)" echo "-------------------------------------------------------------------" echo "" +set -ev + cd pdf2htmlEX mkdir build cd build diff --git a/buildScripts/buildPoppler b/buildScripts/buildPoppler index 65015c3..3253c75 100755 --- a/buildScripts/buildPoppler +++ b/buildScripts/buildPoppler @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script builds the latest poppler echo "" @@ -10,6 +8,8 @@ echo "BUILDING Poppler (using CMake)" echo "-------------------------------------------------------------------" echo "" +set -ev + cd poppler mkdir build cd build @@ -37,11 +37,11 @@ cmake \ -DBUILD_SHARED_LIBS=OFF \ -DRUN_GPERF_IF_PRESENT=OFF \ -DEXTRA_WARN=OFF \ - -DENABLE_JPEG=ON \ - -DENABLE_PNG=ON \ - -DENABLE_TIFF=OFF \ - -DENABLE_NSS=OFF \ - -DENABLE_Cairo=ON \ + -DWITH_JPEG=ON \ + -DWITH_PNG=ON \ + -DWITH_TIFF=OFF \ + -DWITH_NSS=OFF \ + -DWITH_Cairo=ON \ .. make $MAKE_PARALLEL diff --git a/buildScripts/cleanPdf2htmlEX b/buildScripts/cleanPdf2htmlEX index 0b44a63..a01e378 100755 --- a/buildScripts/cleanPdf2htmlEX +++ b/buildScripts/cleanPdf2htmlEX @@ -2,6 +2,5 @@ # This bash script clean all pdf2htmlEX build products - cd pdf2htmlEX rm -rf build pdf2htmlEX.1 share/*.css share/*.js share/*.min.* src/pdf2htmlEX-config.h src/util/css_const.h diff --git a/buildScripts/createAppImage b/buildScripts/createAppImage index 90ff685..87f99f3 100755 --- a/buildScripts/createAppImage +++ b/buildScripts/createAppImage @@ -10,6 +10,8 @@ echo "CREATING pdf2htmlEX AppImage" echo "-------------------------------------------------------------------" echo "" +set -ev + # For appimage output plugin # export VERSION="$PDF2HTMLEX_BRANCH-$BUILD_TIME" diff --git a/buildScripts/createDebianPackage b/buildScripts/createDebianPackage index 47f72a3..47c9d8d 100755 --- a/buildScripts/createDebianPackage +++ b/buildScripts/createDebianPackage @@ -12,6 +12,8 @@ echo "" source /etc/lsb-release +set -ev + export DPKG_NAME="pdf2htmlEX-$PDF2HTMLEX_BRANCH-$BUILD_TIME-$MACHINE_ARCH-$DISTRIB_CODENAME.deb" echo "export DPKG_NAME=\"$DPKG_NAME\"" >> buildScripts/reSourceVersionEnvs diff --git a/buildScripts/createDockerImage b/buildScripts/createDockerImage index 06591da..8e4e5cf 100755 --- a/buildScripts/createDockerImage +++ b/buildScripts/createDockerImage @@ -14,6 +14,7 @@ source buildScripts/reSourceVersionEnvs source buildScripts/dockerFunctions +set -ev mkdir -p imageBuild/dockerDir diff --git a/buildScripts/createImages b/buildScripts/createImages index f67dd3e..e07911f 100755 --- a/buildScripts/createImages +++ b/buildScripts/createImages @@ -1,5 +1,7 @@ #!/bin/bash +set -ev + # This bash script creates the pdf2htmlEX AppImage and Docker Images ################# diff --git a/buildScripts/getBuildToolsApt b/buildScripts/getBuildToolsApt index 8d59586..41a9b7e 100755 --- a/buildScripts/getBuildToolsApt +++ b/buildScripts/getBuildToolsApt @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script automates getting the required build tools (apt install) # set the bash environment variable 'UNATTENDED' to '--assume-yes' for @@ -14,6 +12,8 @@ echo " (UNATTENDED: [$UNATTENDED])" echo "-------------------------------------------------------------------" echo "" +set -ev + sudo apt-get update sudo apt-get $UNATTENDED install \ aptitude \ diff --git a/buildScripts/getBuildToolsBrew b/buildScripts/getBuildToolsBrew index 1b0aa8c..1191b46 100755 --- a/buildScripts/getBuildToolsBrew +++ b/buildScripts/getBuildToolsBrew @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script automates getting the required build tools (brew install) echo "" @@ -10,6 +8,8 @@ echo "INSTALLING Build Tools (using Home/Linux Brew)" echo "-------------------------------------------------------------------" echo "" +set -ev + brew update brew install \ git \ diff --git a/buildScripts/getDevLibrariesApt b/buildScripts/getDevLibrariesApt index 4e75ef2..b19f8a7 100755 --- a/buildScripts/getDevLibrariesApt +++ b/buildScripts/getDevLibrariesApt @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script automates getting the development libraries required to # build poppler and fontforge @@ -15,6 +13,8 @@ echo " (UNATTENDED: [$UNATTENDED])" echo "-------------------------------------------------------------------" echo "" +set -ev + sudo apt-get update sudo apt-get $UNATTENDED install \ libcairo-dev \ diff --git a/buildScripts/getDevLibrariesBrew b/buildScripts/getDevLibrariesBrew index d07256d..252b2f0 100755 --- a/buildScripts/getDevLibrariesBrew +++ b/buildScripts/getDevLibrariesBrew @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script automates getting the development libraries required to # build poppler and fontforge (using Home/Linux Brew) @@ -11,6 +9,8 @@ echo "INSTALLING development libraries (using Home/Linux Brew)" echo "-------------------------------------------------------------------" echo "" +set -ev + brew update brew install \ cairo \ diff --git a/buildScripts/getFontforge b/buildScripts/getFontforge index 443ff07..c947a20 100755 --- a/buildScripts/getFontforge +++ b/buildScripts/getFontforge @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script gets and unpacks the latest fontforge AppImage source buildScripts/reSourceVersionEnvs @@ -13,6 +11,8 @@ echo " (FONTFORGE_VERSION: [$FONTFORGE_VERSION])" echo "-------------------------------------------------------------------" echo "" +set -ev + FONTFORGE_SRC=$FONTFORGE_VERSION.tar.gz rm -rf $FONTFORGE_SRC diff --git a/buildScripts/getPdf2htmlEXApt b/buildScripts/getPdf2htmlEXApt index abc7e18..3084d1a 100755 --- a/buildScripts/getPdf2htmlEXApt +++ b/buildScripts/getPdf2htmlEXApt @@ -12,6 +12,7 @@ echo " (PDF2HTMLEX_BRANCH: [$PDF2HTMLEX_BRANCH])" echo "-------------------------------------------------------------------" echo "" +set -ev wget https://codeload.github.com/stephengaito/pdf2htmlEX/zip/$PDF2HTMLEX_BRANCH diff --git a/buildScripts/getPdf2htmlEXBrew b/buildScripts/getPdf2htmlEXBrew index 4754fe0..52a567f 100755 --- a/buildScripts/getPdf2htmlEXBrew +++ b/buildScripts/getPdf2htmlEXBrew @@ -12,6 +12,7 @@ echo " (PDF2HTMLEX_BRANCH: [$PDF2HTMLEX_BRANCH])" echo "-------------------------------------------------------------------" echo "" +set -ev wget https://codeload.github.com/stephengaito/pdf2htmlEX/zip/$PDF2HTMLEX_BRANCH diff --git a/buildScripts/getPoppler b/buildScripts/getPoppler index 93a7722..b5d9403 100755 --- a/buildScripts/getPoppler +++ b/buildScripts/getPoppler @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script gets and unpacks the latest Poppler source code source buildScripts/reSourceVersionEnvs @@ -21,6 +19,8 @@ rm -rf poppler rm -rf poppler-data-0.4.9.tar.gz rm -rf poppler-data +set -ev + wget https://poppler.freedesktop.org/$POPPLER_VERSION.tar.xz tar xvf $POPPLER_VERSION.tar.xz diff --git a/buildScripts/installFontforge b/buildScripts/installFontforge index e7e1b20..6ce6a50 100755 --- a/buildScripts/installFontforge +++ b/buildScripts/installFontforge @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - echo "" echo "-------------------------------------------------------------------" echo "INSTALLING FontForge locally" @@ -21,6 +19,8 @@ if [ -z "$UNATTENDED" ] ; then read -p "Type anything else to continue: " fi +set -ev + cd fontforge sudo make install sudo ldconfig; diff --git a/buildScripts/installPdf2htmlEX b/buildScripts/installPdf2htmlEX index 3fb6b92..5ed22aa 100755 --- a/buildScripts/installPdf2htmlEX +++ b/buildScripts/installPdf2htmlEX @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - echo "" echo "-------------------------------------------------------------------" echo "INSTALLING pdf2htmlEX locally" @@ -19,6 +17,8 @@ if [ -z "$UNATTENDED" ] ; then fi +set -ev + cd pdf2htmlEX/build sudo make install diff --git a/buildScripts/installPoppler b/buildScripts/installPoppler index da2fc43..9461094 100755 --- a/buildScripts/installPoppler +++ b/buildScripts/installPoppler @@ -1,7 +1,5 @@ #!/bin/bash -set -ev - # This bash script installs Poppler into the local system echo "" @@ -23,6 +21,8 @@ if [ -z "$UNATTENDED" ] ; then read -p "Type anything else to continue: " fi +set -ev + cd poppler/build sudo make install diff --git a/buildScripts/travisLinuxAptDoItAll b/buildScripts/travisLinuxAptDoItAll index fb9db48..060ed49 100755 --- a/buildScripts/travisLinuxAptDoItAll +++ b/buildScripts/travisLinuxAptDoItAll @@ -2,22 +2,24 @@ # This bash script builds everyting on an TravisCI Linux (Ubunutu) worker +set -ev + export UNATTENDED="--assume-yes" export MAKE_PARALLEL="-j $(nproc)" export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" -./buildScripts/versionEnvs || travis_terminate 1; -./buildScripts/reportEnvs || travis_terminate 1; -./buildScripts/getBuildToolsApt || travis_terminate 1; -./buildScripts/getDevLibrariesApt || travis_terminate 1; -./buildScripts/getPoppler || travis_terminate 1; -./buildScripts/buildPoppler || travis_terminate 1; -./buildScripts/getFontforge || travis_terminate 1; -./buildScripts/buildFontforge || travis_terminate 1; -./buildScripts/buildPdf2htmlEX || travis_terminate 1; -./buildScripts/installPdf2htmlEX || travis_terminate 1; -#./buildScripts/createAppImage || travis_terminate 1; -#./buildScripts/createDockerImage || travis_terminate 1; -#./buildScripts/uploadGitHubRelease || travis_terminate 1; -#./buildScripts/uploadDockerImage || travis_terminate 1; +./buildScripts/versionEnvs +./buildScripts/reportEnvs +./buildScripts/getBuildToolsApt +./buildScripts/getDevLibrariesApt +./buildScripts/getPoppler +./buildScripts/buildPoppler +./buildScripts/getFontforge +./buildScripts/buildFontforge +./buildScripts/buildPdf2htmlEX +./buildScripts/installPdf2htmlEX +#./buildScripts/createAppImage +#./buildScripts/createDockerImage +#./buildScripts/uploadGitHubRelease +#./buildScripts/uploadDockerImage diff --git a/buildScripts/uploadImages b/buildScripts/uploadImages index 63b3b30..7adbe9c 100755 --- a/buildScripts/uploadImages +++ b/buildScripts/uploadImages @@ -6,6 +6,8 @@ ################ # do the uploads +set -ev + ./buildScripts/reportEnvs || { echo 'reportEnvs FAILED' ; exit 1 ; } ./buildScripts/uploadGitHubRelease || { echo 'uploadGitHubRelease FAILED' ; exit 1 ; }