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

Fix installing of data files

Browse source
This commit is contained in:
Christian Dywan 2009-01-13 00:50:01 +01:00
parent 2376e20f4c
commit 7601ff8865
2 changed files with 10 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
icons/wscript_build
View file

@ -11,12 +11,6 @@ def add_image (bld, category, name):
if not os.access (path, os.F_OK): if not os.access (path, os.F_OK):
os.mkdir (path) os.mkdir (path)
def install_files (folder, destination, source):
try:
bld.install_files (folder, destination, source)
except:
pass
rsvg_convert = bld.env['RSVG_CONVERT'] rsvg_convert = bld.env['RSVG_CONVERT']
if rsvg_convert: if rsvg_convert:
@ -25,7 +19,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):
install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, bld.install_files ('${DATADIR}/icons/hicolor/' + format + '/' + category,
srcdir + '/icons/' + format + '/' + name + '.png') srcdir + '/icons/' + format + '/' + name + '.png')
elif not rsvg_convert: elif not rsvg_convert:
pass pass
@ -36,7 +30,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):
install_files ('DATADIR', 'icons/hicolor/' + format + '/' + category, bld.install_files ('${DATADIR}/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.")

18
wscript
View file

@ -262,19 +262,13 @@ def build (bld):
if not os.access (path, os.F_OK): if not os.access (path, os.F_OK):
os.mkdir (path) os.mkdir (path)
def install_files (folder, destination, source):
try:
bld.install_files (folder, destination, source)
except:
pass
bld.add_subdirs ('katze midori icons') bld.add_subdirs ('katze midori icons')
if option_enabled ('addons'): if option_enabled ('addons'):
bld.add_subdirs ('extensions') bld.add_subdirs ('extensions')
if option_enabled ('docs'): if option_enabled ('docs'):
install_files ('DOCDIR', '/' + APPNAME + '/', \ bld.install_files ('${DOCDIR}/' + APPNAME + '/', \
'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE') 'AUTHORS ChangeLog COPYING EXPAT README TRANSLATE')
if bld.env['RST2HTML']: if bld.env['RST2HTML']:
@ -291,7 +285,7 @@ def build (bld):
'../../../docs/user/midori.txt ' + 'midori.html' '../../../docs/user/midori.txt ' + 'midori.html'
Utils.exec_command (command) Utils.exec_command (command)
os.chdir ('../../..') os.chdir ('../../..')
install_files ('DOCDIR', '/midori/user/', blddir + '/docs/user/midori.html') bld.install_files ('${DOCDIR}/midori/user/', blddir + '/docs/user/midori.html')
if bld.env['INTLTOOL']: if bld.env['INTLTOOL']:
obj = bld.new_task_gen ('intltool_po') obj = bld.new_task_gen ('intltool_po')
@ -300,14 +294,14 @@ def build (bld):
if bld.env['GTKDOC_SCAN'] and Options.commands['build']: if bld.env['GTKDOC_SCAN'] and Options.commands['build']:
bld.add_subdirs ('docs/api') bld.add_subdirs ('docs/api')
install_files ('DOCDIR', '/midori/api/', blddir + '/docs/api/*') bld.install_files ('${DOCDIR}/midori/api/', blddir + '/docs/api/*')
if bld.env['INTLTOOL']: if bld.env['INTLTOOL']:
obj = bld.new_task_gen ('intltool_in') obj = bld.new_task_gen ('intltool_in')
obj.source = APPNAME + '.desktop.in' obj.source = APPNAME + '.desktop.in'
obj.install_path = '${DATADIR}/applications' obj.install_path = '${DATADIR}/applications'
obj.flags = '-d' obj.flags = '-d'
install_files ('DATADIR', 'applications', APPNAME + '.desktop') bld.install_files ('${DATADIR}/applications', APPNAME + '.desktop')
else: else:
folder = os.path.dirname (bld.env['waf_config_files'][0]) folder = os.path.dirname (bld.env['waf_config_files'][0])
desktop = APPNAME + '.desktop' desktop = APPNAME + '.desktop'
@ -323,7 +317,7 @@ def build (bld):
after.write (line) after.write (line)
after.close () after.close ()
Utils.pprint ('BLUE', desktop + '.in -> ' + desktop) Utils.pprint ('BLUE', desktop + '.in -> ' + desktop)
install_files ('DATADIR', 'applications', folder + '/' + desktop) bld.install_files ('${DATADIR}/applications', folder + '/' + desktop)
except: except:
Utils.pprint ('BLUE', 'File ' + desktop + ' not generated') Utils.pprint ('BLUE', 'File ' + desktop + ' not generated')
finally: finally:
@ -335,7 +329,7 @@ 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):
install_files ('DATADIR', APPNAME, blddir + '/data/logo-shade.png') bld.install_files ('${DATADIR}/' + APPNAME, 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.")