Manually set java home

This commit is contained in:
Fritz Windisch 2023-08-07 17:21:12 +02:00
parent 70817e5648
commit 286fcff999

View File

@ -31,7 +31,6 @@ fi
#CMake patching
python3 /builder/patch_cmake.py cmake/DownloadCEF.cmake
python3 /builder/patch_cmake.py CMakeLists.txt
export JAVA_HOME="/usr/lib/jvm/java-17-openjdk*"
# Create and enter the `jcef_build` directory.
# The `jcef_build` directory name is required by other JCEF tooling
@ -51,7 +50,7 @@ for f in ../third_party/cef/cef_binary_*; do
done
# Linux: Generate 32/64-bit Unix Makefiles.
cmake -G "Ninja" -DPROJECT_ARCH=${TARGETARCH} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
JAVA_HOME="/usr/lib/jvm/java-17-openjdk*" cmake -G "Ninja" -DPROJECT_ARCH=${TARGETARCH} -DCMAKE_BUILD_TYPE=${BUILD_TYPE} ..
# Build native part using ninja.
ninja -j4
@ -59,7 +58,7 @@ ninja -j4
cd ../tools
chmod +x compile.sh
if [ ${TARGETARCH} == 'amd64' ] || [ ${TARGETARCH} == 'arm64' ]; then
./compile.sh linux64
JAVA_HOME="/usr/lib/jvm/java-17-openjdk*" ./compile.sh linux64
elif [ ${TARGETARCH} == '386' ]; then
echo "386 is no longer supported since chromium 104"
exit 1
@ -75,9 +74,9 @@ set -e
#Generate distribution
chmod +x make_distrib.sh
if [ ${TARGETARCH} == 'amd64' ] || [ ${TARGETARCH} == 'arm64' ]; then
./make_distrib.sh linux64
JAVA_HOME="/usr/lib/jvm/java-17-openjdk*" ./make_distrib.sh linux64
else
./make_distrib.sh linux32
JAVA_HOME="/usr/lib/jvm/java-17-openjdk*" ./make_distrib.sh linux32
fi
#Pack binary_distrib