1
0
mirror of https://github.com/pdf2htmlEX/pdf2htmlEX.git synced 2024-12-22 13:00:08 +00:00

corrected reSourceVersionEnvs

This commit is contained in:
Stephen Gaito 2019-11-28 12:21:58 +00:00
parent bf9fe5cfc1
commit 99ff9da2d9
4 changed files with 13 additions and 11 deletions

View File

@ -22,7 +22,7 @@ if [ -x "$(which docker)" ]; then
delete_blacklisted delete_blacklisted
cat >> Dockerfile <<DOCKERFILE_HERE_DOC cat > Dockerfile <<DOCKERFILE_HERE_DOC
FROM $DOCKER_FROM FROM $DOCKER_FROM
COPY ./ / COPY ./ /
RUN ldconfig RUN ldconfig

View File

@ -17,6 +17,8 @@ export PDF2HTMLEX_BRANCH=newBuildSystem
################ ################
# do the build # do the build
./buildScripts/versionEnvs || { echo 'versionEnvs FAILED' ; exit 1 ; }
./buildScripts/reportEnvs || { echo 'reportEnvs FAILED' ; exit 1 ; } ./buildScripts/reportEnvs || { echo 'reportEnvs FAILED' ; exit 1 ; }
./buildScripts/getBuildTools || { echo 'getBuildTools FAILED' ; exit 1 ; } ./buildScripts/getBuildTools || { echo 'getBuildTools FAILED' ; exit 1 ; }

View File

@ -7,6 +7,7 @@ export MAKE_PARALLEL="-j $(nproc)"
export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)" export PDF2HTMLEX_BRANCH="$(git rev-parse --abbrev-ref HEAD)"
./buildScripts/versionEnvs || travis_terminate 1;
./buildScripts/reportEnvs || travis_terminate 1; ./buildScripts/reportEnvs || travis_terminate 1;
./buildScripts/getBuildTools || travis_terminate 1; ./buildScripts/getBuildTools || travis_terminate 1;
./buildScripts/getDevLibraries || travis_terminate 1; ./buildScripts/getDevLibraries || travis_terminate 1;

19
buildScripts/versionEnvs Normal file → Executable file
View File

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