From c67b21683d989cda790b9f569245f69f304f1bc4 Mon Sep 17 00:00:00 2001 From: Bo Peng Date: Thu, 18 Oct 2007 18:32:09 +0000 Subject: [PATCH] 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 --- development/scons/SConstruct | 10 +++++++--- development/scons/scons_utils.py | 11 +++++++++++ 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/development/scons/SConstruct b/development/scons/SConstruct index ed7655d76b..53717f1b01 100644 --- 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 1bfc8013cf..b9aca61be6 100644 --- 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, "" + for file in source: + rel_file = relativePath(str(file), env.subst('$TOP_SRCDIR/lib')) + abs_file = str(file.abspath) + print >> qrc, '%s' % (rel_file, abs_file) + print >> qrc, '' + qrc.close() + # # autoconf tests # -- 2.39.5