diff --git a/buildScripts/buildFontforge b/buildScripts/buildFontforge index 4d4e953..139d466 100755 --- a/buildScripts/buildFontforge +++ b/buildScripts/buildFontforge @@ -16,4 +16,4 @@ do patch -p 1 < $APATCHFILE done -make -j `nproc` +make $MAKE_PARALLEL diff --git a/buildScripts/buildPdf2htmlEX b/buildScripts/buildPdf2htmlEX index ad47a2d..efbc54d 100755 --- a/buildScripts/buildPdf2htmlEX +++ b/buildScripts/buildPdf2htmlEX @@ -5,5 +5,5 @@ cd pdf2htmlEX mkdir build cd build -cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. -make -j `nproc` +cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local .. +make $MAKE_PARALLEL diff --git a/buildScripts/buildPdf2htmlEXClang b/buildScripts/buildPdf2htmlEXClang index 95a4574..6d0b7ee 100755 --- a/buildScripts/buildPdf2htmlEXClang +++ b/buildScripts/buildPdf2htmlEXClang @@ -5,5 +5,5 @@ cd pdf2htmlEX mkdir build cd build -CC=clang CXX=clang++ cmake .. -make +CC=clang CXX=clang++ cmake -DCMAKE_INSTALL_PREFIX=/usr/local .. +make $MAKE_PARALLEL diff --git a/buildScripts/buildPoppler b/buildScripts/buildPoppler index 458697b..711fbd3 100755 --- a/buildScripts/buildPoppler +++ b/buildScripts/buildPoppler @@ -7,4 +7,4 @@ mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr/local \ -DENABLE_LIBOPENJPEG=none .. -make -j `nproc` +make $MAKE_PARALLEL diff --git a/buildScripts/travisEnvs b/buildScripts/travisEnvs new file mode 100644 index 0000000..9ab6776 --- /dev/null +++ b/buildScripts/travisEnvs @@ -0,0 +1,3 @@ + +export MAKE_PARALLEL=-j `nproc` + diff --git a/buildScripts/versionEnvs b/buildScripts/versionEnvs index 3cea7c5..51208ac 100644 --- a/buildScripts/versionEnvs +++ b/buildScripts/versionEnvs @@ -5,9 +5,13 @@ #export POPPLER_VERSION=poppler-0.82.0 export POPPLER_VERSION=poppler-0.81.0 + #export FONTFORGE_VERSION=20190801 export FONTFORGE_VERSION=20170731 + export PDF2HTMLEX_VERSION=newBuildSystem + export MACHINE_ARCH=`uname -m` + export DOCKER_FROM=ubuntu:16.04