Skip to content

Commit ef8db5d

Browse files
peterjc123peterjc123
authored
Cleanup MSVC environment activation scripts for conda builds (#447)
1 parent a35cbd3 commit ef8db5d

File tree

3 files changed

+24
-55
lines changed

3 files changed

+24
-55
lines changed

‎conda/vs2017/install_activate.bat

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,23 @@ set YEAR=2017
22
set VER=15
33

44
mkdir "%PREFIX%\etc\conda\activate.d"
5-
COPY "%RECIPE_DIR%\activate.bat" "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
5+
copy "%RECIPE_DIR%\activate.bat" "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
66

7-
IF "%cross_compiler_target_platform%" == "win-64" (
7+
if "%cross_compiler_target_platform%" == "win-64" (
88
set "target_platform=amd64"
9-
echo SET "CMAKE_GENERATOR=Visual Studio %VER% %YEAR% Win64" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
9+
echo set "CMAKE_GENERATOR=Visual Studio %VER% %YEAR% Win64" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
1010
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
11-
IF "%VSDEVCMD_ARGS%" == "" (
12-
echo CALL "VC\Auxiliary\Build\vcvarsall.bat" x64 >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
13-
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
14-
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
15-
) ELSE (
16-
echo CALL "VC\Auxiliary\Build\vcvarsall.bat" x64 %VSDEVCMD_ARGS% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
17-
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
18-
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
11+
if "%VSDEVCMD_ARGS%" == "" (
12+
echo call "VC\Auxiliary\Build\vcvarsall.bat" x64 >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
13+
) else (
14+
echo call "VC\Auxiliary\Build\vcvarsall.bat" x64 %VSDEVCMD_ARGS% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
1915
)
2016
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
21-
) else (
17+
) else (
2218
set "target_platform=x86"
23-
echo SET "CMAKE_GENERATOR=Visual Studio %VER% %YEAR%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
19+
echo set "CMAKE_GENERATOR=Visual Studio %VER% %YEAR%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
2420
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
25-
echo CALL "VC\Auxiliary\Build\vcvars32.bat" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
26-
echo popd
27-
)
21+
echo call "VC\Auxiliary\Build\vcvars32.bat" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
22+
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
23+
)
2824

‎conda/vs2017/meta.yaml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -19,27 +19,6 @@ outputs:
1919
# VS 2017 is binary-compatible with VS 2015/vc14. Tools are "v141".
2020
strong:
2121
- vc{{ vcfeature }}
22-
run_exports:
23-
- vc {{ vcver }}
2422
about:
2523
summary: Activation and version verification of MSVC {{ vcver }} (VS {{ vsyear }}) compiler
2624
license: BSD 3-clause
27-
- name: vs{{ vsyear }}_runtime
28-
script: install_runtime.bat
29-
- name: vc
30-
version: {{ vcver }}
31-
track_features:
32-
- vc{{ vcfeature }}
33-
requirements:
34-
run:
35-
- {{ pin_subpackage('vs' ~ vsyear ~ '_runtime') }}
36-
about:
37-
home: https://github.com/conda/conda/wiki/VC-features
38-
license: Modified BSD License (3-clause)
39-
license_family: BSD
40-
summary: A meta-package to track VC features.
41-
description: |
42-
This metapackage is used to activate vc features without
43-
depending on Python.
44-
doc_url: https://github.com/conda/conda/wiki/VC-features
45-
dev_url: https://github.com/conda/conda/wiki/VC-features

‎conda/vs2019/install_activate.bat

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,29 +2,23 @@ set YEAR=2019
22
set VER=16
33

44
mkdir "%PREFIX%\etc\conda\activate.d"
5-
COPY "%RECIPE_DIR%\activate.bat" "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
5+
copy "%RECIPE_DIR%\activate.bat" "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
66

7-
IF "%cross_compiler_target_platform%" == "win-64" (
7+
if "%cross_compiler_target_platform%" == "win-64" (
88
set "target_platform=amd64"
9-
echo SET "CMAKE_GENERATOR=Visual Studio %VER% %YEAR% Win64" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
9+
echo set "CMAKE_GENERATOR=Visual Studio %VER% %YEAR% Win64" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
1010
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
11-
IF "%VSDEVCMD_ARGS%" == "" (
12-
echo CALL "VC\Auxiliary\Build\vcvarsall.bat" x64 >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
13-
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
14-
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
15-
echo CALL "VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
16-
) ELSE (
17-
echo CALL "VC\Auxiliary\Build\vcvarsall.bat" x64 %VSDEVCMD_ARGS% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
18-
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
19-
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
20-
echo CALL "VC\Auxiliary\Build\vcvarsall.bat" x86_amd64 %VSDEVCMD_ARGS% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
11+
if "%VSDEVCMD_ARGS%" == "" (
12+
echo call "VC\Auxiliary\Build\vcvarsall.bat" x64 >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
13+
) else (
14+
echo call "VC\Auxiliary\Build\vcvarsall.bat" x64 %VSDEVCMD_ARGS% >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
2115
)
2216
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
23-
) else (
17+
) else (
2418
set "target_platform=x86"
25-
echo SET "CMAKE_GENERATOR=Visual Studio %VER% %YEAR%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
19+
echo set "CMAKE_GENERATOR=Visual Studio %VER% %YEAR%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
2620
echo pushd "%%VSINSTALLDIR%%" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
27-
echo CALL "VC\Auxiliary\Build\vcvars32.bat" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
28-
echo popd
29-
)
21+
echo call "VC\Auxiliary\Build\vcvars32.bat" >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
22+
echo popd >> "%PREFIX%\etc\conda\activate.d\vs%YEAR%_compiler_vars.bat"
23+
)
3024

0 commit comments

Comments
 (0)