- avoids duplication of check_VS2017.bat

- fixes bad English
rdkit · Nov 8, 2017 · e0721ba · e0721ba
1 parent 90770fa
commit e0721ba
Show file tree

Hide file tree

Showing 26 changed files with 119 additions and 658 deletions.
diff --git a/boost/bld.bat b/boost/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 if "%PY_VER%"=="2.7" ( 
 	set BOOST_TOOLSET=msvc-9.0 

diff --git a/boost/check_VS2017.bat → build_support/check_VS2017.bat b/boost/check_VS2017.bat → build_support/check_VS2017.bat
diff --git a/cheto/bld.bat b/cheto/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 "%PYTHON%" setup.py install
 if errorlevel 1 exit 1
diff --git a/cheto/check_VS2017.bat b/cheto/check_VS2017.bat
diff --git a/eigen/bld.bat b/eigen/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 mkdir build
 cd build

diff --git a/eigen/check_VS2017.bat b/eigen/check_VS2017.bat
diff --git a/gettext/bld.bat b/gettext/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 if %VS_MAJOR%==9 (
   set VS_SLN_DIR=9

diff --git a/gettext/check_VS2017.bat b/gettext/check_VS2017.bat
diff --git a/iconv/bld.bat b/iconv/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 if %VS_MAJOR%==9 (
   set VS_SLN_DIR=9

diff --git a/iconv/check_VS2017.bat b/iconv/check_VS2017.bat
diff --git a/libxml2/bld.bat b/libxml2/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 cd "%SRC_DIR%\win32"
 cscript configure.js compiler=msvc "prefix=%LIBRARY_PREFIX%" ^

diff --git a/libxml2/check_VS2017.bat b/libxml2/check_VS2017.bat
diff --git a/libxslt/bld.bat b/libxslt/bld.bat
@@ -1,6 +1,7 @@
-:: Until Anaconda does not properly detect VS2017 when
+:: Until Anaconda properly detects VS2017 when
 :: it is installed together with VS2015, we need this call
-call "%RECIPE_DIR%\check_VS2017.bat"
+set "CHECK_VS2017=%RECIPE_DIR%\..\build_support\check_VS2017.bat"
+if exist "%CHECK_VS2017%" call "%CHECK_VS2017%"
 
 cd "%SRC_DIR%\win32"
 cscript configure.js compiler=msvc "prefix=%LIBRARY_PREFIX%" ^

diff --git a/libxslt/check_VS2017.bat b/libxslt/check_VS2017.bat