cheese r413 - in trunk: . data

[jhaitsma svn gnome org]

Author: jhaitsma
Date: Fri Jan 18 14:24:40 2008
New Revision: 413
URL: http://svn.gnome.org/viewvc/cheese?rev=413&view=rev

Log:
Process desktop.in.in with waf


Modified:
   trunk/ChangeLog
   trunk/data/wscript_build
   trunk/wscript

Modified: trunk/data/wscript_build
==============================================================================
--- trunk/data/wscript_build	(original)
+++ trunk/data/wscript_build	Fri Jan 18 14:24:40 2008
@@ -9,11 +9,12 @@
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
+import misc
 
 install_files('PACKAGE_DATADIR', '', 'cheese-ui.xml')
 install_files('PACKAGE_DATADIR', '', 'cheese.glade')
 
-# process .in files with intl_tool
+# process schemas.in file
 obj=bld.create_obj('intltool_in')
 obj.source  = 'cheese.schemas.in'
 obj.destvar = 'PREFIX'
@@ -21,6 +22,16 @@
 obj.podir   = '../po'
 obj.flags   = '-s'
 
+# process desktop.in.in file
+VERSION = Params.g_build.m_allenvs['default']['VERSION']
+obj = bld.create_obj('subst')
+obj.source = 'cheese.desktop.in.in'
+obj.target = 'cheese.desktop.in'
+obj.dict = {'VERSION': VERSION}
+obj.fun = misc.subst_func
+obj.prio = 1 # make sure that we run before intltool_in which processes desktop.in file
+
+# process desktop.in file
 obj=bld.create_obj('intltool_in')
 obj.source  = 'cheese.desktop.in'
 obj.destvar = 'PREFIX'
@@ -34,7 +45,8 @@
 
 # data/icons
 for i in ["16x16", "22x22", "24x24", "32x32", "48x48"]:
-  install_files('DATADIR', 'icons/hicolor/%s/apps' % i, 'icons/%s/cheese.png' % i)
+	install_files('DATADIR', 'icons/hicolor/%s/apps' % i, 'icons/%s/cheese.png' % i)
+
 install_files('DATADIR', 'icons/hicolor/scalable/apps', 'icons/scalable/cheese.svg')
 
 # data/sounds

Modified: trunk/wscript
==============================================================================
--- trunk/wscript	(original)
+++ trunk/wscript	Fri Jan 18 14:24:40 2008
@@ -12,7 +12,7 @@
 
 import os, sys
 # waf imports
-import Common, Params, gnome, intltool
+import Common, Params, gnome, intltool, misc
 
 # the following two variables are used by the target "waf dist"
 VERSION='2.21.90'
@@ -31,7 +31,7 @@
 	if Params.g_options.advices:
 		check_cheese_build_consistency()
 
-	conf.check_tool('gcc gnome intltool')
+	conf.check_tool('gcc gnome intltool misc')
 
 	conf.check_pkg('gobject-2.0', destvar='GOBJECT', vnum='2.12.0', mandatory=True)
 	conf.check_pkg('glib-2.0', destvar='GLIB', vnum='2.15.1', mandatory=True)