BLD: Cleanup env vars after basedir change

jankatins · jankatins · commit aa4d19cc87fc · 2015-12-03T17:12:18.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -56,18 +56,11 @@ install:
   - activate test-environment
   # This is needed for the installer to find the dlls...
   - set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib
-  - dir %LIBRARY_LIB%
   - cmd: 'mkdir lib || cmd /c "exit /b 0"'
   - copy %LIBRARY_LIB%\zlibstatic.lib lib\z.lib 
   - copy %LIBRARY_LIB%\libpng_static.lib lib\png.lib
-  - set LIB=%LIBRARY_LIB%;.\lib
-  - set LIBPATH=%LIBRARY_LIB%;.\lib
-  - set LIB_INC=%CONDA_DEFAULT_ENV%\Library\include
-  - set INCLUDE=%LIB_INC%;%LIB_INC%\freetype2;WhateverInclude
-  - set CPLUS_INCLUDE_PATH=%LIB_INC%\freetype2;%LIB_INC%;WhateverCPLUS
-  - dir %LIB_INC%
-  - dir %LIB_INC%\freetype2
-    # Show the installed packages + versions
+  - set MPLBASEDIRLIST=%CONDA_DEFAULT_ENV%\Library\;.
+  # Show the installed packages + versions
   - conda list
 
 test_script:
@@ -87,12 +80,6 @@ after_test:
   # is set dynamically. This unfortunately mean that conda build --output
   # doesn't really work.
   - cmd: '%CMD_IN_ENV% conda config --get channels'
-  # These vars get included in the conda env, so cleanup out current conda env
-  - set LIB=
-  - set LIBPATH=
-  - set INCLUDE=
-  - set LIB_INC=
-  - set
   # we can't build conda packages on 27 due to missing functools32, which is a recent 
   # additional dependency for matplotlib
   - cmd: if [%CONDA_PY%] NEQ [27] %CMD_IN_ENV% conda build .\ci\conda_recipe
diff --git a/ci/conda_recipe/bld.bat b/ci/conda_recipe/bld.bat
@@ -4,9 +4,7 @@ if errorlevel 1 exit 1
 copy %LIBRARY_LIB%\libpng_static.lib lib\png.lib
 if errorlevel 1 exit 1
 
-set LIB=%LIB%;.\lib
-set LIBPATH=%LIBPATH%;.\lib
-set INCLUDE=%LIBRARY_INC%;%LIBRARY_INC%\freetype2;%INCLUDE%
+set MPLBASEDIRLIST=%LIBRARY_PREFIX%;.
 
 :: debug...
 set
