scons_manifest.py: reordering.

[lyx.git] / development / scons / SConstruct

diff --git a/development/scons/SConstruct b/development/scons/SConstruct
index e28e6f1de3f1fc41f9adc8bbecec164a12235a64..de73df293606a02318ee0c83dfb0fe03e0944fe9 100644 (file)
--- a/development/scons/SConstruct
+++ b/development/scons/SConstruct
@@ -411,6 +411,7 @@ if platform_name == 'win32':
 # hard-coded options are required and will always be there
 # default options can be replaced by enviromental variables or command line options
 CCFLAGS_required = []
+CXXFLAGS_required = []
 LINKFLAGS_required = []
 CCFLAGS_default = []
 
@@ -420,6 +421,7 @@ if use_vc:
     #   in the current code page (number)
     # C4996: foo was decleared deprecated
     CCFLAGS_required.append('/EHsc')
+    CXXFLAGS_required.append('/Zc:wchar_t-')
     if mode == 'debug':
         CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
     else:
@@ -514,7 +516,7 @@ setEnvVariable(env, 'CPP')
 setEnvVariable(env, 'CXX')
 setEnvVariable(env, 'CXXCPP')
 setEnvVariable(env, 'CCFLAGS', CCFLAGS_required, CCFLAGS_default)
-setEnvVariable(env, 'CXXFLAGS')
+setEnvVariable(env, 'CXXFLAGS', CXXFLAGS_required)
 setEnvVariable(env, 'CPPFLAGS')
 setEnvVariable(env, 'LINKFLAGS', LINKFLAGS_required)
 
@@ -740,7 +742,6 @@ utils.createConfigFile(conf,
         ('ostream', 'HAVE_OSTREAM', 'cxx'),
         ('locale', 'HAVE_LOCALE', 'cxx'),
         ('sstream', 'HAVE_SSTREAM', 'cxx'),
-        #('newapis.h', 'HAVE_NEWAPIS_H', 'c'),
     ],
     custom_tests = [
         (env.has_key('assertions') and env['assertions'] and mode == 'debug',
@@ -775,10 +776,6 @@ utils.createConfigFile(conf,
 
 #define BOOST_ALL_NO_LIB 1
 
-#if defined(HAVE_NEWAPIS_H)
-#  define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
-#endif
-
 /*
  * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
  * support compiled in:
@@ -816,7 +813,7 @@ if spell_opt in ['auto', 'aspell'] and conf.CheckLib(aspell_lib):
     spell_engine = 'USE_ASPELL'
 elif spell_opt in ['auto', 'enchant'] and conf.CheckLib('enchant'):
     spell_engine = 'USE_ENCHANT'
-elif spell_opt in ['auto', 'hunspell'] and conf.CheckLib('enchant'):
+elif spell_opt in ['auto', 'hunspell'] and conf.CheckLib('hunspell'):
     spell_engine = 'USE_HUNSPELL'
 else:
     spell_engine = None
@@ -1434,10 +1431,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"
 
@@ -1555,10 +1552,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).
@@ -1871,6 +1871,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),
@@ -1902,6 +1903,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),
@@ -1919,6 +1921,7 @@ 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/uk', lib_examples_uk_files),
             ('fonts', lib_fonts_files),
             ('images', lib_images_files),
@@ -1929,6 +1932,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),