Simplify FreeType Windows build. #11248
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80a6a54 to
c75a030
Compare
timhoffm
approved these changes
May 15, 2018
setupext.py
Outdated
| .glob("freetype*.lib")) | ||
| shutil.copy2( | ||
| str(lib_path), | ||
| str(Path(src_path, "objs", ".libs", "libfreetype.lib")) |
There was a problem hiding this comment.
I would not use separate args if the dirs are explicit strings, i.e. just write Path(src_path, "objs/.libs/libfreetype.lib") but that's a matter of taste.
There was a problem hiding this comment.
Actually I prefer that style too, not sure why I didn't use it here... fixed.
37cd16b to
8f5a49e
Compare
dstansby
previously requested changes
May 30, 2018
There was a problem hiding this comment.
Looks like AppVeyor isn't happy about vc20xx https://ci.appveyor.com/project/matplotlib/matplotlib/build/1.0.8735/job/ei39icp30nc1xkdn#L731
- 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.
|
Sorry, fixed now. |
|
@dstansby Is this OK now? Can it be merged? |
dstansby
approved these changes
Jul 4, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
attn @timhoffm: breaking #11235 into smaller pieces.
backslashes.
rd /S /Q %FREETYPE%\objsto python (shutil.rmtree).copy %FREETYPE\objs\...to python (shutil.copy2).if errorlevel 1 ...).src_pathas cwd, which avoidsthe need to define the %FREETYPE% environment variable.
PR Summary
PR Checklist