From 0eecbed932238ee31b5224f354fcb4e0f98f54d3 Mon Sep 17 00:00:00 2001 From: Stephen Gaito Date: Thu, 21 Nov 2019 18:43:26 +0000 Subject: [PATCH] corrected build scripts to reflect those on virtual machine --- buildScripts/buildFontforge | 4 ++++ buildScripts/buildPdf2htmlEX | 5 +++++ buildScripts/buildPdf2htmlEXClang | 5 +++++ buildScripts/cleanPdf2htmlEX | 6 ++++++ buildScripts/getBuildTools | 3 +++ buildScripts/getFontforge | 8 +++++++- buildScripts/installPdf2htmlEX | 3 ++- 7 files changed, 32 insertions(+), 2 deletions(-) diff --git a/buildScripts/buildFontforge b/buildScripts/buildFontforge index 8168b08..b8ba71a 100755 --- a/buildScripts/buildFontforge +++ b/buildScripts/buildFontforge @@ -1,3 +1,7 @@ +#!/bin/bash + +# This bash script build FontForge + cd fontforge ./bootstrap ./configure diff --git a/buildScripts/buildPdf2htmlEX b/buildScripts/buildPdf2htmlEX index 399912c..6dbef4e 100755 --- a/buildScripts/buildPdf2htmlEX +++ b/buildScripts/buildPdf2htmlEX @@ -1,3 +1,8 @@ +#!/bin/bash + +# This bash script builds pdf2htmlEX + +cd pdf2html mkdir build cd build cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. diff --git a/buildScripts/buildPdf2htmlEXClang b/buildScripts/buildPdf2htmlEXClang index 4a9914a..95a4574 100755 --- a/buildScripts/buildPdf2htmlEXClang +++ b/buildScripts/buildPdf2htmlEXClang @@ -1,3 +1,8 @@ +#!/bin/bash + +# This bash script builds pdf2htmlEX using Clang (if it is installed) + +cd pdf2htmlEX mkdir build cd build CC=clang CXX=clang++ cmake .. diff --git a/buildScripts/cleanPdf2htmlEX b/buildScripts/cleanPdf2htmlEX index 97f8946..0b44a63 100755 --- a/buildScripts/cleanPdf2htmlEX +++ b/buildScripts/cleanPdf2htmlEX @@ -1 +1,7 @@ +#!/bin/bash + +# 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/getBuildTools b/buildScripts/getBuildTools index 5d02109..9219bb8 100755 --- a/buildScripts/getBuildTools +++ b/buildScripts/getBuildTools @@ -10,10 +10,13 @@ sudo apt $UNATTENDED install \ git \ pkg-config \ ruby \ + autoconf \ + libtool \ cmake \ make \ gcc \ g++ \ gettext \ + openjdk-8-jre-headless \ tree diff --git a/buildScripts/getFontforge b/buildScripts/getFontforge index 0dc10e5..193eca4 100755 --- a/buildScripts/getFontforge +++ b/buildScripts/getFontforge @@ -4,7 +4,7 @@ source buildScripts/versionEnvs -FONTFORGE_SRC=fontforge-$FONTFORGE_VERSION.tar.gz +FONTFORGE_SRC=$FONTFORGE_VERSION.tar.gz rm -rf $FONTFORGE_SRC rm -rf fontforge @@ -14,3 +14,9 @@ wget https://github.com/fontforge/fontforge/archive/$FONTFORGE_SRC tar xvf $FONTFORGE_SRC mv fontforge-$FONTFORGE_VERSION fontforge + +# FIX required for fontforge 20170731 raw sources +# +cd fontforge +# +patch -p 1 < ../patches/fontforge-20170731-fixGDraw.patch diff --git a/buildScripts/installPdf2htmlEX b/buildScripts/installPdf2htmlEX index de19338..4102e29 100755 --- a/buildScripts/installPdf2htmlEX +++ b/buildScripts/installPdf2htmlEX @@ -8,5 +8,6 @@ if [[ $# -eq 0 ]] ; then fi -cd build +cd pdf2htmlEX/build + sudo make install