diff --git a/.formal-git/components b/.formal-git/components index 1ce846b3..43efe01f 100644 --- a/.formal-git/components +++ b/.formal-git/components @@ -15,3 +15,6 @@ fonts welcome scripts workflows +winsign +flatpak +configs \ No newline at end of file diff --git a/.gitignore b/.gitignore index e8be44c7..ac99e8f7 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ windsign-temp/ venv/ !firefox-cache/ +win-cross/ \ No newline at end of file diff --git a/build/winsign/bootstrap.ps1 b/build/winsign/bootstrap.ps1 index 894c3332..57b81c81 100644 --- a/build/winsign/bootstrap.ps1 +++ b/build/winsign/bootstrap.ps1 @@ -4,4 +4,6 @@ C:\MozillaBuildSetup-Latest.exe /S | out-null rustup target add aarch64-pc-windows-msvc rustup target add x86_64-pc-windows-msvc -cp -r tests engine/browser/base/zen-components/ +cd engine +./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ../win-cross/vs2022 +cd .. diff --git a/build/winsign/sign.ps1 b/build/winsign/sign.ps1 index 6cd620eb..2f4a033f 100644 --- a/build/winsign/sign.ps1 +++ b/build/winsign/sign.ps1 @@ -49,7 +49,6 @@ function DownloadFile($url, $targetFile) { $request = [System.Net.HttpWebRequest]::Create($uri) $request.UserAgent = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.3" $request.Headers.Add("Authorization", "Bearer $token") - $request.set_Timeout(15000) #15 second timeout $response = $request.GetResponse() $totalLength = [System.Math]::Floor($response.get_ContentLength()/1024) $responseStream = $response.GetResponseStream() @@ -135,6 +134,12 @@ function SignAndPackage($name) { echo "Copying setup.exe into obj dir" $env:ZEN_SETUP_EXE_PATH="$PWD\windsign-temp\windows-x64-obj-$name\browser\installer\windows\instgen\setup.exe" + + if ($name -eq "arm64") { + $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\arm64\Microsoft.VC143.CRT" + } else { + $env:WIN32_REDIST_DIR="$PWD\win-cross\vs2022\VC\Redist\MSVC\14.38.33135\x64\Microsoft.VC143.CRT" + } $env:MAR="..\\build\\winsign\\mar.exe" if ($name -eq "arm64") { diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig index 159f2fea..8d404395 100644 --- a/configs/windows/mozconfig +++ b/configs/windows/mozconfig @@ -17,7 +17,6 @@ if test "$ZEN_CROSS_COMPILING"; then else export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.38.33135/x64/Microsoft.VC143.CRT" fi - fi #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793 diff --git a/scripts/fetch-formal-git-components.sh b/scripts/fetch-formal-git-components.sh index 227118d5..958cb6e7 100644 --- a/scripts/fetch-formal-git-components.sh +++ b/scripts/fetch-formal-git-components.sh @@ -7,6 +7,9 @@ COMPONENT_ROOT=$(pwd)/src/zen EXTRA_COMPONENTS=( "scripts" "workflows" + "winsign" + "flatpak" + "configs" ) echo "" > .formal-git/components