Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork7.9k
Simplify FreeType Windows build.#11248
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Uh oh!
There was an error while loading.Please reload this page.
Conversation
80a6a54 toc75a030CompareThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I suppose the Appveyor failure is unrelated to these changes, but please double-check.
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.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
I would not use separate args if the dirs are explicit strings, i.e. just writePath(src_path, "objs/.libs/libfreetype.lib") but that's a matter of taste.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Actually I prefer that style too, not sure why I didn't use it here... fixed.
37cd16b to8f5a49eCompareThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others.Learn more.
Looks like AppVeyor isn't happy aboutvc20xxhttps://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? |
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