debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Properly check versions of Vala/ WebKitGTK+ in wscript

Browse source
This commit is contained in:
Christian Dywan 2011-10-21 02:51:33 +02:00
parent b360541552
commit 85eeb6d8d1
1 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wscript
View file

@ -164,6 +164,15 @@ def configure (conf):
atleast_version=version, mandatory=mandatory) atleast_version=version, mandatory=mandatory)
return conf.env['HAVE_' + var] return conf.env['HAVE_' + var]
def check_version (given_version, major, minor, micro):
if '.' in given_version:
given_major, given_minor, given_micro = given_version.split ('.')
else:
given_major, given_minor, given_micro = given_version
return int(given_major) > major or \
int(given_major) == major and int(given_minor) > minor or \
int(given_major) == major and int(given_minor) == minor and int(given_micro) >= micro
if option_enabled ('unique') and not option_enabled('gtk3'): if option_enabled ('unique') and not option_enabled('gtk3'):
check_pkg ('unique-1.0', '0.9', False) check_pkg ('unique-1.0', '0.9', False)
unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1] unique = ['N/A', 'yes'][conf.env['HAVE_UNIQUE'] == 1]
@ -196,10 +205,7 @@ def configure (conf):
includes='/usr/X11R6/include', mandatory=False) includes='/usr/X11R6/include', mandatory=False)
conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False) conf.check (lib='Xss', libpath='/usr/X11R6/lib', mandatory=False)
if option_enabled ('gtk3'): if option_enabled ('gtk3'):
if option_enabled ('addons') and ( not ( \ if option_enabled ('addons') and not check_version (conf.env['VALAC_VERSION'], 0, 13, 2):
conf.env['VALAC_VERSION'] >= 0 \
and conf.env['VALAC_VERSION'][1] >= 13 \
and conf.env['VALAC_VERSION'][2] >= 2)):
Utils.pprint ('RED', 'Vala 0.13.2 or later is required ' \ Utils.pprint ('RED', 'Vala 0.13.2 or later is required ' \
'to build with GTK+ 3 and extensions.\n' \ 'to build with GTK+ 3 and extensions.\n' \
'Pass --disable-addons to build without extensions.\n' \ 'Pass --disable-addons to build without extensions.\n' \
@ -211,14 +217,15 @@ def configure (conf):
Utils.pprint ('RED', 'GTK+3 was not found.\n' \ Utils.pprint ('RED', 'GTK+3 was not found.\n' \
'Pass --disable-gtk3 to build without GTK+3.') 'Pass --disable-gtk3 to build without GTK+3.')
sys.exit (1) sys.exit (1)
if check_version (conf.check_cfg (modversion='webkitgtk-3.0'), 1, 5, 1):
check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
conf.env.append_value ('VALAFLAGS', '-D HAVE_GTK3') conf.env.append_value ('VALAFLAGS', '-D HAVE_GTK3')
else: else:
check_pkg ('gtk+-2.0', '2.10.0', var='GTK') check_pkg ('gtk+-2.0', '2.10.0', var='GTK')
check_pkg ('webkit-1.0', '1.1.17', args=args) check_pkg ('webkit-1.0', '1.1.17', args=args)
if check_version (conf.check_cfg (modversion='webkit-1.0'), 1, 5, 1):
check_pkg ('javascriptcoregtk-1.0', '1.5.1', args=args)
conf.env['HAVE_GTK3'] = option_enabled ('gtk3') conf.env['HAVE_GTK3'] = option_enabled ('gtk3')
webkit_version = conf.check_cfg (modversion='webkit-1.0').split ('.')
if int(webkit_version[0]) >= 1 and int(webkit_version[1]) >= 5 and int(webkit_version[2]) >= 1:
check_pkg ('javascriptcoregtk-1.0', '1.1.17', args=args)
check_pkg ('libsoup-2.4', '2.27.90') check_pkg ('libsoup-2.4', '2.27.90')
conf.define ('HAVE_LIBSOUP_2_25_2', 1) conf.define ('HAVE_LIBSOUP_2_25_2', 1)
conf.define ('HAVE_LIBSOUP_2_27_90', 1) conf.define ('HAVE_LIBSOUP_2_27_90', 1)