refactored use of set ev

This commit is contained in:
Stephen Gaito 2020-06-02 11:58:27 +00:00
parent f1828789f6
commit 3e835a38e2
22 changed files with 59 additions and 44 deletions

View File

@ -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

View File

@ -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

View File

@ -8,6 +8,8 @@ echo "BUILDING pdf2htmlEX (using CLang)"
echo "-------------------------------------------------------------------"
echo ""
set -ev
cd pdf2htmlEX
mkdir build
cd build

View File

@ -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

View File

@ -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

View File

@ -10,6 +10,8 @@ echo "CREATING pdf2htmlEX AppImage"
echo "-------------------------------------------------------------------"
echo ""
set -ev
# For appimage output plugin
#
export VERSION="$PDF2HTMLEX_BRANCH-$BUILD_TIME"

View File

@ -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

View File

@ -14,6 +14,7 @@ source buildScripts/reSourceVersionEnvs
source buildScripts/dockerFunctions
set -ev
mkdir -p imageBuild/dockerDir

View File

@ -1,5 +1,7 @@
#!/bin/bash
set -ev
# This bash script creates the pdf2htmlEX AppImage and Docker Images
#################

View File

@ -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 \

View File

@ -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 \

View File

@ -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 \

View File

@ -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 \

View File

@ -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

View File

@ -12,6 +12,7 @@ echo " (PDF2HTMLEX_BRANCH: [$PDF2HTMLEX_BRANCH])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
wget https://codeload.github.com/stephengaito/pdf2htmlEX/zip/$PDF2HTMLEX_BRANCH

View File

@ -12,6 +12,7 @@ echo " (PDF2HTMLEX_BRANCH: [$PDF2HTMLEX_BRANCH])"
echo "-------------------------------------------------------------------"
echo ""
set -ev
wget https://codeload.github.com/stephengaito/pdf2htmlEX/zip/$PDF2HTMLEX_BRANCH

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -6,6 +6,8 @@
################
# do the uploads
set -ev
./buildScripts/reportEnvs || { echo 'reportEnvs FAILED' ; exit 1 ; }
./buildScripts/uploadGitHubRelease || { echo 'uploadGitHubRelease FAILED' ; exit 1 ; }