xinyin025/jcefbuild
1
0
Fork 0
mirror of https://github.com/jcefmaven/jcefbuild.git synced 2025-11-04 16:33:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use new jdk location on windows, change linux/arm/v7 to linux/arm/v6

Browse Source
This commit is contained in:
FriwiDev
2021-11-18 02:34:17 +01:00
parent 85e8d5b217
commit f745ff5fd1
5 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build-linux-arm.yml vendored
View File

@@ -28,5 +28,5 @@ jobs:
name: Build
run: |
chmod +x compile_linux.sh
./compile_linux.sh arm/v7 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
./compile_linux.sh arm/v6 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}

0
.github/workflows/build-windows-arm.yml → .github/workflows/build-windows-arm64.yml vendored
View File

2
DockerfileLinux
View File

@@ -3,7 +3,7 @@ FROM friwidev/jcefdocker:linux-latest AS stage
#Declare build type argument (Release or Debug)
ARG BUILD_TYPE
#Declare architecture argument (arm64, arm/v7, 386 or amd64)
#Declare architecture argument (arm64, arm/v6, 386 or amd64)
ARG TARGETARCH
#Declare git args

2
compile_linux.sh
View File

@@ -4,7 +4,7 @@ if [ $# -lt 2 ] || [ $# -eq 3 ]
then
echo "Usage: ./compile_linux.sh <architecture> <buildType> [<gitrepo> <gitref>]"
echo ""
echo "architecture: the target architecture to build for. Architectures are either arm64, arm/v7, 386 or amd64."
echo "architecture: the target architecture to build for. Architectures are either arm64, arm/v6, 386 or amd64."
echo "buildType: either Release or Debug"
echo "gitrepo: git repository url to clone"
echo "gitref: the git commit id to pull"

15
scripts/run_windows.bat
View File

@@ -26,13 +26,12 @@ if "%TARGETARCH%"=="arm64" (call "C:\Program Files (x86)\Microsoft Visual Studio
:: Edit PATH variable on 386 to use 32 bit jdk (cmake findjni does not actually care about JAVA_HOME)
if "%TARGETARCH%"=="386" (set "PATH=C:/Program Files (x86)/Java/jdk1.8.0_211;%PATH%")
if "%TARGETARCH%"=="arm64" (goto :ARMJVM)
if "%TARGETARCH%"=="arm64" (set "PATH=C:/jdk-11;%PATH%")
:: Perform build
:CONTBUILD
if "%TARGETARCH%"=="386" (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files (x86)/Java/jdk1.8.0_211" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
if "%TARGETARCH%"=="amd64" (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files/Java/jdk1.8.0_211" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
if "%TARGETARCH%"=="arm64" (cmake -G "Ninja" -DJAVA_HOME="C:/arm64jdk/%JDK%" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
if "%TARGETARCH%"=="arm64" (cmake -G "Ninja" -DJAVA_HOME="C:/jdk-11" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
ninja -j4
:: Compile java classes
@@ -59,13 +58,3 @@ cd jcef
git checkout %REF%
GOTO :BUILD
:ARMJVM
dir C:\arm64jdk
FOR %%F IN (C:\arm64jdk\*) DO (
set JDK=%%F
goto cont
)
:cont
set "PATH=C:/arm64jdk/%JDK%;%PATH%"
echo %PATH%
GOTO :CONTBUILD