) ),
#
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')),
# 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 = []
# 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:
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)
('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'
),
#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:
# 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'):
+ spell_engine = 'USE_HUNSPELL'
else:
spell_engine = None
('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'),
)
# 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):
# 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', 'shell32', 'advapi32', 'zdll']
+ system_libs += ['ole32', 'shlwapi', 'psapi', 'shell32', 'advapi32', 'zdll']
else:
- system_libs += ['shlwapi', 'stdc++', 'z']
+ system_libs += ['shlwapi', 'psapi', 'stdc++', 'z']
elif platform_name == 'cygwin' and env['X11']:
system_libs += ['GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr',
'Xcursor', 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE',
('HAVE_LIBGDI32', 'gdi32'),
('HAVE_LIBAIKSAURUS', env['AIKSAURUS_LIB']),
('USE_ASPELL', aspell_lib),
+ ('USE_ENCHANT', 'enchant'),
+ ('USE_HUNSPELL', 'hunspell')
]
for lib in libs:
# 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
# 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,
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
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]
# 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'], \
+ 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
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.BuildDir('$BUILDDIR/src', '$TOP_SRCDIR/src', duplicate = 0)
print "Building all targets recursively"
#
# 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 = [
)
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
# 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')
+elif env.has_key('USE_ENCHANT') and env['USE_ENCHANT']:
+ src_post_files.append('EnchantChecker.cpp')
+elif env.has_key('USE_HUNSPELL') and env['USE_HUNSPELL']:
+ src_post_files.append('HunspellChecker.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/commands/%s' % x for x in lib_images_commands_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 +
('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/id/clipart', lib_doc_id_clipart_files),
('doc/it', lib_doc_it_files),
('doc/it/clipart', lib_doc_it_clipart_files),
('doc/ja', lib_doc_ja_files),
('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/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/sk', lib_examples_sk_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),
('lyx2lyx', lib_lyx2lyx_files),
('scripts', lib_scripts_files),
('templates', lib_templates_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),
env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'),
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.1'))
+ 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?
projects / lyx.git / blobdiff