Fix scons for Andre's Resource.cpp change

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@21041 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index ed7655d76b26ff6d2a6e5934ab38199379d8d335..53717f1b011c1ad22d535009fcdcee79004cd581 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -1294,6 +1294,7 @@ if platform_name == 'cygwin':
 #
 if frontend == 'qt4':
     frontend_env = env.Copy()
+    frontend_env['BUILDERS']['qtResource'] = Builder(action = utils.env_qtResource)
 
     # handle qt related user specified paths
     # set environment so that moc etc can be found even if its path is not set properly
@@ -1565,15 +1566,18 @@ frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
 # (or are actually generated).
 qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x)
     for x in src_frontends_qt4_header_files ]
-resources = [frontend_env.Uic4('$BUILDDIR/src/frontends/qt4/ui/%s' % x.split('.')[0])
+ui_files = [frontend_env.Uic4('$BUILDDIR/src/frontends/qt4/ui/%s' % x.split('.')[0])
     for x in src_frontends_qt4_ui_files]
-
+resource = frontend_env.Qrc(frontend_env.qtResource(
+    '$BUILDDIR/src/frontends/qt4/Resource.qrc',
+    ['$TOP_SRCDIR/lib/images/%s' % x for x in lib_images_files] +
+    ['$TOP_SRCDIR/lib/images/math/%s' % x for x in lib_images_math_files]))
 #
 # moc qt4_moc_files, the moced files are included in the original files
 #
 qt4 = frontend_env.StaticLibrary(
     target = '$LOCALLIBPATH/qt4',
-    source = ['$BUILDDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files],
+    source = ['$BUILDDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files] + resource,
     CPPPATH = [
         '$CPPPATH',
         '$BUILDDIR/src',

diff --git a/development/scons/scons_utils.py b/development/scons/scons_utils.py
index 1bfc8013cf02203a298303c474071867e9c7df09..b9aca61be6cd205be29c49146147896f37578ffb 100644 (file)
--- a/development/scons/scons_utils.py
+++ b/development/scons/scons_utils.py
@@ -186,6 +186,17 @@ def createResFromIcon(env, icon_file, rc_file):
         return []
 
 
+def env_qtResource(target, source, env):
+    '''Create resource.qrc'''
+    qrc = open(str(target[0]), 'w')
+    print >> qrc, "<!DOCTYPE RCC><RCC version='1.0'><qresource>"
+    for file in source:
+        rel_file = relativePath(str(file), env.subst('$TOP_SRCDIR/lib'))
+        abs_file = str(file.abspath)
+        print >> qrc, '<file alias="%s">%s</file>' % (rel_file, abs_file)
+    print >> qrc, '</qresource></RCC>'
+    qrc.close()
+
 #
 # autoconf tests
 #