# 3. compiler commands and flags like CCFLAGS.
# MSGFMT used to process po files
# 4. Variables that will be used to replace variables in some_file.in
-# src/support/package.C.in:
+# src/support/Package.cpp.in:
# TOP_SRCDIR, LOCALEDIR, LYX_DIR, PROGRAM_SUFFIX
# lib/lyx2lyx/lyx2lyx_version.py.in
# PACKAGE_VERSION
-# src/version.C.in
+# src/version.cpp.in
# PACKAGE_VERSION, LYX_DATE, VERSION_INFO
# full path name is used to build msvs project files
# and to replace TOP_SRCDIR in package.C
env['TOP_SRCDIR'] = Dir(top_src_dir).abspath
-# needed by src/version.C.in => src/version.C
+# needed by src/version.cpp.in => src/version.cpp
env['PACKAGE_VERSION'] = package_version
env['LYX_DATE'] = time.asctime()
program_suffix = env['version_suffix']
else:
program_suffix = ''
-# used by package.C.in
+# used by Package.cpp.in
env['PROGRAM_SUFFIX'] = program_suffix
# whether or not add suffix to file and directory names
add_suffix = packaging_method != 'windows'
-# LYX_DIR are different (used in package.C.in)
+# LYX_DIR are different (used in Package.cpp.in)
if add_suffix:
env['LYX_DIR'] = Dir(os.path.join(prefix, share_dir + program_suffix)).abspath
else:
env['MSGFMT'] = conf.CheckCommand('msgfmt')
env['MSGMERGE'] = conf.CheckCommand('msgmerge')
env['XGETTEXT'] = conf.CheckCommand('xgettext')
+env['MSGUNIQ'] = conf.CheckCommand('msguniq')
# if under windows, check the nsis compiler
if platform_name == 'win32':
# install customized builders
env['BUILDERS']['substFile'] = Builder(action = utils.env_subst)
env['BUILDERS']['installTOC'] = Builder(action = utils.env_toc)
+env['BUILDERS']['potfiles'] = Builder(action = utils.env_potfiles)
#----------------------------------------------------------
('setenv', 'HAVE_SETENV', None),
('putenv', 'HAVE_PUTENV', None),
('fcntl', 'HAVE_FCNTL', None),
+ ('mkfifo', 'HAVE_MKFIFO', None),
],
types = [
('std::istreambuf_iterator<std::istream>', 'HAVE_DECL_ISTREAMBUF_ITERATOR',
or build_install or 'all' in targets or build_installer
build_lyxbase = build_lyx or 'lyxbase' in targets
update_po = 'update_po' in targets
+update_manifest = 'update_manifest' in targets
build_po = 'po' in targets or build_install or 'all' in targets
build_qt4 = (build_lyx and frontend == 'qt4') or 'qt4' in targets
build_msvs_projects = use_vc and 'msvs_projects' in targets
#
print "Processing files in src/support..."
- frontend_env.Depends('$BUILDDIR/common/support/package.C', '$BUILDDIR/common/config.h')
- env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRCDIR/src/support/package.C.in')
+ frontend_env.Depends('$BUILDDIR/common/support/Package.cpp', '$BUILDDIR/common/config.h')
+ Package_cpp = env.substFile('$BUILDDIR/common/support/Package.cpp', '$TOP_SRCDIR/src/support/Package.cpp.in')
support = frontend_env.StaticLibrary(
target = '$LOCALLIBPATH/support',
- source = ['$BUILDDIR/common/support/%s' % x for x in src_support_files],
+ source = ['$BUILDDIR/common/support/%s' % x for x in src_support_files] + Package_cpp,
)
Alias('support', support)
#
# moc qt4_moc_files, the moced files are included in the original files
#
- qt4_moced_files = [frontend_env.Moc4(x.replace('.C', '_moc.cpp'), x.replace('.C', '.h')) for x in qt4_moc_files]
+ qt4_moced_files = [frontend_env.Moc4(x.replace('.cpp', '_moc.cpp'), x.replace('.cpp', '.h')) for x in qt4_moc_files]
qt4 = frontend_env.StaticLibrary(
target = '$LOCALLIBPATH/qt4',
print "Processing files in src/tex2lyx..."
#
- for file in ['FloatList.C', 'Floating.C', 'counters.C', 'lyxlayout.h', 'lyxlayout.C',
- 'lyxtextclass.h', 'lyxtextclass.C', 'lyxlex.C', 'lyxlex_pimpl.C']:
+ for file in src_tex2lyx_copied_files + src_tex2lyx_copied_header_files:
frontend_env.Command('$BUILDDIR/common/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
[Copy('$TARGET', '$SOURCE')])
tex2lyx = frontend_env.Program(
target = '$BUILDDIR/common/tex2lyx/tex2lyx',
LIBS = ['support'] + boost_libraries + intl_libs + system_libs + qtcore_lib,
- source = ['$BUILDDIR/common/tex2lyx/%s' % x for x in src_tex2lyx_files] + \
+ source = ['$BUILDDIR/common/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/common/tex2lyx', '$CPPPATH'],
LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'],
#
print "Processing files in src..."
- env.Depends('$BUILDDIR/common/version.C', '$BUILDDIR/common/config.h')
- env.substFile('$BUILDDIR/common/version.C', '$TOP_SRCDIR/src/version.C.in')
+ env.Depends('$BUILDDIR/common/version.cpp', '$BUILDDIR/common/config.h')
+ version_cpp = env.substFile('$BUILDDIR/common/version.cpp', '$TOP_SRCDIR/src/version.cpp.in')
if env.has_key('USE_ASPELL') and env['USE_ASPELL']:
- src_post_files.append('aspell.C')
+ src_post_files.append('ASpell.cpp')
elif env.has_key('USE_PSPELL') and env['USE_PSPELL']:
- src_post_files.append('pspell.C')
+ src_post_files.append('PSpell.cpp')
elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
- src_post_files.append('ispell.C')
+ src_post_files.append('ISpell.cpp')
# msvc requires at least one source file with main()
- # so I exclude main.C from lyxbase
+ # so I exclude main.cpp from lyxbase
lyxbase_pre = env.StaticLibrary(
target = '$LOCALLIBPATH/lyxbase_pre',
- source = ['$BUILDDIR/common/%s' % x for x in src_pre_files]
+ source = ['$BUILDDIR/common/%s' % x for x in src_pre_files] + version_cpp
)
lyxbase_post = env.StaticLibrary(
target = '$LOCALLIBPATH/lyxbase_post',
#
lyx = frontend_env.Program(
target = '$BUILDDIR/lyx',
- source = ['$BUILDDIR/common/main.C'] + \
+ source = ['$BUILDDIR/common/main.cpp'] + \
utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/lyx.rc'),
LIBS = [
'lyxbase_pre',
)
Alias('msvs_projects', proj)
#
- boost_src = []
- for lib in boost_libs:
- boost_src += ['$TOP_SRCDIR/boost/libs/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)]
- build_project('boost', src = boost_src)
- #
- build_project('intl', src = ['$TOP_SRCDIR/intl/%s' % x for x in intl_files],
- inc = ['$TOP_SRCDIR/intl/%s' % x for x in intl_header_files])
- #
- build_project('support', src = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files],
- inc = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files])
- #
- build_project('mathed', src = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files],
- inc = ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files])
- #
- build_project('insets', src = ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files],
- inc = ['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files])
- #
- build_project('frontends', src = ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files],
- inc = ['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files])
- #
- build_project('graphics', src = ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files],
- inc = ['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files])
- #
- build_project('controllers', src = ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files],
- inc = ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files])
- #
- build_project('qt4', src = ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files],
- inc = ['$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])
- #
build_project('client', src = ['$TOP_SRCDIR/src/client/%s' % x for x in src_client_files],
inc = ['$TOP_SRCDIR/src/client/%s' % x for x in src_client_header_files],
rebuildTargetOnly = False,
rebuildTargetOnly = False,
full_target = File(env.subst('$BUILDDIR/common/tex2lyx/tex2lyx$PROGSUFFIX')).abspath)
#
- build_project('lyxbase', src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files],
- inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files])
build_project('lyx',
- src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files] + \
- ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files] + \
+ src = ['$TOP_SRCDIR/src/%s' % x for x in src_pre_files + src_post_files + ['version.cpp']] + \
+ ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_files + ['Package.cpp'] ] + \
['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_files] + \
['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
full_target = File(env.subst('$BUILDDIR/lyx$PROGSUFFIX')).abspath)
+if update_manifest:
+ #
+ # update scons_manifest.py
+ #
+ # When you run 'scons update_manifest', it tells you which files are missing
+ # and which files are not in the source tree. It also generates a
+ # scons_manifest.py.new file with all the missing files added to
+ # XXX_extra_files. It will *not* change other sections of existing
+ # manifest.py
+ #
+ print 'Validating development/scons/scons_manifest.py...'
+ #
+ manifest = open(env.File('$TOP_SRCDIR/development/scons/scons_manifest.py.new').abspath, 'w')
+ print >> manifest, 'from SCons.Util import Split\n'
+ #
+ ignore_dirs = ['boost/boost', 'm4', 'development',
+ utils.relativePath(env.Dir('$BUILDDIR').abspath, env.Dir('$TOP_SRCDIR').abspath)]
+ ignore_types = ['.svn', '.deps', '.cache', '.tmp', '.bak', '.gmo', '.pot',
+ '.pyc', '.pyo', '.o', '_moc.cpp', 'Makefile.in', 'config.h.in',
+ 'LaTeXConfig.lyx', 'version.cpp', 'Package.cpp']
+ ext_types = ['_header_files', '_files', '_pre_files', '_post_files', '_moc_files', '_inc_files',
+ '_copied_files', '_copied_header_files', '_extra_header_files', '_extra_src_files', '_extra_files']
+ for root,path,files in os.walk(env.Dir('$TOP_SRCDIR').abspath):
+ if os.path.split(root)[-1][0] == '.' \
+ or True in [x in root for x in ignore_types] \
+ or True in [utils.isSubDir(root, x) for x in ignore_dirs]:
+ continue
+ dirname = utils.relativePath(root, env.subst('$TOP_SRCDIR')).replace(os.sep, '_')
+ if dirname == '':
+ dirname = 'TOP'
+ # files in the current manifest.py
+ cur_files = []
+ for ext in ext_types:
+ if 'copied' not in ext and dirname + ext in locals():
+ cur_files.extend(eval(dirname + ext))
+ cur_files.sort()
+ # compare files with cur_files
+ files = [x for x in files if x[0] != '.' and True not in [len(x) >= len(y) and x[-len(y):] == y for y in ignore_types]]
+ files.sort()
+ if cur_files != files:
+ missing = []
+ for f in files:
+ if f not in cur_files:
+ missing.append(f)
+ extra = []
+ for f in cur_files:
+ if f not in files:
+ extra.append(f)
+ if len(missing) > 0:
+ print 'Missing: %s in %s' % (', '.join(missing), root)
+ if dirname + '_extra_files' in locals():
+ exec('%s_extra_files.extend(missing)' % dirname)
+ else:
+ exec('%s_extra_files = missing' % dirname)
+ if len(extra) > 0:
+ print 'Extra: %s in %s' % (', '.join(extra), root)
+ # write to a new manifest file
+ for ext in ext_types:
+ if dirname + ext in locals():
+ exec('%s%s.sort()' % (dirname, ext))
+ print >> manifest, "%s%s = Split('''\n " % (dirname, ext),
+ print >> manifest, eval(r"'\n '.join(%s%s)" % (dirname, ext))
+ print >> manifest, "''')\n\n"
+ manifest.close()
+ Alias('update_manifest', None)
+
+
if update_po:
#
# update po files
#
print 'Updating po/*.po files...'
+ # whether or not update po files
+ if not env['XGETTEXT'] or not env['MSGMERGE'] or not env['MSGUNIQ']:
+ print 'xgettext or msgmerge does not exist. Cannot merge po files'
+ Exit(1)
+ # rebuild POTFILES.in
+ POTFILES_in = env.potfiles('$TOP_SRCDIR/po/POTFILES.in',
+ ['$TOP_SRCDIR/src/%s' % x for x in src_header_files + src_pre_files + src_post_files + \
+ src_extra_src_files] + \
+ ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files + src_support_files + \
+ src_support_extra_header_files + src_support_extra_src_files] + \
+ ['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files + src_mathed_files] + \
+ ['$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/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 ]
+ )
+ Alias('update_po', POTFILES_in)
+ # build language_l10n.pot, ui_l10n.pot, layouts_l10n.pot, qt4_l10n.pot
+ # and combine them to lyx.po
+ env['LYX_POT'] = 'python $TOP_SRCDIR/po/lyx_pot.py'
+ lyx_po = env.Command('$BUILDDIR/po/lyx.po',
+ env.Command('$BUILDDIR/po/all.po',
+ [env.Command('$BUILDDIR/po/qt4_l10n.pot',
+ ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files],
+ '$LYX_POT -b $TOP_SRCDIR -t qt4 -o $TARGET $SOURCES'),
+ env.Command('$BUILDDIR/po/layouts_l10n.pot',
+ ['$TOP_SRCDIR/lib/layouts/%s' % x for x in lib_layouts_files + lib_layouts_inc_files],
+ '$LYX_POT -b $TOP_SRCDIR -t layouts -o $TARGET $SOURCES'),
+ env.Command('$BUILDDIR/po/languages_l10n.pot', '$TOP_SRCDIR/lib/languages',
+ '$LYX_POT -b $TOP_SRCDIR -t languages -o $TARGET $SOURCES'),
+ env.Command('$BUILDDIR/po/ui_l10n.pot',
+ ['$TOP_SRCDIR/lib/ui/%s' % x for x in lib_ui_files],
+ '$LYX_POT -b $TOP_SRCDIR -t ui -o $TARGET $SOURCES'),
+ ], utils.env_cat),
+ ['$MSGUNIQ -o $TARGET $SOURCE',
+ '''$XGETTEXT --default-domain=${TARGET.base} \
+ --directory=$TOP_SRCDIR --add-comments=TRANSLATORS: \
+ --language=C++ --join-existing \
+ --keyword=_ --keyword=N_ --keyword=B_ --keyword=qt_ \
+ --files-from=$TOP_SRCDIR/po/POTFILES.in \
+ --copyright-holder="LyX Developers" \
+ --msgid-bugs-address="lyx-devel@lists.lyx.org" ''']
+ )
+ env.Depends(lyx_po, POTFILES_in)
+ # copy lyx.po to lyx.pot
+ lyx_pot = env.Command('$BUILDDIR/po/lyx.pot', lyx_po,
+ Copy('$TARGET', '$SOURCE'))
+ #
import glob
# files to translate
- transfiles = glob.glob(os.path.join(env.subst('$TOP_SRCDIR'), 'po', '*.po'))
+ transfiles = glob.glob(os.path.join(env.Dir('$TOP_SRCDIR/po').abspath, '*.po'))
# possibly *only* handle these languages
languages = None
if env.has_key('languages'):
- languages = env.make_list(env['lanauges'])
- # whether or not update po files
- if not env['XGETTEXT'] or not env['MSGMERGE']:
- print 'xgettext or msgmerge does not exist. Can not merge po files'
- Exit(1)
- # create a builder that generate
- env['XGETTEXT_OPTIONS'] = '--language=C++ --join-existing --keyword=_ --keyword=N_ --keyword=qt_'
- env['MSGMERGE_OPTIONS'] = '--update'
- env['COPYRIGHT_HOLDER'] = 'LyX Developers'
- env['MSGID_BUGS_ADDRESS'] = 'lyx-devel@lists.lyx.org'
- env['BUILDERS']['xgettext'] = Builder(action='''$XGETTEXT --default-domain=lyx \
- --output=$TARGET \
- --directory=$TOP_SRCDIR \
- --add-comments=TRANSLATORS: $XGETTEXT_OPTIONS \
- --files-from=$TOP_SRCDIR/po/POTFILES.in \
- --copyright-holder='$COPYRIGHT_HOLDER' \
- --msgid-bugs-address='$MSGID_BUGS_ADDRESS' ''')
- env['BUILDERS']['msgmerge'] = Builder(action='$MSGMERGE $MSGMERGE_OPTIONS $SOURCE $TARGET')
- # ==> lyx.pot
- env.xgettext('$BUILDDIR/common/lyx.pot', '$TOP_SRCDIR/po/POTFILES.in')
+ languages = env.make_list(env['languages'])
+ # merge. if I use lan.po as $TARGET, it will be removed
+ # before it is merged. In this builder,
+ # $BUILDDIR/po/lang.po is merged from po/lang.po and $BUILDDIR/po/lyx.pot
+ # and is copied to po/lang.po
+ env['BUILDERS']['msgmerge'] = Builder(action=[
+ '$MSGMERGE $TOP_SRCDIR/po/${TARGET.filebase}.po $SOURCE -o $TARGET',
+ Copy('$TOP_SRCDIR/po/${TARGET.filebase}.po', '$TARGET')]
+ )
# for each po file, generate pot
- for f in transfiles:
+ for po_file in transfiles:
# get filename
- fname = os.path.split(f)[1]
+ fname = os.path.split(po_file)[1]
# country code
country = fname.split('.')[0]
#
if not languages or country in languages:
- # merge po files
- env.msgmerge(f, '$BUILDDIR/common/lyx.pot')
- # build language_l10n.pot
- env['BUILDERS']['language_l10n'] = Builder(action=utils.env_language_l10n)
- tar1 = env.language_l10n('$BUILDDIR/common/language_l10n.pot', '$TOP_SRCDIR/lib/languages')
- env['BUILDERS']['qt4_l10n'] = Builder(action=utils.env_qt4_l10n)
- tar2 = env.qt4_l10n('$BUILDDIR/common/qt4_l10n.pot',
- ['$TOP_SRCDIR/src/frontends/qt4/ui/%s' % x for x in src_frontends_qt4_ui_files])
- env['BUILDERS']['layouts_l10n'] = Builder(action=utils.env_layouts_l10n)
- tar3 = env.layouts_l10n('$BUILDDIR/common/layouts_l10n.pot',
- ['$TOP_SRCDIR/lib/layouts/%s' % x for x in lib_layouts_files])
- env['BUILDERS']['ui_l10n'] = Builder(action=utils.env_ui_l10n)
- tar4 = env.ui_l10n('$BUILDDIR/common/ui_l10n.pot',
- ['$TOP_SRCDIR/lib/ui/%s' % x for x in lib_ui_files])
- Alias('update_po', [tar1, tar2, tar3, tar4])
+ # merge po files, the generated lan.po_new file is copied to lan.po file.
+ po = env.msgmerge('$BUILDDIR/po/%s.po' % country, lyx_pot)
+ env.Depends(po, POTFILES_in)
+ Alias('update_po', po)
if build_po:
dirs = []
for (dir,files) in [
('.', lib_files),
- ('images', lib_images_files),
- ('images/math', lib_images_math_files),
- ('kbd', lib_kbd_files),
- ('layouts', lib_layouts_files),
- ('scripts', lib_scripts_files),
- ('templates', lib_templates_files),
- ('tex', lib_tex_files),
- ('ui', lib_ui_files),
('bind', lib_bind_files),
('bind/de', lib_bind_de_files),
('bind/fi', lib_bind_fi_files),
('examples/ru', lib_examples_ru_files),
('examples/sl', lib_examples_sl_files),
('examples/ro', lib_examples_ro_files),
- ('lyx2lyx', lib_lyx2lyx_files)]:
+ ('fonts', lib_fonts_files),
+ ('images', lib_images_files),
+ ('images/math', lib_images_math_files),
+ ('kbd', lib_kbd_files),
+ ('layouts', lib_layouts_files + lib_layouts_inc_files),
+ ('lyx2lyx', lib_lyx2lyx_files),
+ ('scripts', lib_scripts_files),
+ ('templates', lib_templates_files),
+ ('tex', lib_tex_files),
+ ('ui', lib_ui_files)]:
dirs.append(env.Install(os.path.join(share_dest_dir, dir),
[env.subst('$TOP_SRCDIR/lib/%s/%s' % (dir, file)) for file in files]))
Alias('install', dirs)
if platform_name != 'win32':
print 'installer target is only available for windows platform'
Exit(1)
+ if mode != 'release':
+ print 'installer has to be built in release mode (use option mode=release)'
+ Exit(1)
if env.has_key('NSIS') and env['NSIS'] is not None:
# create a builder to strip and install
env['BUILDERS']['installer'] = Builder(generator=utils.env_nsis)
projects / lyx.git / blobdiff