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

Support 32bit JVM on Windows 32bit builds

Browse Source
This commit is contained in:
FriwiDev
2021-10-26 15:17:35 +02:00
parent 6317b856fc
commit d4394018b1
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
DockerfileWindows32 Normal file
View File

@@ -0,0 +1,7 @@
FROM friwidev/jcefdocker:windows32-latest
WORKDIR C:/builder
#Copy and launch run script
COPY scripts/run_windows.bat .
ENTRYPOINT ["run_windows.bat"]

7
DockerfileWindows64 Normal file
View File

@@ -0,0 +1,7 @@
FROM friwidev/jcefdocker:windows64-latest
WORKDIR C:/builder
#Copy and launch run script
COPY scripts/run_windows.bat .
ENTRYPOINT ["run_windows.bat"]

7
compile_windows.bat
View File

@@ -8,8 +8,11 @@ if ("%2"=="") ( ^
exit 1 ^
)
if "%1"=="386" (set bit=32) ^
else (set bit=64)
:: Execute build with windows Dockerfile
docker build -t jcefbuild --file DockerfileWindows .
docker build -t jcefbuild%bit% --file DockerfileWindows%bit% .
:: Execute run with windows Dockerfile
docker run -v jcef:c:/jcef -v out:c:/out -e TARGETARCH=%1 -e BUILD_TYPE=%2 jcefbuild
docker run -v jcef:c:/jcef -v out:c:/out -e TARGETARCH=%1 -e BUILD_TYPE=%2 jcefbuild%bit%

6
scripts/run_windows.bat
View File

@@ -23,14 +23,14 @@ else (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Au
:: Perform build
cmake -G "Ninja" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..
ninja
ninja -j4
:: Compile java classes
cd ../tools
if "%TARGETARCH%"=="386" (compile.bat win32) else (compile.bat win64)
if "%TARGETARCH%"=="386" (call compile.bat win32) else (call compile.bat win64)
:: Create distribution
if "%TARGETARCH%"=="386" (make_distrib.bat win32) else (make_distrib.bat win64)
if "%TARGETARCH%"=="386" (call make_distrib.bat win32) else (call make_distrib.bat win64)
:: Zip results to C:\out
if "%TARGETARCH%"=="386" (cd ../binary_distrib/win32) else (cd ../binary_distrib/win64)