Move for loop to extra snippet

This commit is contained in:
FriwiDev 2021-11-17 02:17:15 +01:00
parent bbb5062652
commit 2639f99ccf

View File

@ -26,9 +26,10 @@ 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" (for /f "tokens=*" %a in ('dir /s /b /ad "C:\arm64jdk\*"') do move /y "%~a" "C:\arm64jdk\jdk" && set "PATH=C:/arm64jdk/jdk;%PATH%") if "%TARGETARCH%"=="arm64" (goto :ARMJVM)
:: Perform build :: 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%"=="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%"=="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:/arm64jdk/jdk" -DCMAKE_BUILD_TYPE=%BUILD_TYPE% ..)
@ -57,3 +58,8 @@ git clone %REPO% jcef
cd jcef cd jcef
git checkout %REF% git checkout %REF%
GOTO :BUILD GOTO :BUILD
:ARMJVM
for /f "tokens=*" %a in ('dir /s /b /ad "C:\arm64jdk\*"') do move /y "%~a" "C:\arm64jdk\jdk"
set "PATH=C:/arm64jdk/jdk;%PATH%"
GOTO :CONTBUILD