Simplify FreeType Windows build.

anntzer · anntzer · commit 37cd16bf6da4 · 2018-05-15T10:30:02.000-07:00
- Make FREETYPE_BUILD_CMD a raw string to avoid doubling all
  backslashes.
- Line-wrap two overly long lines in FREETYPE_BUILD_CMD.
- Move the `rd /S /Q %FREETYPE%\objs` to python (`shutil.rmtree`).
- Move the `copy %FREETYPE\objs\...` to python (`shutil.copy2`).
- Get rid of the Py27 part (`if errorlevel 1 ...`).
- Run the FREETYPE_BUILD_CMD script with `src_path` as cwd, which avoids
  the need to define the %FREETYPE% environment variable.
diff --git a/setupext.py b/setupext.py
@@ -1029,6 +1029,8 @@ def add_flags(self, ext):
             ext.define_macros.append(('FREETYPE_BUILD_TYPE', 'system'))
 
     def do_custom_build(self):
+        from pathlib import Path
+
         # We're using a system freetype
         if not options.get('local_freetype'):
             return
@@ -1122,21 +1124,13 @@ def do_custom_build(self):
                 [cflags + 'make'], shell=True, cwd=src_path)
         else:
             # compilation on windows
-            FREETYPE_BUILD_CMD = """\
-call "%ProgramFiles%\\Microsoft SDKs\\Windows\\v7.0\\Bin\\SetEnv.Cmd" /Release /{xXX} /xp
+            FREETYPE_BUILD_CMD = r"""
+call "%ProgramFiles%\Microsoft SDKs\Windows\v7.0\Bin\SetEnv.Cmd" ^
+    /Release /{xXX} /xp
 call "{vcvarsall}" {xXX}
-set MSBUILD=C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\MSBuild.exe
-rd /S /Q %FREETYPE%\\objs
-%MSBUILD% %FREETYPE%\\builds\\windows\\{vc20xx}\\freetype.sln /t:Clean;Build /p:Configuration="{config}";Platform={WinXX}
-echo Build completed, moving result"
-:: move to the "normal" path for the unix builds...
-mkdir %FREETYPE%\\objs\\.libs
-:: REMINDER: fix when changing the version
-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\\win32\\{vc20xx}\\freetype261.lib %FREETYPE%\\objs\\.libs\\libfreetype.lib
-)
+set MSBUILD=C:\Windows\Microsoft.NET\Framework\v4.0.30319\MSBuild.exe
+%MSBUILD% "builds\windows\{vc20xx}\freetype.sln" ^
+    /t:Clean;Build /p:Configuration="{config}";Platform={WinXX}
 """
             from setup_external_compile import fixproj, prepare_build_cmd, VS2010, X64, tar_extract
             # Note: freetype has no build profile for 2014, so we don't bother...
@@ -1148,13 +1142,20 @@ def do_custom_build(self):
                 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:
+            cmdfile = "build_freetype.cmd"
+            with open(os.path.join("build", cmdfile), 'w') as cmd:
                 cmd.write(prepare_build_cmd(FREETYPE_BUILD_CMD, vc20xx=vc, WinXX=WinXX,
                                             config='Release' if VS2010 else 'LIB Release'))
 
-            os.environ['FREETYPE'] = src_path
-            subprocess.check_call([cmdfile], shell=True)
+            shutil.rmtree(str(Path(src_path, "objs")), ignore_errors=True)
+            subprocess.check_call([cmdfile], shell=True, cwd=src_path)
+            # Move to the corresponding Unix build path.
+            Path(src_path, "objs/.libs").mkdir()
+            # Be robust against change of FreeType version.
+            lib_path, = (Path(src_path, "objs", vc20xx, xXX)
+                         .glob("freetype*.lib"))
+            shutil.copy2(str(lib_path),
+                         str(Path(src_path, "objs/.libs/libfreetype.lib")))
 
 
 class FT2Font(SetupPackage):
