# 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.cpp.in => src/version.C
+# needed by src/version.cpp.in => src/version.cpp
env['PACKAGE_VERSION'] = package_version
env['LYX_DATE'] = time.asctime()
'CheckLC_MESSAGES' : utils.checkLC_MESSAGES,
'CheckIconvConst' : utils.checkIconvConst,
'CheckSizeOfWChar' : utils.checkSizeOfWChar,
+ 'CheckDeclaration' : utils.checkDeclaration,
}
)
+# When using msvc, windows.h is required
+if use_vc and not conf.CheckCHeader('windows.h'):
+ print 'Windows.h is not found. Please install Windows Platform SDK.'
+ Exit(1)
+
# pkg-config? (if not, we use hard-coded options)
if conf.CheckPkgConfig('0.15.0'):
env['HAS_PKG_CONFIG'] = True
# define WANT_GETFILEATTRIBUTESEX_WRAPPER 1
#endif
-#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
-# define LIBC_WCTYPE_USES_UCS4
+/*
+ * the FreeBSD libc uses UCS4, but libstdc++ has no proper wchar_t
+ * support compiled in:
+ * http://gcc.gnu.org/onlinedocs/libstdc++/faq/index.html#3_9
+ * And we are not interested at all what libc
+ * does: What we need is a 32bit wide wchar_t, and a libstdc++ that
+ * has the needed wchar_t support and uses UCS4. Whether it
+ * implements this with the help of libc, or whether it has own code
+ * does not matter for us, because we don't use libc directly (Georg)
+*/
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4 && ! defined(__FREEBSD__)
+# define USE_WCHAR_T
#endif
#endif
('fcntl', 'HAVE_FCNTL', None),
('mkfifo', 'HAVE_MKFIFO', None),
],
+ declarations = [
+ ('mkstemp', 'HAVE_DECL_MKSTEMP', ['unistd.h', 'stdlib.h']),
+ ],
types = [
('std::istreambuf_iterator<std::istream>', 'HAVE_DECL_ISTREAMBUF_ITERATOR',
'#include <streambuf>\n#include <istream>'),
print 'uic or moc command is not found for frontend', frontend
Exit(1)
- # now, if msvc2005 is used, we will need that QT_LIB_PATH/QT_LIB.manifest file
+ # now, if msvc2005 is used, we will need to embed lyx.exe.manifest to lyx.exe
+ # NOTE: previously, lyx.exe had to be linked to some qt manifest to work.
+ # For some unknown changes in msvc or qt, this is no longer needed.
if use_vc:
- if mode == 'debug':
- if qt_lib_path is not None:
- manifest = os.path.join(qt_lib_path, 'QtGuid4.dll.manifest')
- else:
- manifest = 'QtGuid4.dll.manifest'
- else:
- if qt_lib_path is not None:
- manifest = os.path.join(qt_lib_path, 'QtGui4.dll.manifest')
- else:
- manifest = 'QtGui4.dll.manifest'
- if os.path.isfile(manifest):
- frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % manifest]
+ frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], \
+ 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \
+ env.File('$BUILDDIR/lyx.exe.manifest').path]
frontend_env = conf.Finish()
print "Processing files in src/support..."
frontend_env.Depends('$BUILDDIR/common/support/Package.cpp', '$BUILDDIR/common/config.h')
- env.substFile('$BUILDDIR/common/support/Package.cpp', '$TOP_SRCDIR/src/support/Package.cpp.in')
+ 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)
print "Processing files in src..."
env.Depends('$BUILDDIR/common/version.cpp', '$BUILDDIR/common/config.h')
- env.substFile('$BUILDDIR/common/version.cpp', '$TOP_SRCDIR/src/version.cpp.in')
+ 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.cpp')
# 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',
)
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] + \
# XXX_extra_files. It will *not* change other sections of existing
# manifest.py
#
- print 'Validate and updating development/scons/scons_manifest.py.new'
+ 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']
- ignore_types = ['.svn', '.deps', '.cache', '.tmp', 'bak', '.gmo', 'debug', 'release']
+ 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 ['_pre_files', '_post_files', '_moc_files', '_files', '_header_files', '_extra_files']:
- if dirname + ext in locals():
+ 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 [y in x for y in ignore_types]]
+ 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 = []
if len(extra) > 0:
print 'Extra: %s in %s' % (', '.join(extra), root)
# write to a new manifest file
- for ext in ['_pre_files', '_post_files', '_moc_files', '_files', '_header_files', '_extra_files']:
+ for ext in ext_types:
if dirname + ext in locals():
exec('%s%s.sort()' % (dirname, ext))
print >> manifest, "%s%s = Split('''\n " % (dirname, ext),
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_files if x != 'version.cpp'] + \
- ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files + src_support_files + src_support_extra_files if x != 'Package.cpp'] + \
+ ['$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/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
+ # build language_l10n.pot, ui_l10n.pot, layouts_l10n.pot, qt4_l10n.pot, external_l10n
# and combine them to lyx.po
env['LYX_POT'] = 'python $TOP_SRCDIR/po/lyx_pot.py'
lyx_po = env.Command('$BUILDDIR/po/lyx.po',
['$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],
+ ['$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',
+ 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'),
+ env.Command('$BUILDDIR/po/external_l10n.pot', '$TOP_SRCDIR/lib/external_templates',
+ '$LYX_POT -b $TOP_SRCDIR -t external -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=qt_ \
+ --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" ''']
('doc/cs', lib_doc_cs_files),
('doc/da', lib_doc_da_files),
('doc/de', lib_doc_de_files),
+ ('doc/de/clipart', lib_doc_de_clipart_files),
('doc/es', lib_doc_es_files),
('doc/es/clipart', lib_doc_es_clipart_files),
('doc/eu', lib_doc_eu_files),
('examples/de', lib_examples_de_files),
('examples/es', lib_examples_es_files),
('examples/eu', lib_examples_eu_files),
+ ('examples/fa', lib_examples_fa_files),
('examples/fr', lib_examples_fr_files),
('examples/he', lib_examples_he_files),
('examples/hu', lib_examples_hu_files),
('images', lib_images_files),
('images/math', lib_images_math_files),
('kbd', lib_kbd_files),
- ('layouts', lib_layouts_files),
+ ('layouts', lib_layouts_files + lib_layouts_inc_files),
('lyx2lyx', lib_lyx2lyx_files),
('scripts', lib_scripts_files),
('templates', lib_templates_files),
if mode != 'release':
print 'installer has to be built in release mode (use option mode=release)'
Exit(1)
+ installer_files = ['$TOP_SRCDIR/development/Win32/packaging/installer/%s' \
+ % x for x in development_Win32_packaging_installer] + \
+ ['$TOP_SRCDIR/development/Win32/packaging/installer/components/%s' \
+ % x for x in development_Win32_packaging_installer_components] + \
+ ['$TOP_SRCDIR/development/Win32/packaging/installer/dialogs/%s' \
+ % x for x in development_Win32_packaging_installer_dialogs] + \
+ ['$TOP_SRCDIR/development/Win32/packaging/installer/graphics/%s' \
+ % x for x in development_Win32_packaging_installer_graphics] + \
+ ['$TOP_SRCDIR/development/Win32/packaging/installer/include/%s' \
+ % x for x in development_Win32_packaging_installer_include] + \
+ ['$TOP_SRCDIR/development/Win32/packaging/installer/lang/%s' \
+ % x for x in development_Win32_packaging_installer_lang]
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)
'$TOP_SRCDIR/development/Win32/packaging/installer/lyx.nsi')
# since I can not use a scanner, explicit dependent is required
env.Depends(installer, 'install')
+ env.Depends(installer, installer_files)
env.Alias('installer', installer)
# also generate bundle?
if env.has_key('bundle') and env['bundle']:
bundle_installer = env.installer(env['win_installer'].replace('.exe', '-bundle.exe'),
'$TOP_SRCDIR/development/Win32/packaging/installer/lyx.nsi')
env.Depends(bundle_installer, 'install')
+ env.Depends(bundle_installer, installer_files)
env.Alias('installer', bundle_installer)
Default('lyx')
projects / lyx.git / blobdiff