xinyin025/jcefbuild
1
0
Fork 0
mirror of https://github.com/jcefmaven/jcefbuild.git synced 2025-09-22 23:36:36 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use arm64 jdk on windows build

Browse Source
This commit is contained in:
FriwiDev 2021-11-17 01:15:41 +01:00
parent d6e4e569a5
commit d4c9cb59be
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,5 +21,5 @@ jobs:
name: Build name: Build
shell: cmd shell: cmd
run: | run: |
compile_windows.bat arm64 Release compile_windows.bat arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}

8
.github/workflows/build.yml vendored
View File

@ -122,7 +122,7 @@ jobs:
name: Build name: Build
shell: cmd shell: cmd
run: | run: |
compile_windows.bat amd64 Release compile_windows.bat amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
- name: Export distribution - name: Export distribution
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
@ -143,7 +143,7 @@ jobs:
name: Build name: Build
shell: cmd shell: cmd
run: | run: |
compile_windows.bat 386 Release compile_windows.bat 386 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
- name: Export distribution - name: Export distribution
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
@ -169,7 +169,7 @@ jobs:
name: Build name: Build
run: | run: |
chmod +x compile_macosx.sh chmod +x compile_macosx.sh
./compile_macosx.sh amd64 Release ./compile_macosx.sh amd64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
- name: Export distribution - name: Export distribution
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:
@ -204,7 +204,7 @@ jobs:
name: Build name: Build
run: | run: |
chmod +x compile_macosx.sh chmod +x compile_macosx.sh
./compile_macosx.sh arm64 Release ./compile_macosx.sh arm64 Release ${{ github.event.inputs.repo }} ${{ github.event.inputs.ref }}
- name: Export distribution - name: Export distribution
uses: actions/upload-release-asset@v1 uses: actions/upload-release-asset@v1
env: env:

6
scripts/run_windows.bat
View File

@ -26,10 +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) :: 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%"=="386" (set "PATH=C:/Program Files (x86)/Java/jdk1.8.0_211;%PATH%")
if "%TARGETARCH%"=="arm64" (move "C:/arm64jdk/jdk-*" "C:/arm64jdk/jdk" && set "PATH=C:/arm64jdk/jdk;%PATH%")
:: Perform build :: Perform build
if "%TARGETARCH%"=="386" (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files (x86)/Java/jdk1.8.0_211" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..) ^ if "%TARGETARCH%"=="386" (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files (x86)/Java/jdk1.8.0_211" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
else (cmake -G "Ninja" -DJAVA_HOME="C:/Program Files/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% ..)
ninja -j4 ninja -j4
:: Compile java classes :: Compile java classes