Partial fox for bug #6622: Display \undertilde on screen correctly.

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index f745c7e8980a514c5566cc5153e15bf59e2995da..d5c63c9bb86dcb7a0cf42f9c3fa78ac8c05f49ef 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -49,6 +49,13 @@ EnsureSConsVersion(0, 97)
 # get version number from configure.ac so that JMarc does
 # not have to change SConstruct during lyx release
 package_version, majmin_ver, lyx_date = utils.getVerFromConfigure(top_src_dir)
+try:
+    lyx_major_version = package_version.split('.')[0]
+    lyx_minor_version = package_version.split('.')[1]
+except IndexError, e:
+    lyx_major_version = majmin_ver[0]
+    lyx_minor_version = majmin_ver[1]
+
 package_cygwin_version = '%s-1' % package_version
 boost_version = ['1_34']
 
@@ -1024,6 +1031,10 @@ result = utils.createConfigFile(conf,
             'Define to the one symbol short name of this package.'),
         ('#define PACKAGE_VERSION "%s"' % package_version,
             'Define to the version of this package.'),
+        ('#define LYX_MAJOR_VERSION %d' % int(lyx_major_version),
+            'Define to the major version of this package.'),
+        ('#define LYX_MINOR_VERSION %d' % int(lyx_minor_version),
+            'Define to the minor version of this package.'),
         ('#define VERSION_INFO "%s"' % env['VERSION_INFO'].replace('\n', '\\n'),
             'Full version info'),
         ('#define LYX_DIR_VER "LYX_DIR_%sx"' % majmin_ver,
@@ -1431,10 +1442,10 @@ Help(opts.GenerateHelpText(env))
 env.SConsignFile(os.path.join(Dir(env['BUILDDIR']).abspath, '.sconsign'))
 # this usage needs further investigation.
 #env.CacheDir('%s/Cache/%s' % (env['BUILDDIR'], frontend))
-env.BuildDir('$BUILDDIR/boost', '$TOP_SRCDIR/boost/libs', duplicate = 0)
-env.BuildDir('$BUILDDIR/intl', '$TOP_SRCDIR/intl', duplicate = 0)
-env.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
-env.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
+env.VariantDir('$BUILDDIR/boost', '$TOP_SRCDIR/boost/libs', duplicate = 0)
+env.VariantDir('$BUILDDIR/intl', '$TOP_SRCDIR/intl', duplicate = 0)
+env.VariantDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
+env.VariantDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
 
 print "Building all targets recursively"
 
@@ -1552,10 +1563,13 @@ Alias('tex2lyx', tex2lyx)
 #
 if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
     src_post_files.append('AspellChecker.cpp')
+    src_post_files.append('PersonalWordList.cpp')
 elif env.has_key('USE_ENCHANT') and env['USE_ENCHANT']:
     src_post_files.append('EnchantChecker.cpp')
+    src_post_files.append('PersonalWordList.cpp')
 elif env.has_key('USE_HUNSPELL') and env['USE_HUNSPELL']:
     src_post_files.append('HunspellChecker.cpp')
+    src_post_files.append('PersonalWordList.cpp')
 
 # tells scons how to get these moced files, although not all moced files are needed
 # (or are actually generated).
@@ -1856,9 +1870,6 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('.', lib_files),  
             ('bind', lib_bind_files),
             ('bind/de', lib_bind_de_files),
-            ('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),
@@ -1868,6 +1879,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('doc/da', lib_doc_da_files),
             ('doc/de', lib_doc_de_files),
             ('doc/de/clipart', lib_doc_de_clipart_files),
+            ('doc/el', lib_doc_el_files),
             ('doc/es', lib_doc_es_files),
             ('doc/es/clipart', lib_doc_es_clipart_files),
             ('doc/eu', lib_doc_eu_files),
@@ -1899,6 +1911,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('examples/cs', lib_examples_cs_files),
             ('examples/da', lib_examples_da_files),
             ('examples/de', lib_examples_de_files),
+            ('examples/el', lib_examples_el_files),
             ('examples/es', lib_examples_es_files),
             ('examples/eu', lib_examples_eu_files),
             ('examples/fa', lib_examples_fa_files),
@@ -1916,6 +1929,8 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('examples/ru', lib_examples_ru_files),
             ('examples/sk', lib_examples_sk_files),
             ('examples/sl', lib_examples_sl_files),
+            ('examples/sr', lib_examples_sr_files),
+            ('examples/sv', lib_examples_sv_files),
             ('examples/uk', lib_examples_uk_files),
             ('fonts', lib_fonts_files),
             ('images', lib_images_files),
@@ -1926,6 +1941,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
             ('lyx2lyx', lib_lyx2lyx_files),
             ('scripts', lib_scripts_files),
             ('templates', lib_templates_files),
+            ('templates/thesis', lib_templates_thesis_files),
             ('tex', lib_tex_files),
             ('ui', lib_ui_files)]:
         dirs.append(env.Install(os.path.join(share_dest_dir, dir),