From ed8466859dd39288f6a6163f2e284c1a42dcaf6e Mon Sep 17 00:00:00 2001 From: FriwiDev Date: Tue, 26 Oct 2021 10:57:50 +0200 Subject: [PATCH] Try with call --- scripts/build_win.bat | 17 ----------------- scripts/run_windows.bat | 22 ++++++++++++++++++++-- 2 files changed, 20 insertions(+), 19 deletions(-) delete mode 100644 scripts/build_win.bat diff --git a/scripts/build_win.bat b/scripts/build_win.bat deleted file mode 100644 index ef2610a..0000000 --- a/scripts/build_win.bat +++ /dev/null @@ -1,17 +0,0 @@ -cd C:\jcef\jcef_build - -:: Perform build -cmake -G "Ninja" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. -ninja - -:: Compile java classes -cd ../tools -if "%TARGETARCH%"=="386" (compile.bat win32) else (compile.bat win64) - -:: Create distribution -if "%TARGETARCH%"=="386" (make_distrib.bat win32) else (make_distrib.bat win64) - -:: Zip results to C:\out -if "%TARGETARCH%"=="386" (cd ../binary_distrib/win32) else (cd ../binary_distrib/win64) -del /F C:\out\binary_distrib.tar.gz -tar -czvf C:\out\binary_distrib.tar.gz * diff --git a/scripts/run_windows.bat b/scripts/run_windows.bat index 9b970c8..cbd3878 100644 --- a/scripts/run_windows.bat +++ b/scripts/run_windows.bat @@ -15,11 +15,29 @@ cd jcef mkdir jcef_build && cd jcef_build :: Load vcvars -if "%TARGETARCH%"=="386" (cmd.exe /V /C """"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat"" "&&" "C:\builder\build_win.bat") ^ -else (cmd.exe /V /C """"C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat"" "&&" "C:\builder\build_win.bat") +if "%TARGETARCH%"=="386" (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars32.bat") ^ +else (call "C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\VC\Auxiliary\Build\vcvars64.bat") + +:: Perform build +cmake -G "Ninja" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% .. +ninja + +:: Compile java classes +cd ../tools +if "%TARGETARCH%"=="386" (compile.bat win32) else (compile.bat win64) + +:: Create distribution +if "%TARGETARCH%"=="386" (make_distrib.bat win32) else (make_distrib.bat win64) + +:: Zip results to C:\out +if "%TARGETARCH%"=="386" (cd ../binary_distrib/win32) else (cd ../binary_distrib/win64) +del /F C:\out\binary_distrib.tar.gz +tar -czvf C:\out\binary_distrib.tar.gz * GOTO :EOF + + :CLONE if exist jcef rmdir /S /Q jcef git clone https://bitbucket.org/chromiumembedded/java-cef jcef