Fix issues with upgrade to java 11 and python 3 (jcefbuild#13)

* update version of clang * change sources * small fix to use correct version of java * ensure osx is using python3 * Fix yaml syntax * update osx python path * Fix dependency in linux32 docker * update patches
ebremer · Jul 22, 2020 · d81e821 · d81e821
1 parent 948f64f
commit d81e821
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,39 +5,46 @@ language: java
 git:
   depth: false
 
+branches:
+  only:
+    - master
+    - development
+
 matrix:
   fast_finish: true
   include:
     - os: linux
       dist: xenial
-      compiler: clang-8
       jdk: openjdk11
       env:
         - ARCH_DIST=linux64
-        - CC=clang-8
-        - CXX=clang++-8
+        - PYTHON_EXECUTABLE='/usr/bin/python3.7'
+        - CC=clang-10
+        - CXX=clang++-10
       addons:
         apt:
           update: true
           sources:
             - deadsnakes
-            - llvm-toolchain-xenial-8 # https://docs.travis-ci.com/user/installing-dependencies/#adding-apt-sources
+            # https://docs.travis-ci.com/user/installing-dependencies#adding-apt-sources
+            - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main'
+              key_url: 'https://apt.llvm.org/llvm-snapshot.gpg.key'
           packages:
             - ninja-build
             - cmake
-            - clang-8
+            - clang-10
             - python3.7
             - lbzip2
             - build-essential
             - libgtk2.0-dev
 
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12
       compiler: clang
       env: ARCH_DIST=macosx64
       addons:
         homebrew:
-          update: true
+          update: false
           packages:
             - ninja
             - ant
@@ -46,14 +53,14 @@ matrix:
             - gnu-tar
             - cmake
           taps: AdoptOpenJDK/openjdk
-          casks: adoptopenjdk11-openj9
+          casks: adoptopenjdk11
 
     - os: linux
       services: docker
       env:
         - ARCH_DIST=linux32
-        - CC=clang-8
-        - CXX=clang++-8
+        - CC=clang-10
+        - CXX=clang++-10
       install:
           - docker build --rm --tag travis-build .
           - |
@@ -68,7 +75,7 @@ matrix:
 
     - os: linux
       if: tag IS present
-      jdk: openjdk8
+      jdk: openjdk11
       script:
         - cd $JCEF_DIR/tools
         - ./make_docs.sh
@@ -89,7 +96,9 @@ matrix:
 before_install:
   - |
     if [ $TRAVIS_OS_NAME = 'osx' ]; then
+      # Ensure all homebrew packages are seen first
       export PATH="/usr/local/opt/gnu-tar/libexec/gnubin:$PATH"
+      export PATH="/usr/local/opt/python3/libexec/bin:$PATH"
     fi
   - unset _JAVA_OPTIONS # see https://github.com/travis-ci/travis-ci/issues/8408
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,14 @@
 FROM i386/debian:buster-slim
 
-ENV BASE_PACKAGES git libgtk2.0-dev libxss1 libxt-dev
-ENV BUILD_TOOLS openjdk-11-jdk python3.7 lbzip2 rsync ninja-build clang-8 cmake
+ENV BASE_PACKAGES git libgtk-3-dev libxss1 libxt-dev
+ENV BUILD_TOOLS openjdk-11-jdk python3.7 lbzip2 rsync ninja-build clang-10 cmake
 
 RUN apt-get -q update && \
     apt-get -q install --no-install-recommends --yes wget apt-transport-https gnupg software-properties-common
 
 # clang package sources
 RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \
-    add-apt-repository "deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-8 main" && \
+    add-apt-repository "deb http://apt.llvm.org/buster/ llvm-toolchain-buster-10 main" && \
     mkdir -p /usr/share/man/man1
 
 # install tools
@@ -18,10 +18,10 @@ RUN apt-get -q update && apt-get -q upgrade --yes && \
     apt-get -q autoclean
 
 # add java bin to the path
-ENV PATH "/usr/lib/jvm/java-11-openjdk/bin/:$PATH"
+ENV PATH "/usr/lib/jvm/java-11-openjdk-i386/bin/:$PATH"
 
 # point to java
-ENV JAVA_HOME '/usr/lib/jvm/java-11-openjdk'
+ENV JAVA_HOME '/usr/lib/jvm/java-11-openjdk-i386'
 
 # use python3.7 as default
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.7 1

diff --git a/patch/build-tools.patch b/patch/build-tools.patch
@@ -12,26 +12,28 @@ index f702268..cbb3a65 100644
        )
    endif()
 diff --git a/tools/make_distrib.sh b/tools/make_distrib.sh
