Skip to content

Try deactivation again #107

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

Draft
h-vetinari wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Try deactivation again #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c1232c
Reapply "Merge pull request #95 from h-vetinari/reactivate"
h-vetinari Aug 31, 2025
9a2f5af
add downstream tests to guard against previously seen breakage from d…
h-vetinari Jan 2, 2026
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
22 changes: 22 additions & 0 deletions recipe/activate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
@@echo off
setlocal enabledelayedexpansion

:: save existing variables for deactivation script
for %%X in (
CC CXX CMAKE_ARGS CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET
CMAKE_PREFIX_PATH CONDA_BUILD_CROSS_COMPILATION DISTUTILS_USE_SDK INCLUDE
LIB MSSdk MSYS2_ARG_CONV_EXCL MSYS2_ENV_CONV_EXCL PY_VCRUNTIME_REDIST
VCVARSBAT VS_MAJOR VS_VERSION VS_YEAR VSINSTALLDIR WindowsSDKVer
) do (
if defined %%X (
set "_CONDA_BACKUP_%%X=!%%X!"
)
)

@@echo on

:: Set env vars that tell distutils to use the compiler that we put on path
Expand Down Expand Up @@ -186,6 +201,13 @@ IF NOT "@{target_platform}" == "@{host_platform}" (
set "CONDA_BUILD_CROSS_COMPILATION=0"
)

:: unset auxiliary variables
set "CMAKE_GEN="
set "CMAKE_PLAT="
set "LATEST_VS="
set "NEWER_VS_WITH_OLDER_VC="
set "USE_NEW_CMAKE_GEN_SYNTAX="

:GetWin10SdkDir
call :GetWin10SdkDirHelper HKLM\SOFTWARE\Wow6432Node > nul 2>&1
if errorlevel 1 call :GetWin10SdkDirHelper HKCU\SOFTWARE\Wow6432Node > nul 2>&1
Expand Down
17 changes: 17 additions & 0 deletions recipe/deactivate.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
@@echo off
setlocal enabledelayedexpansion

:: restore variables
for %%X in (
CC CXX CMAKE_ARGS CMAKE_GENERATOR CMAKE_GENERATOR_PLATFORM CMAKE_GENERATOR_TOOLSET
CMAKE_PREFIX_PATH CONDA_BUILD_CROSS_COMPILATION DISTUTILS_USE_SDK INCLUDE
LIB MSSdk MSYS2_ARG_CONV_EXCL MSYS2_ENV_CONV_EXCL PY_VCRUNTIME_REDIST
VCVARSBAT VS_MAJOR VS_VERSION VS_YEAR VSINSTALLDIR WindowsSDKVer
) do (
if defined _CONDA_BACKUP_%%X (
set "%%X=!_CONDA_BACKUP_%%X!"
set "_CONDA_BACKUP_%%X="
) else (
set "%%X="
)
)
5 changes: 5 additions & 0 deletions recipe/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,11 @@ outputs:
- echo "%CMAKE_GENERATOR%"
- echo "%CMAKE_GENERATOR_PLATFORM%"
- echo "%CMAKE_GENERATOR_TOOLSET%"
# compare https://github.com/conda-forge/vc-feedstock/issues/94
downstreams: # [win]
- clang_win-64 # [win]
- clangxx_win-64 # [win]
- clang-cl_win-64 # [win]
about:
summary: >-
Activation and version verification of MSVC {{ vcver }}
Expand Down
6 changes: 6 additions & 0 deletions recipe/vc_repack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,6 +429,12 @@ def main():
) as w:
for line in r:
w.write(subs(line, args))
targetdir = os.path.join(env.prefix, "etc", "conda", "deactivate.d")
os.makedirs(targetdir)
shutil.copyfile(
os.path.join(env.recipe_dir, "deactivate.bat"),
os.path.join(targetdir, f"vs{args.activate_year}_compiler_vars.bat"),
)
targetdir = os.path.join(env.prefix, "etc", "conda-build", "dsolists.d")
os.makedirs(targetdir)
# Implement CEP-28
Expand Down
Loading