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
# scons asks for 1.5.2, lyx requires 2.3
EnsurePythonVersion(2, 3)
-# Please use at least 0.96.92 (not 0.96.1)
-EnsureSConsVersion(0, 96)
-# also check for minor version number for scons 0.96
-from SCons import __version__
-# allow the use of snapshot version of scons
-__version__ = __version__.split('d')[0]
-version = map(int, __version__.split('.'))
-if version[0] == 0 and version[1] == 96 and version[2] < 92:
- print "Scons >= 0.96.92 is required."
- Exit(1)
-
+# Please use at least version 0.97
+EnsureSConsVersion(0, 97)
#----------------------------------------------------------
# Global definitions
#
# get version number from configure.ac so that JMarc does
# not have to change SConstruct during lyx release
-package_version, lyx_date = utils.getVerFromConfigure(top_src_dir)
+package_version, majmin_ver, lyx_date = utils.getVerFromConfigure(top_src_dir)
package_cygwin_version = '%s-1' % package_version
boost_version = ['1_34']
print "Getting options from config.py..."
print open('config.py').read()
-opts = Options(['config.py'])
-opts.AddOptions(
+opts = Variables(['config.py'])
+opts.AddVariables(
# frontend
- EnumOption('frontend', 'Main GUI', 'qt4',
+ EnumVariable('frontend', 'Main GUI', 'qt4',
allowed_values = ('qt4',) ),
# debug or release build
- EnumOption('mode', 'Building method', default_build_mode,
+ EnumVariable('mode', 'Building method', default_build_mode,
allowed_values = ('debug', 'release') ),
# boost libraries
- EnumOption('boost',
+ EnumVariable('boost',
'Use included, system boost library, or try sytem boost first.',
'auto', allowed_values = (
'auto', # detect boost, if not found, use included
'system', # always use system boost, fail if can not find
) ),
#
- EnumOption('gettext',
+ EnumVariable('gettext',
'Use included, system gettext library, or try sytem gettext first',
'auto', allowed_values = (
'auto', # detect gettext, if not found, use included
'system', # always use system gettext, fail if can not find
) ),
#
- EnumOption('spell', 'Choose spell checker to use.', 'auto',
+ EnumVariable('spell', 'Choose spell checker to use.', 'auto',
allowed_values = ('aspell', 'pspell', 'ispell', 'auto', 'no') ),
# packaging method
- EnumOption('packaging', 'Packaging method to use.', default_packaging_method,
+ EnumVariable('packaging', 'Packaging method to use.', default_packaging_method,
allowed_values = ('windows', 'posix', 'macosx')),
#
- BoolOption('fast_start', 'This option is obsolete.', False),
+ BoolVariable('fast_start', 'This option is obsolete.', False),
# No precompiled header support (too troublesome to make it work for msvc)
- # BoolOption('pch', 'Whether or not use pch', False),
+ # BoolVariable('pch', 'Whether or not use pch', False),
# enable assertion, (config.h has ENABLE_ASSERTIOS
- BoolOption('assertions', 'Use assertions', True),
+ BoolVariable('assertions', 'Use assertions', True),
# 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),
+ BoolVariable('concept_checks', 'Enable concept checks', True),
#
- BoolOption('nls', 'Whether or not use native language support', True),
+ BoolVariable('nls', 'Whether or not use native language support', True),
#
- BoolOption('profiling', 'Whether or not enable profiling', False),
+ BoolVariable('profiling', 'Whether or not enable profiling', False),
# config.h define _GLIBCXX_DEBUG and _GLIBCXX_DEBUG_PEDANTIC
- BoolOption('stdlib_debug', 'Whether or not turn on stdlib debug', False),
+ BoolVariable('stdlib_debug', 'Whether or not turn on stdlib debug', False),
# using x11?
- BoolOption('X11', 'Use x11 windows system', default_with_x),
+ BoolVariable('X11', 'Use x11 windows system', default_with_x),
# use MS VC++ to build lyx
- BoolOption('use_vc', 'Use MS VC++ to build lyx (cl.exe will be probed)', None),
+ BoolVariable('use_vc', 'Use MS VC++ to build lyx (cl.exe will be probed)', None),
#
- PathOption('qt_dir', 'Path to qt directory', None),
+ PathVariable('qt_dir', 'Path to qt directory', None),
#
- PathOption('qt_inc_path', 'Path to qt include directory', None),
+ PathVariable('qt_inc_path', 'Path to qt include directory', None),
#
- PathOption('qt_lib_path', 'Path to qt library directory', None),
+ PathVariable('qt_lib_path', 'Path to qt library directory', None),
# extra include and libpath
- PathOption('extra_inc_path', 'Extra include path', None),
+ PathVariable('extra_inc_path', 'Extra include path', None),
#
- PathOption('extra_lib_path', 'Extra library path', None),
+ PathVariable('extra_lib_path', 'Extra library path', None),
#
- PathOption('extra_bin_path', 'A convenient way to add a path to $PATH', None),
+ PathVariable('extra_bin_path', 'A convenient way to add a path to $PATH', None),
#
- PathOption('extra_inc_path1', 'Extra include path', None),
+ PathVariable('extra_inc_path1', 'Extra include path', None),
#
- PathOption('extra_lib_path1', 'Extra library path', None),
+ PathVariable('extra_lib_path1', 'Extra library path', None),
#
('rebuild', 'Obsolete option', None),
# can be set to a non-existing directory
# 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),
# whether or not build bundle installer
- BoolOption('bundle', 'Whether or not build bundle installer', False),
+ BoolVariable('bundle', 'Whether or not build bundle installer', False),
# the bundle directory, containing bundled applications
- PathOption('bundle_dir', 'path to the bundle dependency package with miktex setup.exe etc', None),
+ PathVariable('bundle_dir', 'path to the bundle dependency package with miktex setup.exe etc', None),
# build directory, will use $mode if not set
('build_dir', 'Build directory', None),
# version suffix
#
('optimization', 'optimization CCFLAGS option.', None),
#
- PathOption('exec_prefix', 'install architecture-independent executable files in PREFIX', None),
+ PathVariable('exec_prefix', 'install architecture-independent executable files in PREFIX', None),
# log file
('logfile', 'save commands (not outputs) to logfile', default_log_file),
# provided for backward compatibility
# allowed options
all_options = [x.key for x in opts.options]
-# copied from SCons/Options/BoolOption.py
+# copied from SCons/Variables/BoolVariable.py
# We need to use them before a boolean ARGUMENTS option is available
# in env as bool.
true_strings = ('y', 'yes', 'true', 't', '1', 'on' , 'all' )
# check available boost libs (since lyx1.4 does not use iostream)
boost_libs = []
-for lib in ['signals', 'regex', 'filesystem', 'iostreams']:
+for lib in ['signals', 'regex']:
if os.path.isdir(os.path.join(top_src_dir, 'boost', 'libs', lib)):
boost_libs.append(lib)
#
# install customized builders
env['BUILDERS']['substFile'] = Builder(action = utils.env_subst)
-env['BUILDERS']['installTOC'] = Builder(action = utils.env_toc)
+#env['BUILDERS']['installTOC'] = Builder(action = utils.env_toc)
env['BUILDERS']['potfiles'] = Builder(action = utils.env_potfiles)
#('newapis.h', 'HAVE_NEWAPIS_H', 'c'),
],
custom_tests = [
- (env.has_key('assertions') and env['assertions'],
+ (env.has_key('assertions') and env['assertions'] and devel_version,
'ENABLE_ASSERTIONS',
'Define if you want assertions to be enabled in the code'
),
# determine headers to use
spell_opt = ARGUMENTS.get('spell', 'auto')
env['USE_ASPELL'] = False
-env['USE_PSPELL'] = False
-env['USE_ISPELL'] = False
if spell_opt in ['auto', 'aspell'] and conf.CheckLib(aspell_lib):
spell_engine = 'USE_ASPELL'
-elif spell_opt in ['auto', 'pspell'] and conf.CheckLib('pspell'):
- spell_engine = 'USE_PSPELL'
-elif spell_opt in ['auto', 'ispell'] and conf.CheckLib('ispell'):
- spell_engine = 'USE_ISPELL'
else:
spell_engine = None
'Define to the 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,
+ 'Versioned env var for system dir'),
+ ('#define LYX_USERDIR_VER "LYX_USERDIR_%sx"' % majmin_ver,
+ 'Versioned env var for user dir'),
('#define LYX_DATE "%s"' % lyx_date,
'Date of release'),
('#define PROGRAM_SUFFIX "%s"' % program_suffix,
)
# these keys are needed in env
-for key in ['USE_ASPELL', 'USE_PSPELL', 'USE_ISPELL', 'HAVE_FCNTL',\
+for key in ['USE_ASPELL', 'HAVE_FCNTL',\
'HAVE_LIBGDI32', 'HAVE_LIBAIKSAURUS', 'AIKSAURUS_LIB']:
# USE_ASPELL etc does not go through result
if result.has_key(key):
('HAVE_LIBGDI32', 'gdi32'),
('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']),
('USE_ASPELL', aspell_lib),
- ('USE_ISPELL', 'ispell'),
- ('USE_PSPELL', 'pspell'),
]
for lib in libs:
# to be built with all the include directories etc
#
if frontend == 'qt4':
- frontend_env = env.Copy()
+ frontend_env = env.Clone()
frontend_env['BUILDERS']['qtResource'] = Builder(action = utils.env_qtResource)
# handle qt related user specified paths
#
# src/support
#
+frontend_env['QT4_MOCHPREFIX'] = 'moc_'
+frontend_env['QT4_MOCHSUFFIX'] = '.cpp'
+
+support_moced_files = [frontend_env.Moc4('$BUILDDIR/src/support/%s' % x)
+ for x in src_support_header_files ]
support = frontend_env.StaticLibrary(
target = '$LOCALLIBPATH/support',
- source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files] + \
- ['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_files],
+ source = ['$BUILDDIR/src/support/%s' % x for x in src_support_files],
CCFLAGS = [
'$CCFLAGS',
'-DHAVE_CONFIG_H',
- '-DQT_CLEAN_NAMESPACE',
- '-DQT_GENUINE_STR',
'-DQT_NO_STL',
'-DQT_NO_KEYWORDS',
],
- CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
+ CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support']
)
Alias('support', support)
#
# src/frontend/qt4
#
-frontend_env['QT4_MOCHPREFIX'] = ''
-frontend_env['QT4_MOCHSUFFIX'] = '_moc.cpp'
-
# 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)
CCFLAGS = [
'$CCFLAGS',
'-DHAVE_CONFIG_H',
- '-DQT_CLEAN_NAMESPACE',
- '-DQT_GENUINE_STR',
'-DQT_NO_STL',
'-DQT_NO_KEYWORDS',
]
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_32x32.ico', '$LOCALLIBPATH/client.rc')
+ utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/client.rc')
)
Alias('client', frontend_env.Command(os.path.join('$BUILDDIR', os.path.split(str(client[0]))[1]),
client, [Copy('$TARGET', '$SOURCE')]))
#
# tex2lyx
#
-for file in src_tex2lyx_copied_files:
+for file in src_tex2lyx_copied_files + src_tex2lyx_copied_header_files:
frontend_env.Command('$BUILDDIR/src/tex2lyx/'+file, '$TOP_SRCDIR/src/'+file,
[Copy('$TARGET', '$SOURCE')])
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_32x32.ico', '$LOCALLIBPATH/tex2lyx.rc'),
- CPPPATH = ['$BUILDDIR/src/tex2lyx', '$CPPPATH'],
+ utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/tex2lyx.rc'),
+ CPPPATH = ['$BUILDDIR/src/tex2lyx', '$BUILDDIR/src', '$CPPPATH'],
LIBPATH = ['#$LOCALLIBPATH', '$LIBPATH'],
CCFLAGS = ['$CCFLAGS', '-DTEX2LYX'],
)
#
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']:
- src_post_files.append('PSpell.cpp')
-elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
- src_post_files.append('ISpell.cpp')
# msvc requires at least one source file with main()
# so I exclude main.cpp from lyxbase
lyx = frontend_env.Program(
target = '$BUILDDIR/lyx',
source = ['$BUILDDIR/src/main.cpp'] + \
- utils.createResFromIcon(frontend_env, 'lyx_32x32.ico', '$LOCALLIBPATH/lyx.rc'),
+ utils.createResFromIcon(frontend_env, 'lyx.ico', '$LOCALLIBPATH/lyx.rc'),
LIBS = [
'lyxbase_pre',
'mathed',
frontend,
'graphics',
'support',
- 'lyxbase_post',
] +
- boost_libraries +
+ boost_libraries + ['lyxbase_post'] +
frontend_libs +
intl_libs +
socket_libs +
['$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/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_files + src_frontends_qt4_moc_files] + \
+ ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_header_files + src_frontends_qt4_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, external_l10n
+ # build language_l10n.pot, encodings_10n.pot, ui_l10n.pot, layouts_l10n.pot, qt4_l10n.pot, external_l10n, formats_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',
'$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/encodings_l10n.pot', '$TOP_SRCDIR/lib/encodings',
+ '$LYX_POT -b $TOP_SRCDIR -t encodings -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'),
+ env.Command('$BUILDDIR/po/formats_l10n.pot', '$TOP_SRCDIR/lib/configure.py',
+ '$LYX_POT -b $TOP_SRCDIR -t formats -o $TARGET $SOURCES'),
], utils.env_cat),
['$MSGUNIQ -o $TARGET $SOURCE',
'''$XGETTEXT --default-domain=${TARGET.base} \
('doc', lib_doc_files),
('doc/biblio', lib_doc_biblio_files),
('doc/clipart', lib_doc_clipart_files),
+ ('doc/ca', lib_doc_ca_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/biblio', lib_doc_es_biblio_files),
('doc/es/clipart', lib_doc_es_clipart_files),
('doc/eu', lib_doc_eu_files),
('doc/fr', lib_doc_fr_files),
+ ('doc/fr/clipart', lib_doc_fr_clipart_files),
+ ('doc/gl', lib_doc_gl_files),
('doc/he', lib_doc_he_files),
('doc/hu', lib_doc_hu_files),
+ ('doc/id', lib_doc_id_files),
('doc/it', lib_doc_it_files),
+ ('doc/it/clipart', lib_doc_it_clipart_files),
+ ('doc/ja', lib_doc_ja_files),
+ ('doc/ja/clipart', lib_doc_ja_clipart_files),
('doc/nl', lib_doc_nl_files),
('doc/nb', lib_doc_nb_files),
('doc/pl', lib_doc_pl_files),
('doc/sk', lib_doc_sk_files),
('doc/sl', lib_doc_sl_files),
('doc/sv', lib_doc_sv_files),
+ ('doc/uk', lib_doc_uk_files),
+ ('doc/uk/clipart', lib_doc_uk_clipart_files),
('examples', lib_examples_files),
('examples/ca', lib_examples_ca_files),
('examples/cs', lib_examples_cs_files),
('examples/eu', lib_examples_eu_files),
('examples/fa', lib_examples_fa_files),
('examples/fr', lib_examples_fr_files),
+ ('examples/gl', lib_examples_gl_files),
('examples/he', lib_examples_he_files),
('examples/hu', lib_examples_hu_files),
+ ('examples/id', lib_examples_id_files),
('examples/it', lib_examples_it_files),
+ ('examples/ja', lib_examples_ja_files),
('examples/nl', lib_examples_nl_files),
('examples/pl', lib_examples_pl_files),
('examples/pt', lib_examples_pt_files),
+ ('examples/ro', lib_examples_ro_files),
('examples/ru', lib_examples_ru_files),
('examples/sl', lib_examples_sl_files),
- ('examples/ro', lib_examples_ro_files),
+ ('examples/uk', lib_examples_uk_files),
('fonts', lib_fonts_files),
('images', lib_images_files),
('images/math', lib_images_math_files),
Alias('install', share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
sys.path.append(share_dest_dir + '/lyx2lyx')
- # generate TOC files for each doc
- languages = depend.all_documents(env.Dir('$TOP_SRCDIR/lib/doc').abspath)
- tocs = []
- for lang in languages.keys():
- if os.path.isdir(os.path.join(env.Dir('$TOP_SRCDIR/lib/doc').abspath, lang)):
- toc = env.installTOC(os.path.join(share_dest_dir, 'doc', lang, 'TOC.lyx'),
- languages[lang])
- tocs.append(toc)
- # doc_toc.build_toc needs a installed version of lyx2lyx to execute
- env.Depends(toc, share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
- else:
- # this is for English
- toc = env.installTOC(os.path.join(share_dest_dir, 'doc', 'TOC.lyx'),
- languages[lang])
- tocs.append(toc)
- env.Depends(toc, share_dest_dir + '/lyx2lyx/lyx2lyx_version.py')
- Alias('install', tocs)
-
if platform_name == 'cygwin':
# cygwin packaging requires a file /usr/share/doc/Cygwin/foot-vendor-suffix.README
Cygwin_README = os.path.join(dest_prefix_dir, 'share', 'doc', 'Cygwin',
Alias('install', postinstall_path)
# man
env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'),
- env.subst('$TOP_SRCDIR/lyx.man'))
+ env.subst('$TOP_SRCDIR/lyx.1in'))
env.InstallAs(os.path.join(man_dest_dir, 'tex2lyx' + version_suffix + '.1'),
- env.subst('$TOP_SRCDIR/src/tex2lyx/tex2lyx.man'))
+ env.subst('$TOP_SRCDIR/src/tex2lyx/tex2lyx.1in'))
env.InstallAs(os.path.join(man_dest_dir, 'lyxclient' + version_suffix + '.1'),
- env.subst('$TOP_SRCDIR/src/client/lyxclient.man'))
+ env.subst('$TOP_SRCDIR/src/client/lyxclient.1in'))
Alias('install', [os.path.join(man_dest_dir, x + version_suffix + '.1') for
x in ['lyx', 'tex2lyx', 'lyxclient']])
# locale files?
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/gui/%s' \
+ % x for x in development_Win32_packaging_installer_gui] + \
['$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]
+ % x for x in development_Win32_packaging_installer_lang] + \
+ ['$TOP_SRCDIR/development/Win32/packaging/installer/setup/%s' \
+ % x for x in development_Win32_packaging_installer_setup]
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