From e13d299b68ed5b62e5ca1541bfbde7512b97048a Mon Sep 17 00:00:00 2001 From: Ponchale Date: Tue, 26 Mar 2024 01:19:09 -0500 Subject: [PATCH] new template for mozconfig windows --- .../aarch64/mozconfig_win_aarch64_pgo_base | 18 +++++++------- .../windows/x86/mozconfig_win_x86_pgo_base | 23 +++++++++--------- .../x86_64/mozconfig_win_x86_64_pgo_base | 24 +++++++++---------- 3 files changed, 33 insertions(+), 32 deletions(-) diff --git a/.github/workflows/src/windows/aarch64/mozconfig_win_aarch64_pgo_base b/.github/workflows/src/windows/aarch64/mozconfig_win_aarch64_pgo_base index 72a5cb28039..de3e028097c 100644 --- a/.github/workflows/src/windows/aarch64/mozconfig_win_aarch64_pgo_base +++ b/.github/workflows/src/windows/aarch64/mozconfig_win_aarch64_pgo_base @@ -1,5 +1,6 @@ ac_add_options --with-app-name=midori ac_add_options --with-app-basename=Midori +ac_add_options --with-branding=browser/branding/official ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection @@ -10,9 +11,9 @@ ac_add_options --disable-tests ac_add_options --enable-rust-simd ac_add_options --enable-release ac_add_options RUSTC_OPT_LEVEL=3 -MOZ_REQUIRE_SIGNING= -MOZ_DATA_REPORTING= -MOZ_TELEMETRY_REPORTING= +ac_add_options MOZ_REQUIRE_SIGNING= +ac_add_options MOZ_DATA_REPORTING= +ac_add_options MOZ_TELEMETRY_REPORTING= ac_add_options --enable-bootstrap @@ -20,15 +21,14 @@ ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key" ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key" -ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key" -export WINSYSROOT="$(echo ~)/win-cross/vs2019" +ac_add_options WINSYSROOT="$(echo ~)/win-cross/vs2019" -export WINE="$(echo ~)/win-cross/wine/bin/wine64" -export WINEDEBUG=-all +ac_add_options WINE="$(echo ~)/win-cross/wine/bin/wine64" +ac_add_options WINEDEBUG=-all ac_add_options --target=aarch64-pc-windows-msvc -export MOZ_LTO=cross +ac_add_options MOZ_LTO=cross -export MOZ_STUB_INSTALLER=1 +ac_add_options MOZ_STUB_INSTALLER=1 diff --git a/.github/workflows/src/windows/x86/mozconfig_win_x86_pgo_base b/.github/workflows/src/windows/x86/mozconfig_win_x86_pgo_base index e66c863bf38..a9ba808b9d4 100644 --- a/.github/workflows/src/windows/x86/mozconfig_win_x86_pgo_base +++ b/.github/workflows/src/windows/x86/mozconfig_win_x86_pgo_base @@ -2,6 +2,7 @@ ac_add_options --with-app-name=midori ac_add_options --with-app-basename=Midori +ac_add_options --with-branding=browser/branding/official ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection @@ -12,9 +13,9 @@ ac_add_options --disable-tests ac_add_options --enable-rust-simd ac_add_options --enable-release ac_add_options RUSTC_OPT_LEVEL=3 -MOZ_REQUIRE_SIGNING= -MOZ_DATA_REPORTING= -MOZ_TELEMETRY_REPORTING= +ac_add_options MOZ_REQUIRE_SIGNING= +ac_add_options MOZ_DATA_REPORTING= +ac_add_options MOZ_TELEMETRY_REPORTING= ac_add_options --enable-bootstrap @@ -24,19 +25,19 @@ ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key" ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key" ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key" -export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2019/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x86" -export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2019/VC/Redist/MSVC/14.29.30133/x86/Microsoft.VC142.CRT" +ac_add_options WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2019/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x86" +ac_add_options WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2019/VC/Redist/MSVC/14.29.30133/x86/Microsoft.VC142.CRT" -export WINSYSROOT="$(echo ~)/win-cross/vs2019" +ac_add_options WINSYSROOT="$(echo ~)/win-cross/vs2019" -export MIDL="$(echo ~)/win-cross/wine/bin/widl" -export WINE="$(echo ~)/win-cross/wine/bin/wine64" -export WINEDEBUG=-all +ac_add_options MIDL="$(echo ~)/win-cross/wine/bin/widl" +ac_add_options WINE="$(echo ~)/win-cross/wine/bin/wine64" +ac_add_options WINEDEBUG=-all #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793 #? https://phabricator.services.mozilla.com/D170170 ac_add_options --target=i686-pc-windows-msvc -export MOZ_STUB_INSTALLER=1 +ac_add_options MOZ_STUB_INSTALLER=1 -export MOZ_LTO=cross \ No newline at end of file +ac_add_options MOZ_LTO=cross diff --git a/.github/workflows/src/windows/x86_64/mozconfig_win_x86_64_pgo_base b/.github/workflows/src/windows/x86_64/mozconfig_win_x86_64_pgo_base index e99908c8c49..20ebd4a1bea 100644 --- a/.github/workflows/src/windows/x86_64/mozconfig_win_x86_64_pgo_base +++ b/.github/workflows/src/windows/x86_64/mozconfig_win_x86_64_pgo_base @@ -1,5 +1,6 @@ ac_add_options --with-app-name=midori ac_add_options --with-app-basename=Midori +ac_add_options --with-branding=browser/branding/official ac_add_options --disable-crashreporter ac_add_options --disable-maintenance-service ac_add_options --enable-proxy-bypass-protection @@ -10,9 +11,9 @@ ac_add_options --disable-tests ac_add_options --enable-rust-simd ac_add_options --enable-release ac_add_options RUSTC_OPT_LEVEL=3 -MOZ_REQUIRE_SIGNING= -MOZ_DATA_REPORTING= -MOZ_TELEMETRY_REPORTING= +ac_add_options MOZ_REQUIRE_SIGNING= +ac_add_options MOZ_DATA_REPORTING= +ac_add_options MOZ_TELEMETRY_REPORTING= ac_add_options --enable-bootstrap @@ -20,21 +21,20 @@ ac_add_options --without-wasm-sandboxed-libraries ac_add_options --with-mozilla-api-keyfile="$PWD/floorp/apis/api-mozilla-key" ac_add_options --with-google-location-service-api-keyfile="$PWD/floorp/apis/api-google-location-service-key" -ac_add_options --with-google-safebrowsing-api-keyfile="$PWD/floorp/apis/api-google-safe-browsing-key" -export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2019/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x64" -export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2019/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT" +ac_add_options WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2019/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x64" +ac_add_options WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2019/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT" -export WINSYSROOT="$(echo ~)/win-cross/vs2019" +ac_add_options WINSYSROOT="$(echo ~)/win-cross/vs2019" -export MIDL="$(echo ~)/win-cross/wine/bin/widl" -export WINE="$(echo ~)/win-cross/wine/bin/wine64" -export WINEDEBUG=-all +ac_add_options MIDL="$(echo ~)/win-cross/wine/bin/widl" +ac_add_options WINE="$(echo ~)/win-cross/wine/bin/wine64" +ac_add_options WINEDEBUG=-all #? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793 #? https://phabricator.services.mozilla.com/D170170 ac_add_options --target=x86_64-pc-windows-msvc -export MOZ_STUB_INSTALLER=1 +ac_add_options MOZ_STUB_INSTALLER=1 -export MOZ_LTO=cross +ac_add_options MOZ_LTO=cross