Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add VS2022 17.6 #64

Merged
merged 6 commits into from
Jun 23, 2023
Merged

Add VS2022 17.6 #64

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
adab9a3
build for VS2022 17.6
h-vetinari Jun 16, 2023
a9d270f
MNT: Re-rendered with conda-build 3.25.0, conda-smithy 3.23.1, and co…
h-vetinari Jun 16, 2023
f9d03b6
rename newly-appearing intermediate `.dll_amd64` artefacts to `.dll`
h-vetinari Jun 19, 2023
20c9f08
also handle `.dll_arm64` extension
h-vetinari Jun 19, 2023
f54ce13
Add win-arm64 too
isuruf Jun 21, 2023
f5adba0
manually rerender
h-vetinari Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .azure-pipelines/azure-pipelines-linux.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .azure-pipelines/azure-pipelines-win.yml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 36 additions & 0 deletions .ci_support/win_64_cl_version19.36.32532cross_t_h23db042d00.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cl_version:
- 19.36.32532
cross_target_platform:
- win-64
runtime_version:
- 14.36.32532
sha256:
- 917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888
target_platform:
- win-64
update_version:
- '6'
uuid:
- eaab1f82-787d-4fd7-8c73-f782341a0c63
vc:
- '14'
vcver:
- '14.3'
vsver:
- '17'
vsyear:
- '2022'
zip_keys:
- - vcver
- vsyear
- vsver
- runtime_version
- update_version
- cl_version
- uuid
- sha256
- cross_target_platform
38 changes: 38 additions & 0 deletions .ci_support/win_arm64_cl_version19.36.32532cros_h0267430ae8.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
channel_sources:
- conda-forge
channel_targets:
- conda-forge main
cl_version:
- 19.36.32532
cross_target_platform:
- win-64
docker_image:
- quay.io/condaforge/linux-anvil-cos7-x86_64
runtime_version:
- 14.36.32532
sha256:
- 917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888
target_platform:
- win-arm64
update_version:
- '6'
uuid:
- eaab1f82-787d-4fd7-8c73-f782341a0c63
vc:
- '14'
vcver:
- '14.3'
vsver:
- '17'
vsyear:
- '2022'
zip_keys:
- - vcver
- vsyear
- vsver
- runtime_version
- update_version
- cl_version
- uuid
- sha256
- cross_target_platform
22 changes: 18 additions & 4 deletions README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions recipe/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,27 +2,31 @@ vcver:
- 14.3
- 14.3
- 14.3
- 14.3
- 14.2
- 14.2
- 14.1
vsyear:
- 2022
- 2022
- 2022
- 2022
- 2019
- 2019
- 2017
vsver:
- 17
- 17
- 17
- 17
- 16
- 16
- 15
runtime_version:
# the minor version here can show up in the toolset directory path
# used by vcvars.bat (see #36), hence we need multiple builds even
# though they're from the same vsver-line.
- 14.36.32532
- 14.34.31938
- 14.34.31931
- 14.32.31332
Expand All @@ -33,6 +37,7 @@ runtime_version:
# reported in the VS help->about UI. It is perhaps a more readily
# referenceable number.
update_version:
- 6
- 5
- 4
- 2
Expand All @@ -41,6 +46,7 @@ update_version:
- 9
# This is the version number reported by cl.exe
cl_version:
- 19.36.32532
- 19.35.32217
- 19.34.31933
- 19.33.31629
Expand All @@ -51,20 +57,23 @@ cl_version:
# curl -ILSs https://aka.ms/vs/17/release/vc_redist.x64.exe | grep "Location:"
# curl -ILSs https://aka.ms/vs/17/release/vc_redist.arm64.exe | grep "Location:"
uuid:
- eaab1f82-787d-4fd7-8c73-f782341a0c63
- b2519016-4a13-4120-936c-cae003d567c4
- bcb0cef1-f8cb-4311-8a5c-650a5b694eab
- 7331f052-6c2d-4890-8041-8058fee5fb0f
- b929b7fe-5c89-4553-9abe-6324631dcc3a
- 89a3b9df-4a09-492e-8474-8f92c115c51d
- 4100b84d-1b4d-487d-9f89-1354a7138c8f
sha256:
- 917C37D816488545B70AFFD77D6E486E4DD27E2ECE63F6BBAAF486B178B2B888
- EC530B52C87AF9DBECBCCE83E5945FD0CAA57969A858D7497E4D5CBBD6F53F60
- 2257B3FBE3C7559DE8B31170155A433FAF5B83829E67C589D5674FF086B868B9
- CE6593A1520591E7DEA2B93FD03116E3FC3B3821A0525322B0A430FAA6B3C0B4
- 296F96CD102250636BCD23AB6E6CF70935337B1BBB3507FE8521D8D9CFAA932F
- B1A32C71A6B7D5978904FB223763263EA5A7EB23B2C44A0D60E90D234AD99178
- 5B0CBB977F2F5253B1EBE5C9D30EDBDA35DBD68FB70DE7AF5FAAC6423DB575B5
cross_target_platform:
- win-64
- win-arm64
- win-64
- win-64
Expand Down
9 changes: 8 additions & 1 deletion recipe/vc_repack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,11 +247,18 @@ def decode_manifest(directory):
def fix_filename_and_copy(source, dest):
cwd = os.getcwd()
os.chdir(source)
for fname in glob.glob("*.dll"):
# as of VS 17.6, the artefact contains intermediate DLL extensions,
# which get renamed correctly upon installation; do it manually
candidates = glob.glob("*.dll") + glob.glob("*.dll_amd64")
h-vetinari marked this conversation as resolved.
Show resolved Hide resolved
for fname in candidates:
print(f"Found DLL: {fname}")
if fname.startswith("api_"):
new_fname = fname.replace("_", "-")
os.rename(fname, new_fname)
elif fname.endswith(".dll_amd64"):
# 10 = len(".dll_amd64")
new_fname = fname[:-10] + ".dll"
os.rename(fname, new_fname)
else:
new_fname = fname
shutil.copyfile(new_fname, os.path.join(dest, new_fname))
Expand Down