Skip to content

Commit dc1814c

Browse files
mickemmickem
authored
Switched to toolset 141 (XP support) (#840)
* Switched to toolset 141 (XP support)
1 parent 1d3a1ba commit dc1814c

File tree

6 files changed

+31
-26
lines changed

6 files changed

+31
-26
lines changed

‎.github/actions/cryptopp/action.yaml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,10 @@ runs:
5656
- name: Build
5757
run: |
5858
python ../../build/python/msdev-to-dynamic.py cryptlib.vcxproj
59-
msbuild cryptlib.vcxproj /p:Configuration=Release /p:Platform=${{ steps.setup.outputs.platform }}
60-
msbuild cryptlib.vcxproj /p:Configuration=Debug /p:Platform=${{ steps.setup.outputs.platform }}
61-
msbuild cryptdll.vcxproj /p:Configuration=Release /p:Platform=${{ steps.setup.outputs.platform }}
62-
msbuild cryptdll.vcxproj /p:Configuration=Debug /p:Platform=${{ steps.setup.outputs.platform }}
63-
tree
59+
msbuild cryptlib.vcxproj /p:Configuration=Release /p:Platform=${{ steps.setup.outputs.platform }} /p:PlatformToolset=v141_xp
60+
msbuild cryptlib.vcxproj /p:Configuration=Debug /p:Platform=${{ steps.setup.outputs.platform }} /p:PlatformToolset=v141_xp
61+
msbuild cryptdll.vcxproj /p:Configuration=Release /p:Platform=${{ steps.setup.outputs.platform }} /p:PlatformToolset=v141_xp
62+
msbuild cryptdll.vcxproj /p:Configuration=Debug /p:Platform=${{ steps.setup.outputs.platform }} /p:PlatformToolset=v141_xp
6463
working-directory: tmp/cryptopp
6564
shell: cmd
6665

‎.github/actions/protobuf/action.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ runs:
5252

5353
- name: CMake x64
5454
run: |
55-
cmake -DBUILD_SHARED_LIBS=TRUE -G "Visual Studio 17" -A ${{ steps.setup.outputs.platform }} ..
55+
cmake -DBUILD_SHARED_LIBS=TRUE -G "Visual Studio 17" -T v141 -A ${{ steps.setup.outputs.platform }} ..
5656
working-directory: tmp/protobuf-${{ inputs.version }}/build
5757
shell: cmd
5858

‎.github/workflows/build-windows.yml‎

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,24 @@ jobs:
4646
cache-dependency-path: 'build/python/requirements.txt'
4747
cache: 'pip'
4848

49+
- name: Install components
50+
run: |
51+
Set-Location "C:\Program Files (x86)\Microsoft Visual Studio\Installer\"
52+
$InstallPath = "C:\Program Files\Microsoft Visual Studio\2022\Enterprise"
53+
$components= @(
54+
"Microsoft.VisualStudio.Component.VC.v141.x86.x64"
55+
"Microsoft.VisualStudio.Component.VC.v141.ATL"
56+
"Microsoft.VisualStudio.Component.WinXP"
57+
)
58+
[string]$workloadArgs = $components | ForEach-Object {" --add " + $_}
59+
$Arguments = ('/c', "vs_installer.exe", 'modify', '--installPath', "`"$InstallPath`"",$workloadArgs, '--quiet', '--norestart', '--nocache')
60+
# should be run twice
61+
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
62+
$process = Start-Process -FilePath cmd.exe -ArgumentList $Arguments -Wait -PassThru -WindowStyle Hidden
4963
- uses: ilammy/msvc-dev-cmd@v1
5064
name: Setup msvc environment
5165
with:
66+
toolset: "14.1"
5267
arch: ${{ steps.setup.outputs.msvc_arch }}
5368

5469
- id: version
@@ -156,7 +171,7 @@ jobs:
156171
- name: CMake (installer_lib)
157172
working-directory: tmp/installer_lib
158173
run: |
159-
cmake ../../installer_lib -G "Visual Studio 17" -A ${{ steps.setup.outputs.platform }} -DBOOST_ROOT=${{ steps.paths.outputs.static_boost_root }} -DBOOST_LIBRARYDIR=${{ steps.paths.outputs.static_boost_librarydir }}
174+
cmake ../../installer_lib -T v141 -G "Visual Studio 17" -A ${{ steps.setup.outputs.platform }} -DBOOST_ROOT=${{ steps.paths.outputs.static_boost_root }} -DBOOST_LIBRARYDIR=${{ steps.paths.outputs.static_boost_librarydir }}
160175
161176
- name: Build installer_lib
162177
working-directory: tmp/installer_lib
@@ -166,7 +181,7 @@ jobs:
166181
- name: CMake (NSCP)
167182
working-directory: tmp/nscp
168183
run: |
169-
cmake ../.. -G "Visual Studio 17" -A ${{ steps.setup.outputs.platform }}
184+
cmake ../.. -T v141 -G "Visual Studio 17" -A ${{ steps.setup.outputs.platform }}
170185
171186
- name: Build nsclient
172187
working-directory: tmp/nscp

‎build/cmake/wix.cmake‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,11 @@ set(PF86 "PROGRAMFILES(X86)")
2626
"${WIX_ROOT_DIR}"
2727
"$ENV{WIX}"
2828
"$ENV{WIX_ROOT_DIR}"
29-
"$ENV{${PF86}}/WiX Toolset v3.11"
30-
"$ENV{ProgramFiles}/WiX Toolset v3.11"
31-
"$ENV{ProgramFiles}/WiX Toolset v3.10"
32-
"$ENV{ProgramFiles}/WiX Toolset v3.9"
33-
"$ENV{ProgramFiles}/WiX Toolset v3.8"
34-
"$ENV{ProgramFiles}/WiX Toolset v3.7"
35-
"$ENV{ProgramFiles}/Windows Installer XML v3.8"
36-
"$ENV{ProgramFiles}/Windows Installer XML v3.7"
37-
"$ENV{ProgramFiles}/Windows Installer XML v3.5"
38-
"$ENV{ProgramFiles}/Windows Installer XML v3"
39-
"$ENV{ProgramFiles}/Windows Installer XML"
29+
"$ENV{${PF86}}/WiX Toolset v3.14"
30+
"$ENV{${PF86}}/WiX Toolset v3.11"
4031
)
4132

42-
33+
MESSAGE(STATUS "--> ${WIX_POSSIBLE_ROOT_DIRS}")
4334
#
4435
# select exactly ONE WIX base directory/tree
4536
# to avoid mixing different version headers and libs
@@ -50,7 +41,7 @@ set(PF86 "PROGRAMFILES(X86)")
5041
bin/light.exe
5142
bin/heat.exe
5243
PATHS ${WIX_POSSIBLE_ROOT_DIRS})
53-
DBG_MSG("WIX_ROOT_DIR=${WIX_ROOT_DIR}")
44+
DBG_MSG("WIX_ROOT_DIR=${WIX_ROOT_DIR}")
5445

5546
IF(EXISTS "${WIX_ROOT_DIR}/bin/pyro.exe")
5647
SET(WIX_VERSION 3)
@@ -84,7 +75,7 @@ set(PF86 "PROGRAMFILES(X86)")
8475
SET(WIX_CANDLE ${WIX_ROOT_DIR}/bin/candle.exe)
8576
SET(WIX_LIGHT ${WIX_ROOT_DIR}/bin/light.exe)
8677
SET(WIX_HEAT ${WIX_ROOT_DIR}/bin/heat.exe)
87-
# MESSAGE(STATUS "Windows Installer XML found.")
78+
# MESSAGE(STATUS "Windows Installer XML found.")
8879
ENDIF(NOT WIX_FOUND)
8980

9081
MARK_AS_ADVANCED(

‎docs/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ IF(MKDOCS_FOUND)
1515
WORKING_DIRECTORY ${BUILD_ROOT_FOLDER}
1616
DEPENDS nscp ${ALL_MODULE_NAMES} copy_files
1717
COMMENT "Generate RST documentation source")
18-
ADD_DEPENDENCIES(generate_doc_sources nscp ${ALL_MODULE_NAMES})
18+
ADD_DEPENDENCIES(generate_doc_sources nscp ${ALL_MODULE_NAMES} copy_files copy_scripts copy_resources)
1919
SET_TARGET_PROPERTIES(generate_doc_sources PROPERTIES FOLDER "docs")
2020

2121

‎version.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=0.6.0
2-
build=1
3-
date=2023-07-30
1+
version=0.6.1
2+
build=0
3+
date=2024-11-23

0 commit comments

Comments
 (0)