CI/Win: also build a local freetype on py27 64bit

jankatins · jankatins · commit df8feebe6db8 · 2016-01-26T01:18:01.000+01:00
diff --git a/appveyor.yml b/appveyor.yml
@@ -81,8 +81,6 @@ install:
   - set MPLBASEDIRLIST=%CONDA_DEFAULT_ENV%\Library\;.
   # enables the local freetype build
   - copy ci\travis\setup.cfg .
-  # There is no 2.7 64bit freetype build configuration...
-  - cmd: IF %PYTHON_VERSION% == 2.7 (IF %TARGET_ARCH% == x64 (del setup.cfg))
   # Show the installed packages + versions
   - conda list
 
diff --git a/setupext.py b/setupext.py
@@ -1051,18 +1051,18 @@ def do_custom_build(self):
 copy %FREETYPE%\\objs\\{vc20xx}\\{xXX}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib 
 if errorlevel 1 (
   rem This is a py27 version, which has a different location for the lib file :-/
-  copy %FREETYPE%\\objs\\{WinXX}\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
+  copy %FREETYPE%\\objs\\win32\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
 )
 """
             from setup_external_compile import fixproj, prepare_build_cmd, VS2010, X64, tar_extract
-            vc = 'vc2010' if VS2010 else 'vc2008'
+            # Note: freetype has no build profile for 2014, so we don't bother...
             vc = 'vc2010' if VS2010 else 'vc2008'
             WinXX = 'x64' if X64 else 'Win32'
             tar_extract(tarball_path, "build")
-
-            #fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.sln'), WinXX)
-            #fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.{}'.format(
-            #    'vcxproj' if VS2010 else 'vcproj')), WinXX)
+            # This is only false for py2.7, even on py3.5...
+            if not VS2010:
+                fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.sln'), WinXX)
+                fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.vcproj'), WinXX)
 
             cmdfile = os.path.join("build", 'build_freetype.cmd')
             with open(cmdfile, 'w') as cmd:
