Skip to content

Use a specific version of Freetype for testing #5306

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
Nov 5, 2015
Merged

Use a specific version of Freetype for testing #5306

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
88a664e
Use a specific version of Freetype for testing
mdboom Oct 23, 2015
733cda9
Python 2 fix
mdboom Oct 23, 2015
56c686e
Fix setup.cfg in .travis.yml
mdboom Oct 23, 2015
924950e
Generate setup.cfg in a different way
mdboom Oct 23, 2015
bab2d6a
Use -fPIC
mdboom Oct 23, 2015
7935fa1
Don't use special freetype in docs build
mdboom Oct 23, 2015
ca61716
Verify hash of freetype tarball
mdboom Oct 24, 2015
662ae7d
Change error to warning
mdboom Oct 26, 2015
d102d39
Fix memory management revealed by using static freetype
mdboom Oct 27, 2015
c2af9c6
Amend, rather than override, CFLAGS
mdboom Oct 27, 2015
5c6173a
freetype -> FreeType
mdboom Oct 28, 2015
6a9f3c4
Fix tense
mdboom Oct 28, 2015
85a6e78
Fix name of config parameter in docs
mdboom Oct 28, 2015
660adc6
Make setup.py develop work
mdboom Oct 28, 2015
13be4e7
Don't use shell to call tar
mdboom Oct 28, 2015
420cd8e
Use freetype 2.6.1
mdboom Oct 29, 2015
31cb9b3
Fix capitalization
mdboom Oct 29, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Amend, rather than override, CFLAGS
  • Loading branch information
@mdboom
mdboom committed Nov 5, 2015
commit c2af9c68a6676f9d84946f56e322ba760b4dd83e
7 changes: 5 additions & 2 deletions setupext.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -996,13 +996,16 @@ def do_custom_build(self):
raise IOError("{0} does not match expected hash.".format(tarball))

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could we do a hash check here to make sure that we get an uncorrupted file?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea.

print("Building {0}".format(tarball))
cflags = 'CFLAGS="{0} -fPIC" '.format(os.environ.get('CFLAGS', ''))

subprocess.check_call(
['tar zxf {0}'.format(tarball)], shell=True, cwd='build')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why you need to bother with shell=True here.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without shell=True you have to give an absolute path to tar which requires reimplementing which in Python. There's enough one-off code in setupext.py as it is, and since this isn't running code from outside, the security implications are minor.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think that's true. subprocess.check_call(['tar', 'zxf', tarball], cwd='build') works just fine for me. Maybe it's because you're passing a string in a list instead of a plain string, or a list of strings?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. It seems the "list of strings" and "shell=True" are mutually exclusive. I'll update this to not use shell.

subprocess.check_call(
['CFLAGS=-fPIC ./configure --without-zlib --without-bzip2 --without-png'],
[cflags +
'./configure --without-zlib --without-bzip2 --without-png'],
shell=True, cwd=src_path)
subprocess.check_call(
['CFLAGS=-fPIC make'], shell=True, cwd=src_path)
[cflags + 'make'], shell=True, cwd=src_path)


class FT2Font(SetupPackage):
Expand Down