E5AF CI/Win: also build a local freetype on py27 64bit · matplotlib/matplotlib@df8feeb · GitHub
[go: up one dir, main page]
Skip to content

Commit df8feeb

Browse files
jankatinsjankatins
committed
CI/Win: also build a local freetype on py27 64bit
1 parent a1678f2 commit df8feeb

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

‎appveyor.yml‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ install:
8181
- set MPLBASEDIRLIST=%CONDA_DEFAULT_ENV%\Library\;.
8282
# enables the local freetype build
8383
- copy ci\travis\setup.cfg .
84-
# There is no 2.7 64bit freetype build configuration...
85-
- cmd: IF %PYTHON_VERSION% == 2.7 (IF %TARGET_ARCH% == x64 (del setup.cfg))
8684
# Show the installed packages + versions
8785
- conda list
8886

‎setupext.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1051,18 +1051,18 @@ def do_custom_build(self):
10511051
copy %FREETYPE%\\objs\\{vc20xx}\\{xXX}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
10521052
if errorlevel 1 (
10531053
rem This is a py27 version, which has a different location for the lib file :-/
1054-
copy %FREETYPE%\\objs\\{WinXX}\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
1054+
copy %FREETYPE%\\objs\\win32\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
10551055
)
10561056
"""
10571057
from setup_external_compile import fixproj, prepare_build_cmd, VS2010, X64, tar_extract
1058-
vc = 'vc2010' if VS2010 else 'vc2008'
1058+
# Note: freetype has no build profile for 2014, so we don't bother...
10591059
vc = 'vc2010' if VS2010 else 'vc2008'
10601060
WinXX = 'x64' if X64 else 'Win32'
10611061
tar_extract(tarball_path, "build")
1062-
1063-
#fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.sln'), WinXX)
1064-
#fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.{}'.format(
1065-
# 'vcxproj' if VS2010 else 'vcproj')), WinXX)
1062+
# This is only false for py2.7, even on py3.5...
1063+
if not VS2010:
1064+
fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.sln'), WinXX)
1065+
fixproj(os.path.join(src_path, 'builds', 'windows', vc, 'freetype.vcproj'), WinXX)
10661066

10671067
cmdfile = os.path.join("build", 'build_freetype.cmd')
10681068
with open(cmdfile, 'w') as cmd:

0 commit comments

Comments
 (0)
0