-index abe30ed..12752fd 100755
+index abe30ed..a7d97b1 100755
 --- a/tools/make_distrib.sh
 +++ b/tools/make_distrib.sh
 @@ -13,7 +13,7 @@ else
    export DISTRIB_BIN_PATH="$DISTRIB_PATH/bin"
    export DISTRIB_DOCS_PATH="$DISTRIB_PATH/docs"
    export OUT_PATH="./out"
 -  export OUT_DOCS_PATH="./out/docs"
-+  export OUT_DOCS_PATH="./out/docs/*"
++  export OUT_DOCS_PATH="./out/docs/"
    export SOURCE_PATH="./java"
    export JOGAMP_PATH="./third_party/jogamp"
    export TOOLS_DISTRIB_PATH="./tools/distrib/$1"
-@@ -29,6 +29,7 @@ else
+@@ -29,7 +29,8 @@ else
    cd ..
 
    # Copy documentation to the docs directory.
+-  cp -rf $OUT_DOCS_PATH $DISTRIB_DOCS_PATH
 +  mkdir -p $DISTRIB_DOCS_PATH
-   cp -rf $OUT_DOCS_PATH $DISTRIB_DOCS_PATH
++  cp -rf $OUT_DOCS_PATH/* $DISTRIB_DOCS_PATH
 
    # Create README.txt
+   python tools/make_readme.py --output-dir $DISTRIB_PATH/ --platform $DISTRIB_PLATFORM
 @@ -64,7 +65,7 @@ else
        echo "ERROR: Native Release build output path does not exist"
        exit 1
@@ -62,7 +64,7 @@ index abe30ed..12752fd 100755
      cp -f $OUT_BINARY_PATH/libjcef.so $DISTRIB_LIB_PATH
      cp -f $OUT_BINARY_PATH/jcef_helper $DISTRIB_LIB_PATH
 diff --git a/tools/make_docs.sh b/tools/make_docs.sh
-index c6e7c44..7d42f2c 100755
+index c6e7c44..89a39f4 100755
 --- a/tools/make_docs.sh
 +++ b/tools/make_docs.sh
 @@ -7,6 +7,10 @@ cd ../java
@@ -72,7 +74,7 @@ index c6e7c44..7d42f2c 100755
 -javadoc -Xdoclint:none -windowtitle "CEF3 Java API Docs" -footer "<center><a href="https://bitbucket.org/chromiumembedded/java-cef" target="_top">Chromium Embedded Framework (CEF)</a> Copyright &copy 2013 Marshall A. Greenblatt</center>" -nodeprecated -d $OUT_PATH -link http://docs.oracle.com/javase/7/docs/api/ -subpackages org.cef
 +javadoc -Xdoclint:none -windowtitle "CEF3 Java API Docs" \
 +-footer "<center><a href="https://bitbucket.org/chromiumembedded/java-cef" target="_top">Chromium Embedded Framework (CEF)</a> Copyright &copy $(date '+%Y') Marshall A. Greenblatt</center>" \
-+-nodeprecated -d $OUT_PATH -link 'https://docs.oracle.com/javase/8/docs/api/' \
++-nodeprecated -d $OUT_PATH -link 'https://docs.oracle.com/en/java/javase/11/docs/api/' \
 +-subpackages org.cef \
 +-classpath .:../third_party/jogamp/jar/*
 

diff --git a/setup-jdk.sh b/setup-jdk.sh
@@ -5,10 +5,10 @@ if [[ "${TRAVIS_OS_NAME}" == 'linux' ]]; then
     source jdk_switcher/jdk_switcher.sh
   fi
   # On Linux, we can use jdk_switcher
-  jdk_switcher use openjdk8
+  jdk_switcher use openjdk11
 else
   # And on Macosx, we can use the java_home command
-  export JAVA_HOME="$(/usr/libexec/java_home -v 1.8)"
+  export JAVA_HOME="$(/usr/libexec/java_home -v 11)"
 fi
 
 # Print the versions of the java tools to ensure