X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fscons%2FSConstruct;h=aa7d9a2a235778158faf93bf17bf61598979762a;hb=55a3dd7b346d29a52ba305a4558e9e380ef50f47;hp=d1f7457d5240bff42fbf201ec22ea6ff5217e021;hpb=b0936fac4c9897d647561f05af6ec09c3d7f1f05;p=lyx.git diff --git a/development/scons/SConstruct b/development/scons/SConstruct index d1f7457d52..aa7d9a2a23 100644 --- a/development/scons/SConstruct +++ b/development/scons/SConstruct @@ -12,7 +12,7 @@ # to INSTALL.scons for detailed instructions. # -import os, sys, copy, cPickle, glob, time +import os, sys, copy, cPickle, glob, time, re # determine where I am ... # @@ -49,6 +49,13 @@ EnsureSConsVersion(0, 97) # 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'] @@ -136,7 +143,7 @@ opts.AddVariables( ) ), # EnumVariable('spell', 'Choose spell checker to use.', 'auto', - allowed_values = ('aspell', 'pspell', 'ispell', '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')), @@ -182,7 +189,7 @@ opts.AddVariables( # replace the default name and location of the windows installer ('win_installer', 'name or full path to the windows installer', None), # the deps package used to create minimal installer (qt and other libraries) - ('deps_dir', 'path to the development depedency packages with zlib, iconv, zlib and qt libraries', None), + ('deps_dir', 'path to the development depedency packages with zlib, iconv and qt libraries', None), # whether or not build bundle installer BoolVariable('bundle', 'Whether or not build bundle installer', False), # the bundle directory, containing bundled applications @@ -411,6 +418,7 @@ if platform_name == 'win32': # 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 = [] @@ -420,6 +428,7 @@ if use_vc: # 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: @@ -514,7 +523,7 @@ setEnvVariable(env, 'CPP') 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) @@ -577,10 +586,10 @@ else: print 'pkg-config >= 0.1.50 is not found' env['HAS_PKG_CONFIG'] = False -# zlib? This is required. +# zlib? zdll is required for MSVC 2005 and 2008, for 2010 only zlib is required 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!' + or (use_vc and not conf.CheckLibWithHeader('zlib', 'zlib.h', 'C')): + print 'Did not find zlib.lib or zlib.h, exiting!' print 'Please check config.log for more information.' Exit(1) if conf.CheckLib('iconv'): @@ -711,6 +720,8 @@ aspell_lib = 'aspell' if platform_name == 'win32' and mode == 'debug' and use_vc: aspell_lib = 'aspelld' +hunspell_lib = 'libhunspell' + # check the existence of config.h config_h = os.path.join(env.Dir('$BUILDDIR/src').path, 'config.h') boost_config_h = os.path.join(env.Dir('$BUILDDIR/boost').path, 'config.h') @@ -740,10 +751,9 @@ utils.createConfigFile(conf, ('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 devel_version, + (env.has_key('assertions') and env['assertions'] and mode == 'debug', 'ENABLE_ASSERTIONS', 'Define if you want assertions to be enabled in the code' ), @@ -775,10 +785,6 @@ utils.createConfigFile(conf, #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: @@ -810,8 +816,14 @@ else: # 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_lib): + spell_engine = 'USE_HUNSPELL' else: spell_engine = None @@ -897,6 +909,7 @@ result = utils.createConfigFile(conf, ('locale.h', 'HAVE_LOCALE_H', 'c'), ('process.h', 'HAVE_PROCESS_H', 'c'), ('stdlib.h', 'HAVE_STDLIB_H', 'c'), + ('string.h', 'HAVE_STRING_H', 'c'), ('sys/stat.h', 'HAVE_SYS_STAT_H', 'c'), ('sys/time.h', 'HAVE_SYS_TIME_H', 'c'), ('sys/types.h', 'HAVE_SYS_TYPES_H', 'c'), @@ -1020,6 +1033,10 @@ result = utils.createConfigFile(conf, '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, @@ -1038,6 +1055,8 @@ result = utils.createConfigFile(conf, 'Top source directory'), ('#define BOOST_ALL_NO_LIB 1', 'disable automatic linking of boost libraries.'), + ('#define LYX_USE_TR1 1', + 'use TR1'), ('#define USE_%s_PACKAGING 1' % packaging_method.upper(), 'Packaging method'), ('#define AIKSAURUS_H_LOCATION ' + aik_location, @@ -1068,7 +1087,7 @@ char * strerror(int n); ) # 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): @@ -1212,7 +1231,7 @@ if platform_name in ['win32', 'cygwin']: # the final link step needs stdc++ to succeed under mingw # FIXME: shouldn't g++ automatically link to stdc++? if use_vc: - system_libs += ['ole32', 'shlwapi', 'psapi', 'shell32', 'advapi32', 'zdll'] + system_libs += ['ole32', 'shlwapi', 'psapi', 'shell32', 'advapi32'] else: system_libs += ['shlwapi', 'psapi', 'stdc++', 'z'] elif platform_name == 'cygwin' and env['X11']: @@ -1226,6 +1245,8 @@ libs = [ ('HAVE_LIBGDI32', 'gdi32'), ('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']), ('USE_ASPELL', aspell_lib), + ('USE_ENCHANT', 'enchant'), + ('USE_HUNSPELL', hunspell_lib) ] for lib in libs: @@ -1279,30 +1300,29 @@ if platform_name == 'cygwin': # to be built with all the include directories etc # if frontend == 'qt4': - frontend_env = env.Clone() - frontend_env['BUILDERS']['qtResource'] = Builder(action = utils.env_qtResource) + env['BUILDERS']['qtResource'] = Builder(action = utils.env_qtResource) # handle qt related user specified paths # set environment so that moc etc can be found even if its path is not set properly - if frontend_env.has_key('qt_dir') and frontend_env['qt_dir']: - frontend_env['QTDIR'] = frontend_env['qt_dir'] - if os.path.isdir(os.path.join(frontend_env['qt_dir'], 'bin')): - os.environ['PATH'] += os.pathsep + os.path.join(frontend_env['qt_dir'], 'bin') - frontend_env.PrependENVPath('PATH', os.path.join(frontend_env['qt_dir'], 'bin')) - if os.path.isdir(os.path.join(frontend_env['qt_dir'], 'lib')): - frontend_env.PrependENVPath('PKG_CONFIG_PATH', os.path.join(frontend_env['qt_dir'], 'lib')) + if env.has_key('qt_dir') and env['qt_dir']: + env['QTDIR'] = env['qt_dir'] + if os.path.isdir(os.path.join(env['qt_dir'], 'bin')): + os.environ['PATH'] += os.pathsep + os.path.join(env['qt_dir'], 'bin') + env.PrependENVPath('PATH', os.path.join(env['qt_dir'], 'bin')) + if os.path.isdir(os.path.join(env['qt_dir'], 'lib')): + env.PrependENVPath('PKG_CONFIG_PATH', os.path.join(env['qt_dir'], 'lib')) # if separate qt_lib_path is given - if frontend_env.has_key('qt_lib_path') and frontend_env['qt_lib_path']: - qt_lib_path = frontend_env.subst('$qt_lib_path') - frontend_env.AppendUnique(LIBPATH = [qt_lib_path]) - frontend_env.PrependENVPath('PKG_CONFIG_PATH', qt_lib_path) + if env.has_key('qt_lib_path') and env['qt_lib_path']: + qt_lib_path = env.subst('$qt_lib_path') + env.AppendUnique(LIBPATH = [qt_lib_path]) + env.PrependENVPath('PKG_CONFIG_PATH', qt_lib_path) else: qt_lib_path = None # if separate qt_inc_path is given - if frontend_env.has_key('qt_inc_path') and frontend_env['qt_inc_path']: - qt_inc_path = frontend_env['qt_inc_path'] + if env.has_key('qt_inc_path') and env['qt_inc_path']: + qt_inc_path = env['qt_inc_path'] else: qt_inc_path = None @@ -1312,18 +1332,20 @@ if frontend == 'qt4': # NOTE: I have to patch qt4.py since it does not automatically # process .C file!!! (add to cxx_suffixes ) # - frontend_env.Tool('qt4', [scons_dir]) - frontend_env['QT_AUTOSCAN'] = 0 - frontend_env['QT4_AUTOSCAN'] = 0 - frontend_env['QT4_UICDECLFLAGS'] = '-tr lyx::qt_' + env.Tool('qt4', [scons_dir]) + env['QT_AUTOSCAN'] = 0 + env['QT4_AUTOSCAN'] = 0 + env['QT4_UICDECLFLAGS'] = '-tr lyx::qt_' + if platform_name == 'win32': + env['QT4_MOCFROMHFLAGS'] = '-D_WIN32' if qt_lib_path is None: - qt_lib_path = os.path.join(frontend_env.subst('$QTDIR'), 'lib') + qt_lib_path = os.path.join(env.subst('$QTDIR'), 'lib') if qt_inc_path is None: - qt_inc_path = os.path.join(frontend_env.subst('$QTDIR'), 'include') + qt_inc_path = os.path.join(env.subst('$QTDIR'), 'include') - conf = Configure(frontend_env, + conf = Configure(env, custom_tests = { 'CheckPackage' : utils.checkPackage, 'CheckCommand' : utils.checkCommand, @@ -1332,10 +1354,10 @@ if frontend == 'qt4': succ = False # first: try pkg_config - if frontend_env['HAS_PKG_CONFIG']: + if env['HAS_PKG_CONFIG']: succ = conf.CheckPackage('QtCore') or conf.CheckPackage('QtCore4') # FIXME: use pkg_config information? - #frontend_env['QT4_PKG_CONFIG'] = succ + #env['QT4_PKG_CONFIG'] = succ # second: try to link to it if not succ: # Under linux, I can test the following perfectly @@ -1367,7 +1389,7 @@ if frontend == 'qt4': else: qt_lib_suffix = '' use_qt_debug_libs = False - frontend_env.EnableQt4Modules(qt_libs, debug = (mode == 'debug' and use_qt_debug_libs)) + env.EnableQt4Modules(qt_libs, debug = (mode == 'debug' and use_qt_debug_libs)) frontend_libs = [x + qt_lib_suffix for x in qt_libs] qtcore_lib = ['QtCore' + qt_lib_suffix] @@ -1376,15 +1398,14 @@ if frontend == 'qt4': print 'uic or moc command is not found for frontend', frontend Exit(1) - # 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: - frontend_env['LINKCOM'] = [frontend_env['LINKCOM'], \ - 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \ - env.File('$BUILDDIR/lyx.exe.manifest').path] + # if MSVC 2005 and 2008 is used, we will need to embed lyx.exe.manifest to lyx.exe + # for MSVC 2010 this is not necessary + #if use_vc: + # env['LINKCOM'] = [env['LINKCOM'], \ + # 'mt.exe /MANIFEST %s /outputresource:$TARGET;1' % \ + # env.File('$BUILDDIR/lyx.exe.manifest').path] - frontend_env = conf.Finish() + env = conf.Finish() # # Report results @@ -1424,10 +1445,10 @@ Help(opts.GenerateHelpText(env)) 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) -frontend_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" @@ -1485,12 +1506,12 @@ if (included_gettext and not libExists('included_intl')) or 'intl' in BUILD_TARG # # src/support # -frontend_env['QT4_MOCHPREFIX'] = 'moc_' -frontend_env['QT4_MOCHSUFFIX'] = '.cpp' +env['QT4_MOCHPREFIX'] = 'moc_' +env['QT4_MOCHSUFFIX'] = '.cpp' -support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x) +support_moced_files = [env.Moc4('$BUILDDIR/src/support/%s' % x) for x in src_support_header_files ] -support = frontend_env.StaticLibrary( +support = env.StaticLibrary( target = '$LOCALLIBPATH/support', source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files], CCFLAGS = [ @@ -1503,97 +1524,16 @@ support = frontend_env.StaticLibrary( ) Alias('support', support) - -# -# src/mathed -# -mathed = env.StaticLibrary( - target = '$LOCALLIBPATH/mathed', - source = ['$BUILDDIR/src/mathed/%s' % x for x in src_mathed_files] -) -Alias('mathed', mathed) - - -# -# src/insets -# -insets = env.StaticLibrary( - target = '$LOCALLIBPATH/insets', - source = ['$BUILDDIR/src/insets/%s' % x for x in src_insets_files] -) -Alias('insets', insets) - - -# -# src/frontends -# -frontends = env.StaticLibrary( - target = '$LOCALLIBPATH/frontends', - source = ['$BUILDDIR/src/frontends/%s' % x for x in src_frontends_files] -) -Alias('frontends', frontends) - - -# -# src/graphics -# -graphics = env.StaticLibrary( - target = '$LOCALLIBPATH/graphics', - source = ['$BUILDDIR/src/graphics/%s' % x for x in src_graphics_files] -) -Alias('graphics', graphics) - - -# -# src/frontend/qt4 -# -# tells scons how to get these moced files, although not all moced files are needed -# (or are actually generated). -qt4_moced_files = [frontend_env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x) - for x in src_frontends_qt4_header_files ] -ui_files = [frontend_env.Uic4('$BUILDDIR/src/frontends/qt4/ui/%s' % x.split('.')[0]) - for x in src_frontends_qt4_ui_files] -resource = frontend_env.Qrc(frontend_env.qtResource( - '$BUILDDIR/src/frontends/qt4/Resource.qrc', - ['$TOP_SRCDIR/lib/images/%s' % x for x in lib_images_files] + - ['$TOP_SRCDIR/lib/images/math/%s' % x for x in lib_images_math_files] + - ['$TOP_SRCDIR/lib/images/commands/%s' % x for x in lib_images_commands_files])) -# -# moc qt4_moc_files, the moced files are included in the original files -# -qt4 = frontend_env.StaticLibrary( - target = '$LOCALLIBPATH/qt4', - source = ['$BUILDDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files] + resource, - CPPPATH = [ - '$CPPPATH', - '$BUILDDIR/src', - '$BUILDDIR/src/images', - '$BUILDDIR/src/frontends', - '$BUILDDIR/src/frontends/qt4', - '$BUILDDIR/src/frontends/qt4/ui', - ], - CCFLAGS = [ - '$CCFLAGS', - '-DHAVE_CONFIG_H', - '-DQT_NO_STL', - '-DQT_NO_KEYWORDS', - ] -) -Alias('qt4', qt4) - - -# -# src/client # if env['HAVE_FCNTL']: - client = frontend_env.Program( + client = env.Program( target = '$BUILDDIR/src/client/lyxclient', LIBS = ['support'] + intl_libs + system_libs + socket_libs + boost_libraries + qtcore_lib, source = ['$BUILDDIR/src/client/%s' % x for x in src_client_files] + \ - utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/client.rc') + utils.createResFromIcon(env, 'lyx.ico', '$LOCALLIBPATH/client.rc') ) - Alias('client', frontend_env.Command(os.path.join('$BUILDDIR', os.path.split(str(client[0]))[1]), + Alias('client', env.Command(os.path.join('$BUILDDIR', os.path.split(str(client[0]))[1]), client, [Copy('$TARGET', '$SOURCE')])) else: client = None @@ -1604,60 +1544,82 @@ Alias('client', client) # tex2lyx # for file in src_tex2lyx_copied_files + src_tex2lyx_copied_header_files: - frontend_env.Command('$BUILDDIR/src/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file, + env.Command('$BUILDDIR/src/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file, [Copy('$TARGET', '$SOURCE')]) -tex2lyx = frontend_env.Program( +tex2lyx = env.Program( target = '$BUILDDIR/src/tex2lyx/tex2lyx', LIBS = ['support'] + boost_libraries + intl_libs + system_libs + qtcore_lib, source = ['$BUILDDIR/src/tex2lyx/%s' % x for x in src_tex2lyx_files + src_tex2lyx_copied_files] + \ - utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/tex2lyx.rc'), + utils.createResFromIcon(env, 'lyx.ico', '$LOCALLIBPATH/tex2lyx.rc'), CPPPATH = ['$BUILDDIR/src/tex2lyx', '$BUILDDIR/src', '$CPPPATH'], LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'], CCFLAGS = ['$CCFLAGS', '-DTEX2LYX'], ) -Alias('tex2lyx', frontend_env.Command(os.path.join('$BUILDDIR', os.path.split(str(tex2lyx[0]))[1]), +Alias('tex2lyx', env.Command(os.path.join('$BUILDDIR', os.path.split(str(tex2lyx[0]))[1]), tex2lyx, [Copy('$TARGET', '$SOURCE')])) Alias('tex2lyx', tex2lyx) # -# src/ +# Build lyx with given frontend # if env.has_key('USE_ASPELL') and env['USE_ASPELL']: - src_post_files.append('ASpell.cpp') - -# msvc requires at least one source file with main() -# so I exclude main.cpp from lyxbase -lyxbase_pre = env.StaticLibrary( - target = '$LOCALLIBPATH/lyxbase_pre', - source = ['$BUILDDIR/src/%s' % x for x in src_pre_files] -) -lyxbase_post = env.StaticLibrary( - target = '$LOCALLIBPATH/lyxbase_post', - source = ["$BUILDDIR/src/%s" % x for x in src_post_files] -) -Alias('lyxbase', lyxbase_pre) -Alias('lyxbase', lyxbase_post) + 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). +qt4_moced_files = [env.Moc4('$BUILDDIR/src/frontends/qt4/%s' % x) + for x in src_frontends_qt4_header_files ] +src_moced_files = [env.Moc4('$BUILDDIR/src/%s' % x) + for x in src_header_files ] +ui_files = [env.Uic4('$BUILDDIR/src/frontends/qt4/ui/%s' % x.split('.')[0]) + for x in src_frontends_qt4_ui_files] +resource = env.Qrc(env.qtResource( + '$BUILDDIR/src/frontends/qt4/Resource.qrc', + ['$TOP_SRCDIR/lib/images/%s' % x for x in lib_images_files] + + ['$TOP_SRCDIR/lib/images/math/%s' % x for x in lib_images_math_files] + + ['$TOP_SRCDIR/lib/images/classic/%s' % x for x in lib_images_classic_files] + + ['$TOP_SRCDIR/lib/images/commands/%s' % x for x in lib_images_commands_files] + + ['$TOP_SRCDIR/lib/images/oxygen/%s' % x for x in lib_images_oxygen_files])) -# -# Build lyx with given frontend -# -lyx = frontend_env.Program( +lyx = env.Program( target = '$BUILDDIR/lyx', - source = ['$BUILDDIR/src/main.cpp'] + \ - utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/lyx.rc'), + source = ['$BUILDDIR/src/main.cpp'] + + ['$BUILDDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files] + + resource + + ['$BUILDDIR/src/graphics/%s' % x for x in src_graphics_files] + + ['$BUILDDIR/src/mathed/%s' % x for x in src_mathed_files] + + ['$BUILDDIR/src/insets/%s' % x for x in src_insets_files] + + ['$BUILDDIR/src/frontends/%s' % x for x in src_frontends_files] + + ['$BUILDDIR/src/%s' % x for x in src_pre_files] + + ["$BUILDDIR/src/%s" % x for x in src_post_files] + + utils.createResFromIcon(env, 'lyx.ico', '$LOCALLIBPATH/lyx.rc'), + CPPPATH = [ + '$CPPPATH', + '$BUILDDIR/src', + '$BUILDDIR/src/images', + '$BUILDDIR/src/frontends', + '$BUILDDIR/src/frontends/qt4', + '$BUILDDIR/src/frontends/qt4/ui', + ], + CCFLAGS = [ + '$CCFLAGS', + '-DHAVE_CONFIG_H', + '-DQT_NO_STL', + '-DQT_NO_KEYWORDS', + ], LIBS = [ - 'lyxbase_pre', - 'mathed', - 'insets', - 'frontends', - frontend, - 'graphics', 'support', ] + - boost_libraries + ['lyxbase_post'] + + boost_libraries + frontend_libs + intl_libs + socket_libs + @@ -1829,7 +1791,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: languages = None if env.has_key('languages'): languages = env.make_list(env['lanauges']) - # use defulat msgfmt + # use default msgfmt gmo_files = [] if not env['MSGFMT']: print 'msgfmt does not exist. Can not process po files' @@ -1913,9 +1875,6 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('.', 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), @@ -1925,6 +1884,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('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), @@ -1950,11 +1910,13 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('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), @@ -1970,17 +1932,24 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('examples/pt', lib_examples_pt_files), ('examples/ro', lib_examples_ro_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), ('images/math', lib_images_math_files), + ('images/classic', lib_images_classic_files), ('images/commands', lib_images_commands_files), + ('images/oxygen', lib_images_oxygen_files), ('kbd', lib_kbd_files), ('layouts', lib_layouts_files + lib_layouts_inc_files + lib_layouts_module_files), ('lyx2lyx', lib_lyx2lyx_files), ('scripts', lib_scripts_files), ('templates', lib_templates_files), + ('templates/springer', lib_templates_springer_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),