X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=development%2Fscons%2FSConstruct;h=1cba99b1a32534821464636f67fdbfd4ece292c5;hb=60d63985b77c7c79abe22d4aba1a5f9bd1a3e51b;hp=fe922bbca138d725706c0225efcd54a9f341d1ea;hpb=a6e1dc19a3b65d500aa41beeffd8c93c46cde25f;p=lyx.git diff --git a/development/scons/SConstruct b/development/scons/SConstruct index fe922bbca1..1cba99b1a3 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -14,6 +14,23 @@ import os, sys, copy, cPickle, glob, time +# determine where I am ... +# +from SCons.Node.FS import default_fs +# default_fs.SConstruct_dir is where SConstruct file is located. +scons_dir = default_fs.SConstruct_dir.path +scons_absdir = default_fs.SConstruct_dir.abspath + +# if SConstruct is copied to the top source directory +if os.path.exists(os.path.join(scons_dir, 'development', 'scons', 'scons_manifest.py')): + scons_dir = os.path.join(scons_dir, 'development', 'scons') + scons_absdir = os.path.join(scons_absdir, 'development', 'scons') +# get the ../.. of scons_dir +top_src_dir = os.path.split(os.path.split(scons_absdir)[0])[0] + +sys.path.extend([scons_absdir, os.path.join(top_src_dir, 'lib', 'doc')]) +import depend + # scons_utils.py defines a few utility function import scons_utils as utils # import all file lists @@ -34,15 +51,6 @@ if version[0] == 0 and version[1] == 96 and version[2] < 92: print "Scons >= 0.96.92 is required." Exit(1) -# determine where I am ... -# -from SCons.Node.FS import default_fs -# default_fs.SConstruct_dir is where SConstruct file is located. -scons_dir = default_fs.SConstruct_dir.path -# get the ../.. of scons_dir -top_src_dir = os.path.split(os.path.split(default_fs.SConstruct_dir.abspath)[0])[0] -sys.path.append(os.path.join(top_src_dir, 'lib', 'doc')) -import depend #---------------------------------------------------------- # Global definitions @@ -52,7 +60,7 @@ import depend # # get version number from configure.ac so that JMarc does # not have to change SConstruct during lyx release -package_version = utils.getVerFromConfigure(top_src_dir) +package_version, lyx_date = utils.getVerFromConfigure(top_src_dir) package_cygwin_version = '%s-1' % package_version boost_version = ['1_34'] @@ -150,9 +158,6 @@ opts.AddOptions( # BoolOption('pch', 'Whether or not use pch', False), # enable assertion, (config.h has ENABLE_ASSERTIOS BoolOption('assertions', 'Use assertions', True), - # enable warning, (config.h has WITH_WARNINGS) - # default to False since MSVC does not have #warning - BoolOption('warnings', 'Use warnings', False), # config.h define _GLIBCXX_CONCEPT_CHECKS # Note: for earlier version of gcc (3.3) define _GLIBCPP_CONCEPT_CHECKS BoolOption('concept_checks', 'Enable concept checks', True), @@ -366,15 +371,10 @@ env.AppendUnique(LIBPATH = ['$LOCALLIBPATH']) # TOP_SRCDIR, LOCALEDIR, LYX_DIR, PROGRAM_SUFFIX # lib/lyx2lyx/lyx2lyx_version.py.in # PACKAGE_VERSION -# 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.cpp.in => src/version.C -env['PACKAGE_VERSION'] = package_version -env['LYX_DATE'] = time.asctime() # determine share_dir etc packaging_method = env.get('packaging') @@ -603,9 +603,16 @@ conf = Configure(env, '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.' + print 'Please check config.log for more information.' + Exit(1) + # pkg-config? (if not, we use hard-coded options) if conf.CheckPkgConfig('0.15.0'): env['HAS_PKG_CONFIG'] = True @@ -617,6 +624,7 @@ else: if (not use_vc and not conf.CheckLibWithHeader('z', 'zlib.h', 'C')) \ or (use_vc and not conf.CheckLibWithHeader('zdll', 'zlib.h', 'C')): print 'Did not find zdll.lib or zlib.h, exiting!' + print 'Please check config.log for more information.' Exit(1) if conf.CheckLib('iconv'): env['ICONV_LIB'] = 'iconv' @@ -626,6 +634,7 @@ elif conf.CheckFunc('iconv_open'): env['ICONV_LIB'] = None else: print 'Did not find iconv or libiconv, exiting!' + print 'Please check config.log for more information.' Exit(1) # check socket libs @@ -813,8 +822,18 @@ utils.createConfigFile(conf, # 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__) && !defined(__FreeBSD_kernel__) +# define USE_WCHAR_T #endif #endif @@ -852,6 +871,7 @@ else: print "Warning: Can not locate any spell checker" elif spell_opt != 'no': print "Warning: Can not locate specified spell checker:", spell_opt + print 'Please check config.log for more information.' Exit(1) # check arg types of select function @@ -862,8 +882,44 @@ sizeof_wchar_t = conf.CheckSizeOfWChar() # something wrong if sizeof_wchar_t == 0: print 'Error: Can not determine the size of wchar_t.' + print 'Please check config.log for more information.' Exit(1) + +# fill in the version info +env['VERSION_INFO'] = '''Configuration + Host type: %s + Special build flags: %s + C Compiler: %s + C Compiler flags: %s %s + C++ Compiler: %s + C++ Compiler LyX flags: %s + C++ Compiler flags: %s %s + Linker flags: %s + Linker user flags: %s +Build info: + Builing directory: %s + Local library directory: %s + Libraries paths: %s + Boost libraries: %s + include search path: %s +Frontend: + Frontend: %s + Packaging: %s + LyX dir: %s + LyX files dir: %s +''' % (platform_name, + env.subst('$CCFLAGS'), env.subst('$CC'), + env.subst('$CPPFLAGS'), env.subst('$CFLAGS'), + env.subst('$CXX'), env.subst('$CXXFLAGS'), + env.subst('$CPPFLAGS'), env.subst('$CXXFLAGS'), + env.subst('$LINKFLAGS'), env.subst('$LINKFLAGS'), + env.subst('$BUILDDIR'), env.subst('$LOCALLIBPATH'), + str(env['LIBPATH']), str(boost_libraries), + str(env['CPPPATH']), + frontend, packaging_method, + prefix, env['LYX_DIR']) + # # create config.h result = utils.createConfigFile(conf, @@ -919,18 +975,14 @@ result = utils.createConfigFile(conf, ('mktemp', 'HAVE_MKTEMP', None), ('mkstemp', 'HAVE_MKSTEMP', None), ('strerror', 'HAVE_STRERROR', None), - ('count', 'HAVE_STD_COUNT', ''' -#include -int count() -{ -char a[] = "hello"; -return std::count(a, a+5, 'l'); -} -'''), ('getcwd', 'HAVE_GETCWD', None), ('setenv', 'HAVE_SETENV', None), ('putenv', 'HAVE_PUTENV', None), ('fcntl', 'HAVE_FCNTL', None), + ('mkfifo', 'HAVE_MKFIFO', None), + ], + declarations = [ + ('mkstemp', 'HAVE_DECL_MKSTEMP', ['unistd.h', 'stdlib.h']), ], types = [ ('std::istreambuf_iterator', 'HAVE_DECL_ISTREAMBUF_ITERATOR', @@ -976,10 +1028,6 @@ return std::count(a, a+5, 'l'); 'HAVE_GETTEXT', 'Define to 1 if using system gettext library' ), - (env.has_key('warnings') and env['warnings'], - 'WITH_WARNINGS', - 'Define this if you want to see the warning directives put here and there by the developpers to get attention' - ), (env.has_key('concept_checks') and env['concept_checks'], '_GLIBCXX_CONCEPT_CHECKS', 'libstdc++ concept checking' @@ -1022,6 +1070,10 @@ return std::count(a, a+5, 'l'); 'Define to the one symbol short name of this package.'), ('#define PACKAGE_VERSION "%s"' % package_version, 'Define to the version of this package.'), + ('#define VERSION_INFO "%s"' % env['VERSION_INFO'].replace('\n', '\\n'), + 'Full version info'), + ('#define LYX_DATE "%s"' % lyx_date, + 'Date of release'), ('#define BOOST_ALL_NO_LIB 1', 'disable automatic linking of boost libraries.'), ('#define USE_%s_PACKAGING 1' % packaging_method.upper(), @@ -1047,15 +1099,6 @@ extern "C" char * strerror(int n); #endif -#ifdef HAVE_MKSTEMP -#ifndef HAVE_DECL_MKSTEMP -#if defined(__cplusplus) -extern "C" -#endif -int mkstemp(char*); -#endif -#endif - #include <../boost/config.h> #endif @@ -1348,6 +1391,7 @@ if frontend == 'qt4': # still can not find it if not succ: print 'Did not find qt libraries, exiting!' + print 'Please check config.log for more information.' Exit(1) # # Now, determine the correct suffix: @@ -1376,67 +1420,20 @@ if frontend == 'qt4': 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() # # Report results # -# fill in the version info -env['VERSION_INFO'] = '''Configuration - Host type: %s - Special build flags: %s - C Compiler: %s - C Compiler flags: %s %s - C++ Compiler: %s - C++ Compiler LyX flags: %s - C++ Compiler flags: %s %s - Linker flags: %s - Linker user flags: %s -Build info: - Builing directory: %s - Local library directory: %s - Libraries paths: %s - Boost libraries: %s - Frontend libraries: %s - System libraries: %s - include search path: %s -Frontend: - Frontend: %s - Packaging: %s - LyX dir: %s - LyX files dir: %s -''' % (platform_name, - env.subst('$CCFLAGS'), env.subst('$CC'), - env.subst('$CPPFLAGS'), env.subst('$CFLAGS'), - env.subst('$CXX'), env.subst('$CXXFLAGS'), - env.subst('$CPPFLAGS'), env.subst('$CXXFLAGS'), - env.subst('$LINKFLAGS'), env.subst('$LINKFLAGS'), - env.subst('$BUILDDIR'), env.subst('$LOCALLIBPATH'), - str(env['LIBPATH']), str(boost_libraries), - str(frontend_libs), str(system_libs), str(env['CPPPATH']), - frontend, packaging_method, - prefix, env['LYX_DIR']) -if frontend in ['qt4']: - env['VERSION_INFO'] += ''' include dir: %s - library dir: %s - X11: %s -''' % (qt_inc_path, qt_lib_path, env['X11']) print env['VERSION_INFO'] @@ -1516,6 +1513,7 @@ build_tex2lyx = True in ['tex2lyx' in x for x in targets] \ 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 @@ -1640,11 +1638,20 @@ if build_support: 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, + CCFLAGS = [ + '$CCFLAGS', + '-DHAVE_CONFIG_H', + '-DQT_CLEAN_NAMESPACE', + '-DQT_GENUINE_STR', + '-DQT_NO_STL', + '-DQT_NO_KEYWORDS', + ] + ) Alias('support', support) @@ -1722,19 +1729,9 @@ if build_qt4: print "Processing files in src/frontends/qt4..." - qt4_moc_files = ["$BUILDDIR/common/frontends/qt4/%s" % x for x in src_frontends_qt4_moc_files] - - # - # Compile resources - # - resources = [frontend_env.Uic4(x.split('.')[0]) for x in \ - ["$BUILDDIR/common/frontends/qt4/ui/%s" % x for x in src_frontends_qt4_ui_files]] - # # moc qt4_moc_files, the moced files are included in the original 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', source = ['$BUILDDIR/common/frontends/qt4/%s' % x for x in src_frontends_qt4_files], @@ -1744,6 +1741,7 @@ if build_qt4: '$BUILDDIR/common/images', '$BUILDDIR/common/frontends', '$BUILDDIR/common/frontends/qt4', + '$BUILDDIR/common/frontends/qt4/ui', '$BUILDDIR/common/frontends/controllers' ], CCFLAGS = [ @@ -1820,9 +1818,6 @@ if build_lyxbase: # 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') - if env.has_key('USE_ASPELL') and env['USE_ASPELL']: src_post_files.append('ASpell.cpp') elif env.has_key('USE_PSPELL') and env['USE_PSPELL']: @@ -1912,36 +1907,6 @@ if build_msvs_projects: ) 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, @@ -1952,11 +1917,9 @@ if build_msvs_projects: 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] + \ @@ -1976,6 +1939,73 @@ if build_msvs_projects: 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 @@ -1988,8 +2018,10 @@ if update_po: 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 if x != 'version.cpp'] + \ - ['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files + src_support_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] + \ @@ -1997,12 +2029,10 @@ if update_po: ['$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 ] + \ - ['$TOP_SRCDIR/src/version.cpp.in', '$TOP_SRCDIR/src/support/Package.cpp.in',\ - '$TOP_SRCDIR/src/ASpell.cpp', '$TOP_SRCDIR/src/ISpell.cpp', '$TOP_SRCDIR/src/PSpell.cpp'] + ['$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', @@ -2011,18 +2041,21 @@ if update_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" '''] @@ -2172,10 +2205,12 @@ if build_install: ('bind/pt', lib_bind_pt_files), ('bind/sv', lib_bind_sv_files), ('doc', lib_doc_files), + ('doc/biblio', lib_doc_biblio_files), ('doc/clipart', lib_doc_clipart_files), ('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), @@ -2199,6 +2234,7 @@ if build_install: ('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), @@ -2213,7 +2249,7 @@ if build_install: ('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), @@ -2308,6 +2344,18 @@ if build_installer: 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) @@ -2348,6 +2396,7 @@ if build_installer: '$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']: @@ -2359,6 +2408,7 @@ if build_installer: 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')