[FB] GitHub | Remove --enable-private-components from config

Floorp-Projects · Aug 3, 2024 · 6a87239 · 6a87239
1 parent 75a482c
commit 6a87239
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/.github/workflows/src/linux/shared/mozconfig_linux_base b/.github/workflows/src/linux/shared/mozconfig_linux_base
@@ -1,6 +1,5 @@
 ac_add_options --with-app-name=floorp
 ac_add_options --with-app-basename=Floorp
-ac_add_options --enable-private-components
 
 ac_add_options --disable-crashreporter
 ac_add_options --enable-proxy-bypass-protection

diff --git a/.github/workflows/src/mac/shared/mozconfig_darwin_pgo_base b/.github/workflows/src/mac/shared/mozconfig_darwin_pgo_base
@@ -1,7 +1,6 @@
 ac_add_options --with-app-name=floorp
 ac_add_options --with-app-basename=Floorp
 
-ac_add_options --enable-private-components
 
 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"

diff --git a/.github/workflows/src/windows/aarch64/mozconfig_win_aarch64_pgo_base b/.github/workflows/src/windows/aarch64/mozconfig_win_aarch64_pgo_base
@@ -1,6 +1,5 @@
 ac_add_options --with-app-name=floorp
 ac_add_options --with-app-basename=Floorp
-ac_add_options --enable-private-components
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
@@ -24,7 +23,7 @@ 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"
+export WINSYSROOT="$(echo ~)/win-cross/vs2022"
 
 export WINE="$(echo ~)/win-cross/wine/bin/wine64"
 export WINEDEBUG=-all

diff --git a/.github/workflows/src/windows/x86/mozconfig_win_x86_pgo_base b/.github/workflows/src/windows/x86/mozconfig_win_x86_pgo_base
@@ -2,7 +2,6 @@
 
 ac_add_options --with-app-name=floorp
 ac_add_options --with-app-basename=Floorp
-ac_add_options --enable-private-components
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
@@ -26,10 +25,10 @@ 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"
+export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2022/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x86"
+export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.29.30133/x86/Microsoft.VC142.CRT"
 
-export WINSYSROOT="$(echo ~)/win-cross/vs2019"
+export WINSYSROOT="$(echo ~)/win-cross/vs2022"
 
 export MIDL="$(echo ~)/win-cross/wine/bin/widl"
 export WINE="$(echo ~)/win-cross/wine/bin/wine64"

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
@@ -1,7 +1,6 @@
 ac_add_options --with-app-name=floorp
 ac_add_options --with-app-basename=Floorp
 
-ac_add_options --enable-private-components
 
 ac_add_options --disable-crashreporter
 ac_add_options --disable-maintenance-service
@@ -25,10 +24,10 @@ 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"
+export WIN_UCRT_REDIST_DIR="$(echo ~)/win-cross/vs2022/Windows Kits/10/Redist/10.0.19041.0/ucrt/DLLs/x64"
+export WIN32_REDIST_DIR="$(echo ~)/win-cross/vs2022/VC/Redist/MSVC/14.29.30133/x64/Microsoft.VC142.CRT"
 
-export WINSYSROOT="$(echo ~)/win-cross/vs2019"
+export WINSYSROOT="$(echo ~)/win-cross/vs2022"
 
 export MIDL="$(echo ~)/win-cross/wine/bin/widl"
 export WINE="$(echo ~)/win-cross/wine/bin/wine64"

diff --git a/.github/workflows/windows-build.yml b/.github/workflows/windows-build.yml
@@ -187,8 +187,8 @@ jobs:
 
  echo Setup Visual Studio
  sudo apt install -y msitools python3-pip
- ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2019.yaml ~/win-cross/vs2019
- chmod -R +x "$(echo ~)/win-cross/vs2019"
+ ./mach python --virtualenv build taskcluster/scripts/misc/get_vs.py build/vs/vs2022.yaml ~/win-cross/vs2022
+ chmod -R +x "$(echo ~)/win-cross/vs2022"
  #? from daily-build-with-update
  #? for resolve some problems relate to VCRuntime
  #? from end