X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=development%2Fscons%2FSConstruct;h=0ff58e302ccdbb11bc7335f2ef7d8db145afc5c3;hb=18f79eeddcf58e2b20c883ca26d895ab34c074c2;hp=634ed1810210ab7860ab19dcf5f326716a98047c;hpb=54870a2c825fd0e2644143174f836b11f863dc07;p=lyx.git diff --git a/development/scons/SConstruct b/development/scons/SConstruct index 634ed18102..0ff58e302c 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'] @@ -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,7 +751,6 @@ 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 mode == 'debug', @@ -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: @@ -816,7 +822,7 @@ 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'): +elif spell_opt in ['auto', 'hunspell'] and conf.CheckLib(hunspell_lib): spell_engine = 'USE_HUNSPELL' else: spell_engine = None @@ -1027,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, @@ -1045,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, @@ -1219,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']: @@ -1234,7 +1246,7 @@ libs = [ ('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']), ('USE_ASPELL', aspell_lib), ('USE_ENCHANT', 'enchant'), - ('USE_HUNSPELL', 'hunspell') + ('USE_HUNSPELL', hunspell_lib) ] for lib in libs: @@ -1386,13 +1398,12 @@ 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: - env['LINKCOM'] = [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] env = conf.Finish() @@ -1434,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) -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" @@ -1555,10 +1566,13 @@ Alias('tex2lyx', tex2lyx) # 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). @@ -1775,7 +1789,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' @@ -1859,9 +1873,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), @@ -1871,6 +1882,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), @@ -1902,6 +1914,7 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('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), @@ -1919,6 +1932,8 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('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), @@ -1929,6 +1944,8 @@ if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS: ('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),