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

Follow up on the target and MDATA changes

Browse source
This commit is contained in:
Christian Dywan 2009-06-06 18:43:40 +02:00
parent 80b47120ef
commit 39434709b7
2 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
icons/wscript_build
View file

@ -17,7 +17,7 @@ def add_image (bld, category, name):
for size in [16, 22, 32, 48]: for size in [16, 22, 32, 48]:
format = str (size) + 'x' + str (size) format = str (size) + 'x' + str (size)
if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK): if os.access (srcdir + '/icons/' + format + '/' + name + '.png', os.F_OK):
bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category,
srcdir + '/icons/' + format + '/' + name + '.png') srcdir + '/icons/' + format + '/' + name + '.png')
elif not rsvg_convert: elif not rsvg_convert:
pass pass
@ -28,7 +28,7 @@ def add_image (bld, category, name):
' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \ ' -o ' + blddir + '/icons/' + format + '/' + name + '.png' + \
' ' + srcdir + '/icons/scalable/' + name + '.svg' ' ' + srcdir + '/icons/scalable/' + name + '.svg'
if not Utils.exec_command (command): if not Utils.exec_command (command):
bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category, bld.install_files ('${MDATADIR}/icons/hicolor/' + format + '/' + category,
blddir + '/icons/' + format + '/' + name + '.png') blddir + '/icons/' + format + '/' + name + '.png')
else: else:
Utils.pprint ('BLUE', "Optimized icons could not be created.") Utils.pprint ('BLUE', "Optimized icons could not be created.")

20
wscript
View file

@ -106,9 +106,7 @@ def configure (conf):
conf.env['program_PATTERN'] = '%s.exe' conf.env['program_PATTERN'] = '%s.exe'
# Use Visual C++ compatible alignment # Use Visual C++ compatible alignment
conf.env.append_value ('CCFLAGS', '-mms-bitfields') conf.env.append_value ('CCFLAGS', '-mms-bitfields')
conf.env['staticlib_LINKFLAGS'] = []
conf.env['implib_PATTERN'] = 'lib%s.dll.a'
conf.env['IMPLIB_ST'] = '-Wl,--out-implib,%s'
Utils.pprint ('BLUE', 'Mingw recognized, assuming chross compile.') Utils.pprint ('BLUE', 'Mingw recognized, assuming chross compile.')
@ -178,7 +176,7 @@ def configure (conf):
if Options.platform == 'win32': if Options.platform == 'win32':
args = '--define-variable=target=win32' args = '--define-variable=target=win32'
check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args) check_pkg ('gtk+-2.0', '2.10.0', var='GTK', args=args)
check_pkg ('webkit-1.0', '1.1.1') check_pkg ('webkit-1.0', '1.1.1', args=args)
check_pkg ('libsoup-2.4', '2.25.2') check_pkg ('libsoup-2.4', '2.25.2')
conf.define ('HAVE_LIBSOUP_2_25_2', 1) conf.define ('HAVE_LIBSOUP_2_25_2', 1)
check_pkg ('libxml-2.0', '2.6') check_pkg ('libxml-2.0', '2.6')
@ -344,7 +342,7 @@ def build (bld):
bld.install_files ('${DATADIR}/dbus-1/services', bld.install_files ('${DATADIR}/dbus-1/services',
'data/com.nokia.' + APPNAME + '.service') 'data/com.nokia.' + APPNAME + '.service')
else: else:
appdir = '${DATADIR}/applications' appdir = '${MDATADIR}/applications'
if bld.env['INTLTOOL']: if bld.env['INTLTOOL']:
obj = bld.new_task_gen ('intltool_in') obj = bld.new_task_gen ('intltool_in')
obj.source = 'data/' + APPNAME + '.desktop.in' obj.source = 'data/' + APPNAME + '.desktop.in'
@ -379,20 +377,20 @@ def build (bld):
' -o ' + blddir + '/data/logo-shade.png ' + \ ' -o ' + blddir + '/data/logo-shade.png ' + \
srcdir + '/data/logo-shade.svg' srcdir + '/data/logo-shade.svg'
if not Utils.exec_command (command): if not Utils.exec_command (command):
bld.install_files ('${DATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', blddir + '/data/logo-shade.png')
else: else:
Utils.pprint ('BLUE', "logo-shade could not be rasterized.") Utils.pprint ('BLUE', "logo-shade could not be rasterized.")
bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/error.html') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/error.html')
bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial-head.html')
bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/speeddial.json') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/speeddial.json')
bld.install_files ('${DATADIR}/' + APPNAME + '/res', 'data/mootools.js') bld.install_files ('${MDATADIR}/' + APPNAME + '/res', 'data/mootools.js')
if Options.commands['check']: if Options.commands['check']:
bld.add_subdirs ('tests') bld.add_subdirs ('tests')
def shutdown (): def shutdown ():
if Options.commands['install'] or Options.commands['uninstall']: if Options.commands['install'] or Options.commands['uninstall']:
dir = Build.bld.get_install_path ('${DATADIR}/icons/hicolor') dir = Build.bld.get_install_path ('${MDATADIR}/icons/hicolor')
icon_cache_updated = False icon_cache_updated = False
if not Options.options.destdir: if not Options.options.destdir:
# update the pixmap cache directory # update the pixmap cache directory