) ),
#
EnumVariable('spell', 'Choose spell checker to use.', 'auto',
- allowed_values = ('aspell', 'hunspell', 'auto', 'no') ),
+ allowed_values = ('aspell', 'enchant', 'hunspell', 'auto', 'no') ),
# packaging method
EnumVariable('packaging', 'Packaging method to use.', default_packaging_method,
allowed_values = ('windows', 'posix', 'macosx')),
# 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 = []
# 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:
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)
('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',
#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:
# determine headers to use
spell_opt = ARGUMENTS.get('spell', 'auto')
env['USE_ASPELL'] = False
+env['USE_ENCHANT'] = False
+env['USE_HUNSPELL'] = False
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('hunspell'):
+ spell_engine = 'USE_HUNSPELL'
else:
spell_engine = None
)
# these keys are needed in env
-for key in ['USE_ASPELL', 'HAVE_FCNTL',\
+for key in ['USE_ASPELL', 'USE_ENCHANT', 'USE_HUNSPELL', 'HAVE_FCNTL',\
'HAVE_LIBGDI32', 'HAVE_LIBAIKSAURUS', 'AIKSAURUS_LIB']:
# USE_ASPELL etc does not go through result
if result.has_key(key):
('HAVE_LIBGDI32', 'gdi32'),
('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']),
('USE_ASPELL', aspell_lib),
+ ('USE_ENCHANT', 'enchant'),
+ ('USE_HUNSPELL', 'hunspell')
]
for lib in libs:
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"
#
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).
('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),
('doc/sv', lib_doc_sv_files),
('doc/uk', lib_doc_uk_files),
('doc/uk/clipart', lib_doc_uk_clipart_files),
+ ('doc/zh_CN', lib_doc_zhCN_files),
('examples', lib_examples_files),
('examples/ca', lib_examples_ca_files),
('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),
('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),
('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),