diff --git a/.travis.yml b/.travis.yml index 81da3e7..43790e9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,6 +86,9 @@ script: - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin - ./buildScripts/getBuildTools || travis_terminate 1; - ./buildScripts/getDevLibraries || travis_terminate 1; + - ./buildScripts/getPoppler || travis_terminate 1; + - ./buildScripts/buildPoppler || travis_terminate 1; + - ./buildScripts/installPoppler || travis_terminate 1; - ./buildScripts/getFontforge || travis_terminate 1; - ./buildScripts/buildFontforge || travis_terminate 1; - ./buildScripts/installFontforge || travis_terminate 1; @@ -95,6 +98,3 @@ script: - ./buildScripts/createDockerImage || travis_terminate 1; - docker push $DOCKER_USERNAME/pdf2htmlex -# - ./buildScripts/getPoppler || travis_terminate 1; -# - ./buildScripts/buildPoppler || travis_terminate 1; -# - ./buildScripts/installPoppler || travis_terminate 1; diff --git a/buildScripts/buildFontforge b/buildScripts/buildFontforge index 5b6d78f..40ca338 100755 --- a/buildScripts/buildFontforge +++ b/buildScripts/buildFontforge @@ -7,37 +7,27 @@ source buildScripts/versionEnvs # This is a work-around to fix TravisCI's declaration of PYTHON_CFLAGS # which is then honoured exactly as is by the fontforge bootstrap and -# configure steps +# configure steps. +# +# see: https://github.com/travis-ci/travis-ci/issues/5301 (unfixed) # if [ -n "$PYTHON_CFLAGS" ] ; then export PYTHON_CFLAGS="$(pkg-config --cflags python) $PYTHON_CFLAGS" fi echo "" +echo "PYTHON_CFLAGS: echo "-------------------------------" -pkg-config --cflags python -pkg-config --cflags python-2.7 echo $PYTHON_CFLAGS -echo $PYTHON_LIBS echo "-------------------------------" echo "" +# Can use "configure --disable-silent-rules" to debug configuration/make +# problems +# cd fontforge ./bootstrap -./configure --disable-silent-rules - -echo "" -echo "-------------------------------" -cat config.log -echo "-------------------------------" -echo "" - -echo "" -echo "-------------------------------" -cat fontforge/Makefile -echo "-------------------------------" -echo "" - +./configure # Apply any patches required for fontforge raw sources before we make # @@ -47,13 +37,5 @@ do patch -p 1 < $APATCHFILE done -tree /usr/include/python2.7 - -#cd fontforge -#make -n -#cd .. - -make - -#make $MAKE_PARALLEL +make $MAKE_PARALLEL diff --git a/buildScripts/fontforgeConfig.site b/buildScripts/fontforgeConfig.site deleted file mode 100644 index 4c8361b..0000000 --- a/buildScripts/fontforgeConfig.site +++ /dev/null @@ -1,6 +0,0 @@ -# This autotools config.site file add the python2.7 include files which are -# for some reason missed in the standard fontforge configuration on -# travisCI - -PYTHON_CFLAGS=$PYTHON_CFLAGS -I/usr/include/python2.7 - diff --git a/buildScripts/getDevLibraries b/buildScripts/getDevLibraries index a32a956..6631536 100755 --- a/buildScripts/getDevLibraries +++ b/buildScripts/getDevLibraries @@ -16,7 +16,5 @@ sudo apt-get $UNATTENDED install \ libpango1.0-dev \ liblcms2-dev \ libxml2-dev \ - libuninameslist-dev - -sudo apt-get $UNATTENDED $FORCE_REINSTALL install \ - libpython2.7-dev + libuninameslist-dev \ + libpython-dev diff --git a/buildScripts/travisEnvs b/buildScripts/travisEnvs index 3f8da7a..f9e4553 100644 --- a/buildScripts/travisEnvs +++ b/buildScripts/travisEnvs @@ -1,3 +1,2 @@ export MAKE_PARALLEL="-j `nproc`" -export FORCE_REINSTALL=--reinstall