* rich text item delegate to draw the layout filter as underline

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index 7b650c406de4fd2b24bf7eb2c4a4f4e4f6c6eade..668859d1ed99a8ee3e75b319916e64bea6fb2117 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -615,7 +615,7 @@ if conf.CheckLib('nsl'):
 
 # check available boost libs (since lyx1.4 does not use iostream)
 boost_libs = []
-for lib in ['signals', 'regex', 'filesystem', 'iostreams']:
+for lib in ['signals', 'regex', 'filesystem']:
     if os.path.isdir(os.path.join(top_src_dir, 'boost', 'libs', lib)):
         boost_libs.append(lib)
 
@@ -753,7 +753,7 @@ utils.createConfigFile(conf,
         #('newapis.h', 'HAVE_NEWAPIS_H', 'c'),
     ],
     custom_tests = [
-        (env.has_key('assertions') and env['assertions'],
+        (env.has_key('assertions') and env['assertions'] and devel_version,
             'ENABLE_ASSERTIONS',
             'Define if you want assertions to be enabled in the code'
         ),
@@ -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
@@ -1498,6 +1499,11 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG
 #
 # src/support
 #
+frontend_env['QT4_MOCHPREFIX'] = ''
+frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
+
+support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x)
+    for x in src_support_header_files ]
 support = frontend_env.StaticLibrary(
     target = '$LOCALLIBPATH/support',
     source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
@@ -1510,7 +1516,7 @@ support = frontend_env.StaticLibrary(
         '-DQT_NO_STL',
         '-DQT_NO_KEYWORDS',
     ],
-    CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
+    CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip']
 )
 Alias('support', support)
 
@@ -1555,35 +1561,26 @@ graphics = env.StaticLibrary(
 Alias('graphics', graphics)
 
 
-#
-# src/frontends/controllers
-#
-controllers = env.StaticLibrary(
-    target = '$LOCALLIBPATH/controllers',
-    source = ['$BUILDDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files]
-)
-Alias('controllers', controllers)
-
-
 #
 # src/frontend/qt4
 #
-frontend_env['QT4_MOCHPREFIX'] = ''
-frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
-
 # tells scons how to get these moced files, although not all moced files are needed
 # (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] +
+    ['$TOP_SRCDIR/lib/images/commands/%s' % x for x in lib_images_commands_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',
@@ -1591,7 +1588,6 @@ qt4 = frontend_env.StaticLibrary(
         '$BUILDDIR/src/frontends',
         '$BUILDDIR/src/frontends/qt4',
         '$BUILDDIR/src/frontends/qt4/ui',
-        '$BUILDDIR/src/frontends/controllers'
     ],
     CCFLAGS =  [
         '$CCFLAGS',
@@ -1626,7 +1622,7 @@ Alias('client', client)
 #
 # tex2lyx
 #
-for file in src_tex2lyx_copied_files:
+for file in src_tex2lyx_copied_files + src_tex2lyx_copied_header_files:
     frontend_env.Command('$BUILDDIR/src/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
         [Copy('$TARGET', '$SOURCE')])
 
@@ -1635,7 +1631,7 @@ tex2lyx = frontend_env.Program(
     LIBS = ['support'] + boost_libraries + intl_libs + system_libs + qtcore_lib,
     source = ['$BUILDDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_files + src_tex2lyx_copied_files] + \
         utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/tex2lyx.rc'),
-    CPPPATH = ['$BUILDDIR/src/tex2lyx', '$CPPPATH'],
+    CPPPATH = ['$BUILDDIR/src/tex2lyx', '$BUILDDIR/src', '$CPPPATH'],
     LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'],
     CCFLAGS = ['$CCFLAGS', '-DTEX2LYX'],
 )
@@ -1681,7 +1677,6 @@ lyx = frontend_env.Program(
         'insets',
         'frontends',
         frontend,
-        'controllers',
         'graphics',
         'support',
         'lyxbase_post',
@@ -1736,7 +1731,6 @@ if use_vc and 'msvs_projects' in BUILD_TARGETS:
             ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
             ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
             ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \
-            ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \
             ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files],
         inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \
             ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \
@@ -1744,7 +1738,6 @@ if use_vc and 'msvs_projects' in BUILD_TARGETS:
             ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files] + \
             ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files] + \
             ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files] + \
-            ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files] + \
             ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files],
         res = ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
         full_target = File(env.subst('$BUILDDIR/lyx$PROGSUFFIX')).abspath)
@@ -1770,8 +1763,7 @@ if 'update_po' in BUILD_TARGETS:
         ['$TOP_SRCDIR/src/insets/%s' % x for x in  src_insets_header_files + src_insets_files] + \
         ['$TOP_SRCDIR/src/frontends/%s' % x for x in  src_frontends_header_files + src_frontends_files] + \
         ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files + src_graphics_files] + \
-        ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files + src_frontends_controllers_files] + \
-        ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files + src_frontends_qt4_moc_files] + \
+        ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files] + \
         ['$TOP_SRCDIR/src/client/%s' % x for x in src_client_header_files + src_client_files ]  + \
         ['$TOP_SRCDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_header_files + src_tex2lyx_files ]
     )
@@ -1944,6 +1936,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('bind/fi', lib_bind_fi_files),
             ('bind/pt', lib_bind_pt_files),
             ('bind/sv', lib_bind_sv_files),
+            ('commands', lib_commands_files),
             ('doc', lib_doc_files),
             ('doc/biblio', lib_doc_biblio_files),
             ('doc/clipart', lib_doc_clipart_files),
@@ -1955,6 +1948,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('doc/es/clipart', lib_doc_es_clipart_files),
             ('doc/eu', lib_doc_eu_files),
             ('doc/fr', lib_doc_fr_files),
+            ('doc/fr/clipart', lib_doc_fr_clipart_files),
             ('doc/he', lib_doc_he_files),
             ('doc/hu', lib_doc_hu_files),
             ('doc/it', lib_doc_it_files),
@@ -1979,6 +1973,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('examples/he', lib_examples_he_files),
             ('examples/hu', lib_examples_hu_files),
             ('examples/it', lib_examples_it_files),
+            ('examples/ja', lib_examples_ja_files),
             ('examples/nl', lib_examples_nl_files),
             ('examples/pl', lib_examples_pl_files),
             ('examples/pt', lib_examples_pt_files),
@@ -1988,8 +1983,9 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('fonts', lib_fonts_files),
             ('images', lib_images_files),
             ('images/math', lib_images_math_files),
+            ('images/commands', lib_images_commands_files),
             ('kbd', lib_kbd_files),
-            ('layouts', lib_layouts_files + lib_layouts_inc_files),
+            ('layouts', lib_layouts_files + lib_layouts_inc_files + lib_layouts_module_files),
             ('lyx2lyx', lib_lyx2lyx_files),
             ('scripts', lib_scripts_files),
             ('templates', lib_templates_files),