From c5ab4f4f9e4f303bbc6a70c4ac08da66a9d65988 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Mon, 25 Nov 2019 16:46:14 +0000 Subject: [PATCH] corrected build scripts --- buildScripts/createAppImage | 16 ++++++++-------- buildScripts/travisEnvs | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/buildScripts/createAppImage b/buildScripts/createAppImage index 4f82477..8a61951 100755 --- a/buildScripts/createAppImage +++ b/buildScripts/createAppImage @@ -4,19 +4,19 @@ source buildScripts/versionEnvs -mkdir -p imageBuild/pdf2htmlEX.AppDir/usr/lib/ +mkdir -p imageBuild/appDir/usr/lib/ cd pdf2htmlEX/build sudo rm -rf install_manifest.txt -make install DESTDIR=../../imageBuild/pdf2htmlEX.AppDir +make install DESTDIR=../../imageBuild/appDir cd ../../imageBuild # force libfontconfig into AppImage (linuxdeploy blacklists libfontconfig) # -cp /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 pdf2htmlEX.AppDir/usr/lib/ +cp /usr/lib/x86_64-linux-gnu/libfontconfig.so.1 appDir/usr/lib/ LINUX_DEPLOY_APP_IMAGE=linuxdeploy-$MACHINE_ARCH.AppImage @@ -24,11 +24,11 @@ wget https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/$LI chmod a+x $LINUX_DEPLOY_APP_IMAGE -./$LINUX_DEPLOY_APP_IMAGE \ - -e pdf2htmlEX.AppDir/usr/bin/pdf2htmlEX \ - --create-desktop-file \ - -i ../pdf2htmlEX/logo/pdf2htmlEX.svg \ - --appdir=pdf2htmlEX.AppDir \ +./$LINUX_DEPLOY_APP_IMAGE \ + -e appDir/usr/bin/pdf2htmlEX \ + --create-desktop-file \ + -i ../pdf2htmlEX/logo/pdf2htmlEX.svg \ + --appdir=appDir \ --output appimage mv pdf2htmlEX-$MACHINE_ARCH.AppImage \ diff --git a/buildScripts/travisEnvs b/buildScripts/travisEnvs index 9ab6776..35d2199 100644 --- a/buildScripts/travisEnvs +++ b/buildScripts/travisEnvs @@ -1,3 +1,3 @@ -export MAKE_PARALLEL=-j `nproc` +export MAKE_PARALLEL="-j `nproc`"