Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Build system: Drop dependency on the sipconfig module as it is slated for removal in sip v5

Browse Source
This commit is contained in:
Kovid Goyal 2014-08-03 08:24:14 +05:30
parent 1fd244a96d
commit 82659bd7ae
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
setup/build_environment.py
View File

@ -6,11 +6,9 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import os, subprocess, glob, re import os, subprocess, glob, re, sys, sysconfig
from distutils.spawn import find_executable from distutils.spawn import find_executable
import sipconfig
from setup import isosx, iswindows, is64bit, islinux from setup import isosx, iswindows, is64bit, islinux
is64bit is64bit
@ -92,19 +90,19 @@ pyqt = {x:readvar(y) for x, y in (
('inc', 'QT_INSTALL_HEADERS'), ('lib', 'QT_INSTALL_LIBS') ('inc', 'QT_INSTALL_HEADERS'), ('lib', 'QT_INSTALL_LIBS')
)} )}
qt = {x:readvar(y) for x, y in {'libs':'QT_INSTALL_LIBS', 'plugins':'QT_INSTALL_PLUGINS'}.iteritems()} qt = {x:readvar(y) for x, y in {'libs':'QT_INSTALL_LIBS', 'plugins':'QT_INSTALL_PLUGINS'}.iteritems()}
c = sipconfig.Configuration()
pyqt['sip_bin'] = c.sip_bin + ('.exe' if iswindows and not c.sip_bin.endswith('.exe') else '') pyqt['sip_bin'] = os.environ.get('SIP_BIN', 'sip')
from PyQt5.QtCore import PYQT_CONFIGURATION from PyQt5.QtCore import PYQT_CONFIGURATION
pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags'] pyqt['sip_flags'] = PYQT_CONFIGURATION['sip_flags']
def get_sip_dir(q): def get_sip_dir(q):
for x in ('', 'PyQt5', 'sip/PyQt5'): for x in ('', 'Py2-PyQt5', 'PyQt5', 'sip/PyQt5'):
base = os.path.join(q, x) base = os.path.join(q, x)
if os.path.exists(os.path.join(base, 'QtWidgets')): if os.path.exists(os.path.join(base, 'QtWidgets')):
return base return base
return q return q
pyqt['pyqt_sip_dir'] = get_sip_dir(c.default_sip_dir) pyqt['pyqt_sip_dir'] = get_sip_dir(sys.prefix if iswindows else os.path.join(sys.prefix, 'share', 'sip'))
pyqt['sip_inc_dir'] = c.sip_inc_dir pyqt['sip_inc_dir'] = sysconfig.get_path('include')
glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux else '' glib_flags = subprocess.check_output([PKGCONFIG, '--libs', 'glib-2.0']).strip() if islinux else ''
fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux else '' fontconfig_flags = subprocess.check_output([PKGCONFIG, '--libs', 'fontconfig']).strip() if islinux else ''

1
setup/extensions.py
View File

@ -375,6 +375,7 @@ class Build(Command):
PODOFO_LIB_DIR - podofo library files PODOFO_LIB_DIR - podofo library files
QMAKE - Path to qmake QMAKE - Path to qmake
SIP_BIN - Path to the sip binary
VS90COMNTOOLS - Location of Microsoft Visual Studio 9 Tools (windows only) VS90COMNTOOLS - Location of Microsoft Visual Studio 9 Tools (windows only)
''') ''')