# 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']
'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,
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).
('.', 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),
('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),