Remove VS 2017 Conda scripts, unify casing in conda Batch scripts, mi…

…nor Conda scripts tweaks
pytorch · Jan 6, 2023 · 35ad942 · 35ad942
1 parent 3d208f3
commit 35ad942
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 181 deletions.
diff --git a/conda/vs2017/activate.bat b/conda/vs2017/activate.bat
diff --git a/conda/vs2017/conda_build_config.yaml b/conda/vs2017/conda_build_config.yaml
diff --git a/conda/vs2017/install_activate.bat b/conda/vs2017/install_activate.bat
diff --git a/conda/vs2017/install_runtime.bat b/conda/vs2017/install_runtime.bat
diff --git a/conda/vs2017/meta.yaml b/conda/vs2017/meta.yaml
diff --git a/conda/vs2022/activate.bat b/conda/vs2022/activate.bat
@@ -1,11 +1,11 @@
 :: Set env vars that tell distutils to use the compiler that we put on path
-SET DISTUTILS_USE_SDK=1
-SET MSSdk=1
+set DISTUTILS_USE_SDK=1
+set MSSdk=1
 
-SET "VS_VERSION=17.4"
-SET "VS_MAJOR=17"
-SET "VC_YEAR=2022"
-SET "VC_VERSION_LOWER=17"
+set "VS_VERSION=17.4"
+set "VS_MAJOR=17"
+set "VC_YEAR=2022"
+set "VC_VERSION_LOWER=17"
 set "VC_VERSION_UPPER=18"
 
 set "MSYS2_ARG_CONV_EXCL=/AI;/AL;/OUT;/out"
@@ -15,7 +15,7 @@ set "MSYS2_ENV_CONV_EXCL=CL"
 :: http://stevedower.id.au/blog/building-for-python-3-5-part-two/ for more info
 set "PY_VCRUNTIME_REDIST=%PREFIX%\\bin\\vcruntime143.dll"
 
-if NOT "%VS15INSTALLDIR%" == "" if exist "%VS15INSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" (
+if not "%VS15INSTALLDIR%" == "" if exist "%VS15INSTALLDIR%\VC\Auxiliary\Build\vcvarsall.bat" (
     set "VSINSTALLDIR=%VS15INSTALLDIR%\"
     goto :vswhere
 )
@@ -30,22 +30,22 @@ for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio
 :vswhere
 
 :: Shorten PATH to avoid the `input line too long` error.
-SET MyPath=%PATH%
+set MyPath=%PATH%
 
 setlocal EnableDelayedExpansion
 
-SET TempPath="%MyPath:;=";"%"
-SET var=
-FOR %%a IN (%TempPath%) DO (
-    IF EXIST %%~sa (
-        SET "var=!var!;%%~sa"
+set TempPath="%MyPath:;=";"%"
+set var=
+for %%a in (%TempPath%) do (
+    if exist %%~sa (
+        set "var=!var!;%%~sa"
     )
 )
 
 set "TempPath=!var:~1!"
 endlocal & set "PATH=%TempPath%"
 
 :: Shorten current directory too
-FOR %%A IN (.) DO CD "%%~sA"
+for %%A in (.) do cd "%%~sA"
 
 :: other things added by install_activate.bat at package build time
diff --git a/conda/vs2022/conda_build_config.yaml b/conda/vs2022/conda_build_config.yaml
@@ -5,8 +5,9 @@ c_compiler:
 cxx_compiler:
   - vs2022                     # [win]
 python:
-  - 3.5
-  - 3.6
+  - 3.8
+  - 3.9
+  - 3.10
 # This differs from target_platform in that it determines what subdir the compiler
 #    will target, not what subdir the compiler package will be itself.
 #    For example, we need a win-64 vs2008_win-32 package, so that we compile win-32