# import all file lists
from scons_manifest import *
-#----------------------------------------------------------
-# Required runtime environment
-#----------------------------------------------------------
-
# scons asks for 1.5.2, lyx requires 2.3
EnsurePythonVersion(2, 3)
# Please use at least 0.96.92 (not 0.96.1)
else:
use_vc = False
-# lyx will be built to $build/build_dir so it is possible
-# to build multiple build_dirs using the same source
-# $mode can be debug or release
if env.has_key('build_dir') and env['build_dir'] is not None:
- # create the directory if needed
- if not os.path.isdir(env['build_dir']):
- try:
- os.makedirs(env['build_dir'])
- except:
- pass
- if not os.path.isdir(env['build_dir']):
- print 'Can not create directory', env['build_dir']
- Exit(3)
env['BUILDDIR'] = env['build_dir']
else:
# Determine the name of the build $mode
# 3. compiler commands and flags like CCFLAGS.
# MSGFMT used to process po files
# 4. Variables that will be used to replace variables in some_file.in
-# src/support/Package.cpp.in:
-# TOP_SRCDIR, LOCALEDIR, LYX_DIR, PROGRAM_SUFFIX
# lib/lyx2lyx/lyx2lyx_version.py.in
# PACKAGE_VERSION
program_suffix = env['version_suffix']
else:
program_suffix = ''
-# used by Package.cpp.in
-env['PROGRAM_SUFFIX'] = program_suffix
+
# whether or not add suffix to file and directory names
add_suffix = packaging_method != 'windows'
-# LYX_DIR are different (used in Package.cpp.in)
-if add_suffix:
- env['LYX_DIR'] = Dir(os.path.join(prefix, share_dir + program_suffix)).abspath
+# Absolute data directory
+if mode == 'release':
+ if add_suffix:
+ env['LYX_DATA_DIR'] = Dir(os.path.join(prefix, share_dir + program_suffix)).abspath
+ else:
+ env['LYX_DATA_DIR'] = Dir(os.path.join(prefix, share_dir)).abspath
else:
- env['LYX_DIR'] = Dir(os.path.join(prefix, share_dir)).abspath
+ # in the debug mode, use $TOP_SRCDIR/lib to make sure lyx can be started from anyway
+ # by using this directory as data directory
+ env['LYX_DATA_DIR'] = os.path.join(env.subst('$TOP_SRCDIR'), 'lib')
# we need absolute path for package.C
env['LOCALEDIR'] = Dir(os.path.join(prefix, locale_dir)).abspath
LINKFLAGS_required = []
CCFLAGS_default = []
-# under windows, scons is confused by .C/.c and uses gcc instead of
-# g++. I am forcing the use of g++ here. This is expected to change
-# after lyx renames all .C files to .cpp
-#
-# save the old c compiler and CCFLAGS (used by libintl)
-C_COMPILER = env.subst('$CC')
-C_CCFLAGS = env.subst('$CCFLAGS').split()
# if we use ms vc, the commands are fine (cl.exe and link.exe)
if use_vc:
# C4819: The file contains a character that cannot be represented
CCFLAGS_required.append('/EHsc')
if mode == 'debug':
CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
- # the flags are also needed in C mode (for intl lib)
- C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MDd'])
else:
CCFLAGS_default.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
- C_CCFLAGS.extend(['/wd4819', '/wd4996', '/nologo', '/MD'])
-else:
- if env.has_key('CXX') and env['CXX']:
- env['CC'] = env.subst('$CXX')
- env['LINK'] = env.subst('$CXX')
- else:
- env['CC'] = 'g++'
- env['LINK'] = 'g++'
# for debug/release mode
if env.has_key('optimization') and env['optimization'] is not None:
# 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', 'filesystem']:
if os.path.isdir(os.path.join(top_src_dir, 'boost', 'libs', lib)):
boost_libs.append(lib)
#
utils.createConfigFile(conf,
config_file = boost_config_h,
- config_pre = '''/* boost/config.h. Generated by SCons. */
+ config_pre = r'''/* boost/config.h. Generated by SCons. */
/* -*- C++ -*- */
/*
#('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'
),
Linker user flags: %s
Build info:
Builing directory: %s
- Local library directory: %s
Libraries paths: %s
Boost libraries: %s
include search path: %s
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']),
+ env.subst('$LOCALLIBPATH'),
+ env.subst('$LIBPATH'), str(boost_libraries),
+ env.subst('$CPPPATH'),
frontend, packaging_method,
- prefix, env['LYX_DIR'])
+ prefix, env['LYX_DATA_DIR'])
#
# create config.h
result = utils.createConfigFile(conf,
config_file = config_h,
- config_pre = '''/* config.h. Generated by SCons. */
+ config_pre = r'''/* config.h. Generated by SCons. */
/* -*- C++ -*- */
/*
'Full version info'),
('#define LYX_DATE "%s"' % lyx_date,
'Date of release'),
+ ('#define PROGRAM_SUFFIX "%s"' % program_suffix,
+ 'Program version suffix'),
+ ('#define LYX_ABS_INSTALLED_DATADIR "%s"' % env.subst('$LYX_DATA_DIR').replace('\\', '/'),
+ 'Hard coded system support directory'),
+ ('#define LYX_ABS_INSTALLED_LOCALEDIR "%s"' % env.subst('$LOCALEDIR').replace('\\', '/'),
+ 'Hard coded locale directory'),
+ ('#define LYX_ABS_TOP_SRCDIR "%s"' % env.subst('$TOP_SRCDIR').replace('\\', '/'),
+ 'Top source directory'),
('#define BOOST_ALL_NO_LIB 1',
'disable automatic linking of boost libraries.'),
('#define USE_%s_PACKAGING 1' % packaging_method.upper(),
# create intl/config.h
result = utils.createConfigFile(conf,
config_file = intl_config_h,
- config_pre = '''/* intl/config.h. Generated by SCons. */
+ config_pre = r'''/* intl/config.h. Generated by SCons. */
/* -*- C++ -*- */
/*
* during the compilation.
*/
-#ifndef _CONFIG_H
-#define _CONFIG_H
+#ifndef _INTL_CONFIG_H
+#define _INTL_CONFIG_H
''',
headers = [
('unistd.h', 'HAVE_UNISTD_H', 'c'),
#
if frontend == 'qt4':
frontend_env = env.Copy()
+ frontend_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
#
# Report results
#
-
-
print env['VERSION_INFO']
#
Help(opts.GenerateHelpText(env))
-
#----------------------------------------------------------
# Start building
#----------------------------------------------------------
# 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)
if (included_boost and not libExists('included_boost_regex')) or 'boost' in BUILD_TARGETS:
#
- # boost libraries
- boostenv = env.Copy()
+ # boost/libs
#
- # boost use its own config.h
- boostenv['CPPPATH'] = ['$BUILDDIR/boost'] + extra_inc_paths
- boostenv['CCFLAGS'] = ['$INCPREFIX$TOP_SRCDIR/boost']
- boostenv.AppendUnique(CCFLAGS = ['-DBOOST_USER_CONFIG="<config.h>"'])
-
for lib in boost_libs:
- boostlib = boostenv.StaticLibrary(
+ boostlib = env.StaticLibrary(
target = '$LOCALLIBPATH/included_boost_%s' % lib,
- source = ['$BUILDDIR/boost/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)]
+ source = ['$BUILDDIR/boost/%s/src/%s' % (lib, x) for x in eval('boost_libs_%s_src_files' % lib)],
+ # do not use global CPPPATH because src/config.h will mess up with boost/config.h
+ CPPPATH = ['$BUILDDIR/boost'] + extra_inc_paths,
+ CCFLAGS = ['$CCFLAGS', '$INCPREFIX$TOP_SRCDIR/boost', '-DBOOST_USER_CONFIG="<config.h>"']
)
Alias('boost', boostlib)
#
# intl
#
- intlenv = env.Copy()
-
- # we need the original C compiler for these files
- intlenv['CC'] = C_COMPILER
- intlenv['CCFLAGS'] = C_CCFLAGS
- if use_vc:
- intlenv.Append(CCFLAGS=['/Dinline#', '/D__attribute__(x)#', '/Duintmax_t=UINT_MAX'])
- # intl does not use global config.h
- intlenv['CPPPATH'] = ['$BUILDDIR/intl'] + extra_inc_paths
-
- intlenv.Append(CCFLAGS = [
+ INTL_CCFLAGS = [
r'-DLOCALEDIR=\"' + env['LOCALEDIR'].replace('\\', '\\\\') + r'\"',
r'-DLOCALE_ALIAS_PATH=\"' + env['LOCALEDIR'].replace('\\', '\\\\') + r'\"',
r'-DLIBDIR=\"' + env['TOP_SRCDIR'].replace('\\', '\\\\') + r'/lib\"',
'-DDEPENDS_ON_LIBICONV=1',
'-DHAVE_CONFIG_H'
]
- )
+ if use_vc:
+ INTL_CCFLAGS.extend(['/Dinline#', '/D__attribute__(x)#', '/Duintmax_t=UINT_MAX'])
- intl = intlenv.StaticLibrary(
+ intl = env.StaticLibrary(
target = '$LOCALLIBPATH/included_intl',
LIBS = ['c'],
+ CCFLAGS = INTL_CCFLAGS,
+ # do not use global CPPPATH because src/config.h will mess up with intl/config.h
+ CPPPATH = ['$BUILDDIR/intl'] + extra_inc_paths,
source = ['$BUILDDIR/intl/%s' % x for x in intl_files]
)
Alias('intl', intl)
-
-#
-# Now, src code under src/
-#
#
# src/support
#
-frontend_env.Depends('$BUILDDIR/src/support/Package.cpp', '$BUILDDIR/src/config.h')
-Package_cpp = env.substFile('$BUILDDIR/src/support/Package.cpp', '$TOP_SRCDIR/src/support/Package.cpp.in')
+frontend_env['QT4_MOCHPREFIX'] = ''
+frontend_env['QT4_MOCHSUFFIX'] = '_moc.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] + Package_cpp + \
- ['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_files] + \
- ['$BUILDDIR/src/support/minizip/%s' % x for x in src_support_minizip_windows_files if platform_name == 'win32'],
+ 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],
CCFLAGS = [
'$CCFLAGS',
'-DHAVE_CONFIG_H',
'-DQT_NO_STL',
'-DQT_NO_KEYWORDS',
],
- CPPPATH = ['$CPPPATH', '$TOP_SRCDIR/src/support/minizip']
+ CPPPATH = ['$CPPPATH', '$BUILDDIR/src/support', '$TOP_SRCDIR/src/support/minizip']
)
Alias('support', support)
Alias('graphics', graphics)
-#
-# src/frontends/controllers
-#
-controllers = env.StaticLibrary(
- target = '$LOCALLIBPATH/controllers',
- source = ['$BUILDDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files]
-)
-Alias('controllers', controllers)
-
-
#
# 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)
for x in src_frontends_qt4_header_files ]
-resources = [frontend_env.Uic4('$BUILDDIR/src/frontends/qt4/ui/%s' % x.split('.')[0])
+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],
+ source = ['$BUILDDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files] + resource,
CPPPATH = [
'$CPPPATH',
'$BUILDDIR/src',
'$BUILDDIR/src/frontends',
'$BUILDDIR/src/frontends/qt4',
'$BUILDDIR/src/frontends/qt4/ui',
- '$BUILDDIR/src/frontends/controllers'
],
CCFLAGS = [
'$CCFLAGS',
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'],
+ 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]),
tex2lyx, [Copy('$TARGET', '$SOURCE')]))
'insets',
'frontends',
frontend,
- 'controllers',
'graphics',
'support',
'lyxbase_post',
if use_vc and 'msvs_projects' in BUILD_TARGETS:
- def build_project(target, full_target = None,
- src = [], inc = [], res = []):
+ def build_project(target, full_target = None, src = [], inc = [], res = []):
''' build mavs project files
target: alias (correspond to directory name)
full_target: full path/filename of the target
enough to build the target. For executable targets, msvs need to know
the full path to start debug them.
'''
- cmds = ''
- if full_target is None:
- build_target = target
- else:
- build_target = full_target
# project
proj = env.MSVSProject(
target = target + env['MSVSPROJECTSUFFIX'],
incs = [env.subst('$TOP_SRCDIR/src/config.h')],
localincs = [env.subst(x) for x in inc],
resources = [env.subst(x) for x in res],
- buildtarget = build_target,
- cmdargs = cmds,
+ buildtarget = full_target,
variant = 'Debug'
)
Alias('msvs_projects', proj)
['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_files] + \
['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_files] + \
['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_files] + \
- ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_files] + \
- ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files + src_frontends_qt4_moc_files],
+ ['$TOP_SRCDIR/src/frontends/qt4/%s' % x for x in src_frontends_qt4_files],
inc = ['$TOP_SRCDIR/src/%s' % x for x in src_header_files] + \
['$TOP_SRCDIR/src/support/%s' % x for x in src_support_header_files] + \
['$TOP_SRCDIR/src/mathed/%s' % x for x in src_mathed_header_files] + \
['$TOP_SRCDIR/src/insets/%s' % x for x in src_insets_header_files] + \
['$TOP_SRCDIR/src/frontends/%s' % x for x in src_frontends_header_files] + \
['$TOP_SRCDIR/src/graphics/%s' % x for x in src_graphics_header_files] + \
- ['$TOP_SRCDIR/src/frontends/controllers/%s' % x for x in src_frontends_controllers_header_files] + \
['$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],
full_target = File(env.subst('$BUILDDIR/lyx$PROGSUFFIX')).abspath)
['$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/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/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 ]
)
['$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 + lib_layouts_inc_files],
+ ['$TOP_SRCDIR/lib/layouts/%s' % x for x in lib_layouts_files + lib_layouts_inc_files + lib_layouts_module_files],
'$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'),
('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),
('doc/clipart', lib_doc_clipart_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/he', lib_doc_he_files),
('doc/hu', lib_doc_hu_files),
('doc/it', lib_doc_it_files),
('examples/he', lib_examples_he_files),
('examples/hu', lib_examples_hu_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),
('fonts', lib_fonts_files),
('images', lib_images_files),
('images/math', lib_images_math_files),
+ ('images/commands', lib_images_commands_files),
('kbd', lib_kbd_files),
- ('layouts', lib_layouts_files + lib_layouts_inc_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),
postinstall_path = os.path.join(dest_dir, 'etc', 'postinstall')
env.Install(postinstall_path, tmp_script)
Alias('install', postinstall_path)
-
-
# man
env.InstallAs(os.path.join(man_dest_dir, 'lyx' + version_suffix + '.1'),
env.subst('$TOP_SRCDIR/lyx.man'))
Alias('install', dest_file)
-if 'install' in BUILD_TARGETS or 'installer' in BUILD_TARGETS:
+if 'installer' in BUILD_TARGETS:
#
# build windows installer using NSIS
#
projects / lyx.git / blobdiff