Thanks to visit codestin.com
Credit goes to github.com

Skip to content

WIN: Rewrite local freetype build script #9354

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

Closed
wants to merge 3 commits into from
Closed

WIN: Rewrite local freetype build script #9354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a4c56f2
BLD: Rewrite local freetype build script
Kojoley Oct 10, 2017
ae29b0d
BLD: Removed `build_alllocal.cmd` as not needed
Kojoley Oct 12, 2017
ea1c43a
BLD: Detect /MT flag and build corresponding freetype
Kojoley Oct 17, 2017
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
14 changes: 0 additions & 14 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,17 +99,6 @@ install:
curl -sL https://github.com/python/cpython/pull/1224.patch |
patch -fsup 1 -d %CONDA_PREFIX% ) || ( set errorlevel= )

# Let the install prefer the static builds of the libs
- set LIBRARY_LIB=%CONDA_PREFIX%\Library\lib
- mkdir lib || cmd /c "exit /b 0"
- copy /y %LIBRARY_LIB%\zlibstatic.lib lib\z.lib
- copy /y %LIBRARY_LIB%\libpng_static.lib lib\png.lib
# These z.lib / png.lib are not static versions but files which end up as
# dependencies to the dll file. This is fine for the conda build, but not here
# and for the wheels
- del %LIBRARY_LIB%\png.lib
- del %LIBRARY_LIB%\z.lib
- set MPLBASEDIRLIST=%CONDA_PREFIX%\Library\;.
# enables the local freetype build
- copy ci\travis\setup.cfg .
# Show the installed packages + versions
Expand Down Expand Up @@ -150,9 +139,6 @@ after_test:
# And now the conda build after a cleanup...
# cleanup build files so that they don't pollute the conda build but keep the wheel in dist...
- git clean -xdfq -e dist/
# cleanup the environment so that the test-environment does not leak into the conda build...
- set MPLBASEDIRLIST=
- set LIBRARY_LIB=
- deactivate
- path
- where python
Expand Down
10 changes: 0 additions & 10 deletions INSTALL.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,16 +332,6 @@ without fiddling with environment variables::
# for Python 2.7
conda install -c conda-forge backports.functools_lru_cache

# copy the libs which have "wrong" names
set LIBRARY_LIB=%CONDA_DEFAULT_ENV%\Library\lib
mkdir lib || cmd /c "exit /b 0"
copy %LIBRARY_LIB%\zlibstatic.lib lib\z.lib
copy %LIBRARY_LIB%\libpng_static.lib lib\png.lib

# Make the header files and the rest of the static libs available during the build
# CONDA_DEFAULT_ENV is a env variable which is set to the currently active environment path
set MPLBASEDIRLIST=%CONDA_DEFAULT_ENV%\Library\;.

# build the wheel
python setup.py bdist_wheel

Expand Down
36 changes: 0 additions & 36 deletions build_alllocal.cmd
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions ci/conda_recipe/bld.bat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,9 @@
set LIBPATH=%LIBRARY_LIB%;
set INCLUDE=%INCLUDE%;%PREFIX%\Library\include\freetype2

ECHO [directories] > setup.cfg
ECHO basedirlist = %LIBRARY_PREFIX% >> setup.cfg
ECHO [packages] >> setup.cfg
ECHO tests = False >> setup.cfg
ECHO sample_data = False >> setup.cfg
ECHO toolkits_tests = False >> setup.cfg

@rem workaround for https://github.com/matplotlib/matplotlib/issues/6460
@rem see also https://github.com/conda-forge/libpng-feedstock/pull/4
copy /y %LIBRARY_LIB%\libpng16.lib %LIBRARY_LIB%\png.lib

%PYTHON% setup.py install --single-version-externally-managed --record=record.txt
if errorlevel 1 exit 1
6 changes: 3 additions & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,11 +136,11 @@ def run(self):


class BuildExtraLibraries(BuildExtCommand):
def run(self):
def build_extensions(self):
for package in good_packages:
package.do_custom_build()
package.do_custom_build(self)

return BuildExtCommand.run(self)
return BuildExtCommand.build_extensions(self)


cmdclass = versioneer.get_cmdclass()
Expand Down
Loading