mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Latest VS 2022 Preview is 17.7.0 now

Browse Source 
...while latest proper VS 2022 is 17.6.2

Change-Id: I300812fc9f5d380fb2c288bfa19b74502a5b0e2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152620
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Stephan Bergmann
2023-06-05 15:30:48 +02:00
parent 367f26ebf0
commit c2c1e6a272
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
configure.ac
View File

@@ -3987,7 +3987,7 @@ map_vs_year_to_version()
2022) 2022)
vsversion=17;; vsversion=17;;
2022preview) 2022preview)
vsversion=17.6;; vsversion=17.7;;
*) *)
AC_MSG_ERROR([Assertion failure - invalid argument "$1" to map_vs_year_to_version()]);; AC_MSG_ERROR([Assertion failure - invalid argument "$1" to map_vs_year_to_version()]);;
esac esac
@@ -4107,7 +4107,7 @@ find_msvc()
vcyear=2019 vcyear=2019
vctoolset=v142 vctoolset=v142
;; ;;
17.0 | 17.6) 17.0 | 17.7)
vcyear=2022 vcyear=2022
vctoolset=v143 vctoolset=v143
;; ;;
@@ -4279,7 +4279,7 @@ if test "$_os" = "WINNT"; then
# are always "better", we list them in reverse chronological order. # are always "better", we list them in reverse chronological order.
case "$vcnumwithdot" in case "$vcnumwithdot" in
16.0 | 17.0 | 17.6) 16.0 | 17.0 | 17.7)
WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0" WINDOWS_SDK_ACCEPTABLE_VERSIONS="10.0 8.1A 8.1 8.0"
;; ;;
esac esac
@@ -6621,7 +6621,7 @@ find_msms()
msmdir= msmdir=
case "$VCVER" in case "$VCVER" in
16.0 | 17.0 | 17.6) 16.0 | 17.0 | 17.7)
for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/" my_msm_dir="$VC_PRODUCT_DIR/redist/MSVC/$l/MergeModules/"
echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5 echo "$as_me:$LINENO: looking for $my_msm_dir${my_msm_file}])" >&5
@@ -6657,7 +6657,7 @@ find_msvc_x64_dlls()
msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT" msvcdllpath="$VC_PRODUCT_DIR/redist/x64/Microsoft.VC${VCVER}.CRT"
case "$VCVER" in case "$VCVER" in
16.0 | 17.0 | 17.6) 16.0 | 17.0 | 17.7)
for crtver in 141 142 143; do for crtver in 141 142 143; do
for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do for l in `ls -1 $VC_PRODUCT_DIR/redist/MSVC/`; do
echo "$as_me:$LINENO: testing $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5 echo "$as_me:$LINENO: testing $VC_PRODUCT_DIR/redist/MSVC/$l/x64/Microsoft.VC$crtver.CRT" >&5