chizui/Il2CppInspectorRedux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PS: Skip Android builds if toolchain unavailable rather than aborting

Browse Source
This commit is contained in:
Katy Coe
2020-08-20 05:18:31 +02:00
parent e705bcac6b
commit 086c066cc3
1 changed files with 48 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

86
Il2CppTests/generate-binaries.ps1
View File

@@ -46,6 +46,7 @@ $mscorlib = (gci "$UnityPath\Mono*\lib\mono\unityaot\mscorlib.dll")[0].FullName
# https://docs.unity3d.com/2019.1/Documentation/Manual/android-sdksetup.html # https://docs.unity3d.com/2019.1/Documentation/Manual/android-sdksetup.html
$AndroidPlayer = $UnityPath + '\PlaybackEngines\AndroidPlayer' $AndroidPlayer = $UnityPath + '\PlaybackEngines\AndroidPlayer'
$AndroidNDK = $AndroidPlayer + '\NDK' $AndroidNDK = $AndroidPlayer + '\NDK'
$AndroidBuildEnabled = $True
$ErrorActionPreference = "Continue" $ErrorActionPreference = "Continue"
@@ -61,8 +62,8 @@ if (!$UnityPath) {
} }
if (!(Test-Path -Path $AndroidNDK -PathType container)) { if (!(Test-Path -Path $AndroidNDK -PathType container)) {
Write-Error "Could not find Android NDK at '$AndroidNDK' - aborting" echo "Could not find Android NDK at '$AndroidNDK'"
Exit $AndroidBuildEnabled = $False
} }
if (!$il2cpp) { if (!$il2cpp) {
@@ -76,16 +77,21 @@ if (!$mscorlib) {
} }
if (!(Test-Path -Path $AndroidPlayer -PathType container)) { if (!(Test-Path -Path $AndroidPlayer -PathType container)) {
Write-Error "Could not find Unity Android build support - aborting" echo "Could not find Unity Android build support at '$AndroidPlayer'"
Exit $AndroidBuildEnabled = $False
} }
echo "Using C# compiler at '$CSC'" echo "Using C# compiler at '$CSC'"
echo "Using Unity installation at '$UnityPath'" echo "Using Unity installation at '$UnityPath'"
echo "Using IL2CPP toolchain at '$il2cpp'" echo "Using IL2CPP toolchain at '$il2cpp'"
echo "Using Unity mscorlib assembly at '$mscorlib'" echo "Using Unity mscorlib assembly at '$mscorlib'"
echo "Using Android player at '$AndroidPlayer'"
echo "Using Android NDK at '$AndroidNDK'" if ($AndroidBuildEnabled) {
echo "Using Android player at '$AndroidPlayer'"
echo "Using Android NDK at '$AndroidNDK'"
} else {
echo "Android build is disabled due to missing components"
}
# Workspace paths # Workspace paths
$src = "$PSScriptRoot/TestSources" $src = "$PSScriptRoot/TestSources"
@@ -153,42 +159,46 @@ gci $asm -filter $assemblies | % {
rm -Force -Recurse $bin/$name/Data rm -Force -Recurse $bin/$name/Data
# ARMv7 # ARMv7
$name = "$($_.BaseName)-ARMv7" if ($AndroidBuildEnabled) {
echo "Running il2cpp for test assembly $name (Android/ARMv7)..." $name = "$($_.BaseName)-ARMv7"
md $bin/$name 2>&1 >$null echo "Running il2cpp for test assembly $name (Android/ARMv7)..."
rm -Force -Recurse $cpp/$name md $bin/$name 2>&1 >$null
& $il2cpp $arg '--platform=Android', '--architecture=ARMv7', ` rm -Force -Recurse $cpp/$name
"--assembly=$asm/$_,$mscorlib", ` & $il2cpp $arg '--platform=Android', '--architecture=ARMv7', `
"--outputpath=$bin/$name/$name.so", ` "--assembly=$asm/$_,$mscorlib", `
"--generatedcppdir=$cpp/$name", ` "--outputpath=$bin/$name/$name.so", `
"--additional-include-directories=$AndroidPlayer/Tools/bdwgc/include" ` "--generatedcppdir=$cpp/$name", `
"--additional-include-directories=$AndroidPlayer/Tools/libil2cpp/include" ` "--additional-include-directories=$AndroidPlayer/Tools/bdwgc/include" `
"--tool-chain-path=$AndroidNDK" "--additional-include-directories=$AndroidPlayer/Tools/libil2cpp/include" `
if ($LastExitCode -ne 0) { "--tool-chain-path=$AndroidNDK"
Write-Error "IL2CPP error - aborting" if ($LastExitCode -ne 0) {
Exit Write-Error "IL2CPP error - aborting"
Exit
}
mv -Force $bin/$name/Data/metadata/global-metadata.dat $bin/$name
rm -Force -Recurse $bin/$name/Data
} }
mv -Force $bin/$name/Data/metadata/global-metadata.dat $bin/$name
rm -Force -Recurse $bin/$name/Data
# ARMv8 / A64 # ARMv8 / A64
$name = "$($_.BaseName)-ARM64" if ($AndroidBuildEnabled) {
echo "Running il2cpp for test assembly $name (Android/ARM64)..." $name = "$($_.BaseName)-ARM64"
md $bin/$name 2>&1 >$null echo "Running il2cpp for test assembly $name (Android/ARM64)..."
rm -Force -Recurse $cpp/$name md $bin/$name 2>&1 >$null
& $il2cpp $arg '--platform=Android', '--architecture=ARM64', ` rm -Force -Recurse $cpp/$name
"--assembly=$asm/$_,$mscorlib", ` & $il2cpp $arg '--platform=Android', '--architecture=ARM64', `
"--outputpath=$bin/$name/$name.so", ` "--assembly=$asm/$_,$mscorlib", `
"--generatedcppdir=$cpp/$name", ` "--outputpath=$bin/$name/$name.so", `
"--additional-include-directories=$AndroidPlayer/Tools/bdwgc/include" ` "--generatedcppdir=$cpp/$name", `
"--additional-include-directories=$AndroidPlayer/Tools/libil2cpp/include" ` "--additional-include-directories=$AndroidPlayer/Tools/bdwgc/include" `
"--tool-chain-path=$AndroidNDK" "--additional-include-directories=$AndroidPlayer/Tools/libil2cpp/include" `
if ($LastExitCode -ne 0) { "--tool-chain-path=$AndroidNDK"
Write-Error "IL2CPP error - aborting" if ($LastExitCode -ne 0) {
Exit Write-Error "IL2CPP error - aborting"
Exit
}
mv -Force $bin/$name/Data/metadata/global-metadata.dat $bin/$name
rm -Force -Recurse $bin/$name/Data
} }
mv -Force $bin/$name/Data/metadata/global-metadata.dat $bin/$name
rm -Force -Recurse $bin/$name/Data
} }
# Generate test stubs # Generate test stubs