# Required runtime environment
#----------------------------------------------------------
-# FIXME: I remember lyx requires higher version of python?
-EnsurePythonVersion(1, 5)
+# scons asks for 1.5.2, lyx requires 2.2
+EnsurePythonVersion(2, 2)
# Please use at least 0.96.91 (not 0.96.1)
EnsureSConsVersion(0, 96)
# If not specified, boost tries to figure out by itself, but it may fail.
boost_posix = False
packaging_method = 'windows'
- add_suffix_to_executables = False
default_prefix = 'c:/program files/lyx'
share_dir = 'Resources'
man_dir = 'Resources/man/man1'
default_with_x = True
boost_posix = True
packaging_method = 'posix'
- add_suffix_to_executables = True
default_prefix = '/usr/local/'
share_dir = 'share/lyx'
man_dir = 'man/man1'
default_with_x = True
boost_posix = True
packaging_method = 'posix'
- add_suffix_to_executables = True
default_prefix = '/usr/local/'
share_dir = 'share/lyx'
man_dir = 'man/man1'
default_with_x = False
boost_posix = True
packaging_method = 'mac'
- add_suffix_to_executables = True
# FIXME: where to install?
default_prefix = '/usr/local/'
share_dir = 'Resources'
default_with_x = True
boost_posix = False
packaging_method = 'posix'
- add_suffix_to_executables = True
default_prefix = '/usr/local/'
share_dir = 'share/lyx'
man_dir = 'man/man1'
and ARGUMENTS['frontend'] != opt_cache['frontend'] \
and opt_cache.has_key('qt_dir'):
opt_cache.pop('qt_dir')
- # and we do not cache fast_start
- if opt_cache.has_key('fast_start'):
- opt_cache.pop('fast_start')
+ # some options will require full rebuild
+ # these are in general things that will change src/config.h
+ for arg in ['version_suffix', 'nls']:
+ if ARGUMENTS.has_key(arg) and ((not opt_cache.has_key(arg)) or \
+ ARGUMENTS[arg] != opt_cache[arg]):
+ if fast_start:
+ print " ** fast_start is disabled because of the change of option", arg
+ print
+ fast_start = False
+ # and we do not cache some options
+ for arg in ['fast_start']:
+ if opt_cache.has_key(arg):
+ opt_cache.pop(arg)
for key in opt_cache.keys():
if not ARGUMENTS.has_key(key):
ARGUMENTS[key] = opt_cache[key]
# these are defined for MSVC
env['ENV']['LIB'] = os.environ.get('LIB')
env['ENV']['INCLUDE'] = os.environ.get('INCLUDE')
-env['TOP_SRC_DIR'] = TOP_SRC_DIR
+if use_vc:
+ # full path name is used to build msvs project files
+ env['TOP_SRC_DIR'] = Dir(TOP_SRC_DIR).abspath
+else:
+ env['TOP_SRC_DIR'] = TOP_SRC_DIR
env['SCONS_DIR'] = SCONS_DIR
# install to default_prefix by default
env['PREFIX'] = env.get('prefix', default_prefix)
# program suffix
if env.has_key('version_suffix'):
- env['PROGRAM_SUFFIX'] = env['version_suffix']
+ if env['version_suffix'] in ['y', 'yes', 't', 'true', '1', 'all']:
+ env['PROGRAM_SUFFIX'] = PACKAGE_VERSION
+ else:
+ env['PROGRAM_SUFFIX'] = env['version_suffix']
else:
env['PROGRAM_SUFFIX'] = ''
-env['ADD_SUFFIX_TO_EXECUTABLES'] = add_suffix_to_executables
-env['SHARE_DIR'] = os.path.join(env['PREFIX'], share_dir + env['PROGRAM_SUFFIX'])
+
+# whether or not add suffix to file and directory names
+env['ADD_SUFFIX'] = packaging_method != 'windows'
+if env['ADD_SUFFIX']:
+ env['SHARE_DIR'] = os.path.join(env['PREFIX'], share_dir + env['PROGRAM_SUFFIX'])
+else:
+ env['SHARE_DIR'] = os.path.join(env['PREFIX'], share_dir)
env['LOCALE_DIR'] = os.path.join(env['PREFIX'], locale_dir)
#
# if dest_dir is different from prefix.
env['BIN_DEST_DIR'] = env['exec_prefix']
else:
env['BIN_DEST_DIR'] = os.path.join(env['DEST_DIR'], 'bin')
-env['SHARE_DEST_DIR'] = os.path.join(env['DEST_DIR'], share_dir + env['PROGRAM_SUFFIX'])
+if env['ADD_SUFFIX']:
+ env['SHARE_DEST_DIR'] = os.path.join(env['DEST_DIR'], share_dir + env['PROGRAM_SUFFIX'])
+else:
+ env['SHARE_DEST_DIR'] = os.path.join(env['DEST_DIR'], share_dir)
env['MAN_DEST_DIR'] = os.path.join(env['DEST_DIR'], man_dir)
env['LOCALE_DEST_DIR'] = os.path.join(env['DEST_DIR'], locale_dir)
# all built libraries will go to build_dir/libs
# (This is different from the make file approach)
env['LOCALLIBPATH'] = '$BUILDDIR/libs'
+# to make use of local cached parameters, this one has to be '.'
+env['MSVSPATH'] = '.'
env.AppendUnique(LIBPATH = ['$LOCALLIBPATH'])
#
'CheckBoostLibraries' : utils.checkBoostLibraries,
'CheckCommand' : utils.checkCommand,
'CheckCXXGlobalCstd' : utils.checkCXXGlobalCstd,
+ 'CheckLC_MESSAGES' : utils.checkLC_MESSAGES,
+ 'CheckIconvConst' : utils.checkIconvConst,
}
)
+
# pkg-config? (if not, we use hard-coded options)
if not fast_start:
if conf.CheckPkgConfig('0.15.0'):
# we do not need to set LIBPATH now.
env['INCLUDED_GETTEXT'] = True
env['INTL_LIBS'] = ['included_intl']
- if platform_name == 'win32' and not use_vc:
- # for functions AddFontResouceA, RemoveFontResourceA
- # if use_vc, gdi32 will be added anyway later
- env['INTL_LIBS'].append('gdi32')
env_cache['INCLUDED_GETTEXT'] = env['INCLUDED_GETTEXT']
env_cache['INTL_LIBS'] = env['INTL_LIBS']
else:
]
for header in headers:
- utils.addToConfig("/* Define to 1 if you have the <%s> header file. */" % header[0], newline=1)
+ description = "Define to 1 if you have the <%s> header file." % header[0]
if (header[2] == 'c' and conf.CheckCHeader(header[0])) or \
(header[2] == 'cxx' and conf.CheckCXXHeader(header[0])):
- utils.addToConfig('#define %s 1' % header[1])
+ utils.addToConfig('#define %s 1' % header[1], desc = description)
else:
- utils.addToConfig('/* #undef %s */' % header[1])
+ utils.addToConfig('/* #undef %s */' % header[1], desc = description)
# HAVE_OPEN
# HAVE_CLOSE
('wcslen', 'HAVE_WCSLEN', None)
]
+ for func in functions:
+ description = "Define to 1 if you have the `%s' function." % func[0]
+ if conf.CheckFunc(func[0], header=func[2]):
+ utils.addToConfig('#define %s 1' % func[1], desc = description)
+ else:
+ utils.addToConfig('/* #undef %s */' % func[1], desc = description)
+
+
# HAVE_ASPRINTF
# HAVE_WPRINTF
# HAVE_SNPRINTF
# HAVE_POSIX_PRINTF
# HAVE_FCNTL
-
- for func in functions:
- utils.addToConfig("/* Define to 1 if you have the `%s' function. */" % func[0], newline=1)
- if conf.CheckFunc(func[0], header=func[2]):
- utils.addToConfig('#define %s 1' % func[1])
- else:
- utils.addToConfig('/* #undef %s */' % func[1])
env_functions = [
('asprintf', 'HAVE_ASPRINTF'),
]
for func in env_functions:
- utils.addToConfig("/* Define to 1 if you have the `%s' function. */" % func[0], newline=1)
+ description = "Define to 1 if you have the `%s' function." % func[0]
if conf.CheckFunc(func[0]):
- utils.addToConfig('#define %s 1' % func[1])
+ utils.addToConfig('#define %s 1' % func[1], desc = description)
env[func[1]] = 1
else:
- utils.addToConfig('/* #undef %s */' % func[1])
+ utils.addToConfig('/* #undef %s */' % func[1], desc = description)
env[func[1]] = 0
# HAVE_INTMAX_T
# HAVE_DECL_ISTREAMBUF_ITERATOR
- utils.addToConfig("/* Define to 1 if you have the `intmax_t' type. */", newline=1)
+ description = "Define to 1 if you have the `intmax_t' type."
if conf.CheckType('intmax_t', includes='#include <stdint.h>') or \
conf.CheckType('intmax_t', includes='#include <inttypes.h>'):
- utils.addToConfig('#define HAVE_INTMAX_T 1')
+ utils.addToConfig('#define HAVE_INTMAX_T 1', desc = description)
else:
- utils.addToConfig('/* #undef HAVE_INTMAX_T */')
+ utils.addToConfig('/* #undef HAVE_INTMAX_T */',desc = description)
# HAVE_INTMAX_T
# HAVE_LONG_DOUBLE
# HAVE_WINT_T
# HAVE_INTTYPES_H_WITH_UINTMAX
# HAVE_STDINT_H_WITH_UINTMAX
-
+
types = [
('intmax_t', 'HAVE_INTMAX_T', None),
('long double', 'HAVE_LONG_DOUBLE', None),
'#include <streambuf>\n#include <istream>')
]
for t in types:
- utils.addToConfig("/* Define to 1 if you have the `%s' type. */" % t[0], newline=1)
+ description = "Define to 1 if you have the `%s' type." % t[0]
if conf.CheckType(t[0], includes=t[2]):
- utils.addToConfig('#define %s 1' % t[1])
+ utils.addToConfig('#define %s 1' % t[1], desc = description)
else:
- utils.addToConfig('/* #undef %s */' % t[1])
+ utils.addToConfig('/* #undef %s */' % t[1], desc = description)
# windows/msvc sys/types.h does not have pid_t
# FIXME: #include <windows.h> is the right way?
if not conf.CheckType('pid_t', includes='#include <sys/types.h>'):
- utils.addToConfig('#define pid_t int')
-
+ utils.addToConfig('#define pid_t int', desc = 'Define is sys/types.h does not have pid_t')
+
# determine the use of std::tolower or tolower
+ description = 'Define if your C++ compiler puts C library functions in the global namespace'
if conf.CheckCXXGlobalCstd():
- utils.addToConfig('#define CXX_GLOBAL_CSTD 1')
+ utils.addToConfig('#define CXX_GLOBAL_CSTD 1', desc = description)
+ else:
+ utils.addToConfig('/* #undef CXX_GLOBAL_CSTD */', desc = description)
+
+ # HAVE_LIBGDI32
+ # HAVE_ICONV
+ # HAVE_LIBC
+ # HAVE_LIBAIKSAURUS
+ libs = [
+ ('gdi32', 'HAVE_LIBGDI32'),
+ ('iconv', 'HAVE_ICONV'),
+ ('c', 'HAVE_LIBC'),
+ ('Aiksaurus', 'HAVE_LIBAIKSAURUS'),
+ ]
+ for lib in libs:
+ description = "Define to 1 if you have the `%s' library (-l%s)." % (lib[0], lib[0])
+ if conf.CheckLib(lib[0]):
+ utils.addToConfig('#define %s 1' % lib[1], desc = description)
+ env[lib[1]] = True
+ else:
+ utils.addToConfig('/* #undef %s */' % lib[1], desc = description)
+ env[lib[1]] = False
+
+ # HAVE_LC_MESSAGES
+ description = 'Define if your <locale.h> file defines LC_MESSAGES.'
+ if conf.CheckLC_MESSAGES():
+ utils.addToConfig('#define HAVE_LC_MESSAGES 1', desc = description)
else:
- utils.addToConfig('/* #undef CXX_GLOBAL_CSTD */')
+ utils.addToConfig('/* #undef HAVE_LC_MESSAGES */', desc = description)
+
+ # ICONV_CONST
+ description = 'Define as const if the declaration of iconv() needs const.'
+ if conf.CheckIconvConst():
+ utils.addToConfig('#define ICONV_CONST', desc = description)
+ else:
+ utils.addToConfig('/* #undef ICONV_CONST */', desc = description)
# PACKAGE
# PACKAGE_VERSION
+ # PACKAGE_BUGREPORT
+ # PACKAGE_NAME
+ # PACKAGE_STRING
# DEVEL_VERSION
- utils.addToConfig('#define PACKAGE "%s%s"' % (PACKAGE, env['PROGRAM_SUFFIX']))
- utils.addToConfig('#define PACKAGE_VERSION "%s"' % PACKAGE_VERSION)
+ utils.addToConfig('#define PACKAGE "%s%s"' % (PACKAGE, env['PROGRAM_SUFFIX']),
+ desc = "Name of package")
+
+ utils.addToConfig('#define PACKAGE_BUGREPORT "%s"' % PACKAGE_BUGREPORT,
+ desc = 'Define to the address where bug reports for this package should be sent.')
+
+ utils.addToConfig('#define PACKAGE_NAME "%s"' % PACKAGE_NAME,
+ desc = 'Define to the full name of this package.')
+
+ utils.addToConfig('#define PACKAGE_STRING "%s"' % PACKAGE_STRING,
+ desc = "Define to the full name and version of this package.")
+
+ utils.addToConfig('#define PACKAGE_TARNAME "%s"' % PACKAGE_TARNAME,
+ desc = "Define to the one symbol short name of this package.")
+
+ utils.addToConfig('#define PACKAGE_VERSION "%s"' % PACKAGE_VERSION,
+ desc = "Define to the version of this package.")
+
if DEVEL_VERSION:
utils.addToConfig('#define DEVEL_VERSION 1')
# items are (ENV, ARGUMENTS)
values = [
- ('ENABLE_ASSERTIONS', 'assertions'),
- ('ENABLE_NLS', 'nls'),
- ('WITH_WARNINGS', 'warnings'),
- ('_GLIBCXX_CONCEPT_CHECKS', 'concept_checks'),
+ ('ENABLE_ASSERTIONS', 'assertions', 'Define if you want assertions to be enabled in the code'),
+ ('ENABLE_NLS', 'nls', "Define to 1 if translation of program messages to the user's native anguage is requested."),
+ ('WITH_WARNINGS', 'warnings', 'Define this if you want to see the warning directives put here and there by the developpers to get attention'),
+ ('_GLIBCXX_CONCEPT_CHECKS', 'concept_checks', 'libstdc++ concept checking'),
]
for val in values:
if (env.has_key(val[0]) and env[val[0]]) or \
(env.has_key(val[1]) and env[val[1]]):
- utils.addToConfig('#define %s 1' % val[0])
+ utils.addToConfig('#define %s 1' % val[0], desc = val[2])
else:
- utils.addToConfig('/* #undef %s */' % val[0])
+ utils.addToConfig('/* #undef %s */' % val[0], desc = val[2])
# disable automatic linking of boost libraries.
# This is an interesting feature that is supposed to be useful under
# I disable it for now.
utils.addToConfig('#define BOOST_ALL_NO_LIB 1')
- env['EXTRA_LIBS'] = []
- # HAVE_LIBAIKSAURUS
# AIKSAURUS_H_LOCATION
- if conf.CheckLib('Aiksaurus'):
- utils.addToConfig("#define HAVE_LIBAIKSAURUS 1")
- if (conf.CheckCXXHeader("Aiksaurus.h")):
- utils.addToConfig("#define AIKSAURUS_H_LOCATION <Aiksaurus.h>")
- elif (conf.CheckCXXHeader("Aiksaurus/Aiksaurus.h")):
- utils.addToConfig("#define AIKSAURUS_H_LOCATION <Aiksaurus/Aiksaurus.h>")
- else:
- utils.addToConfig("#define AIKSAURUS_H_LOCATION")
- env['EXTRA_LIBS'].append('Aiksaurus')
+ if (conf.CheckCXXHeader("Aiksaurus.h")):
+ utils.addToConfig("#define AIKSAURUS_H_LOCATION <Aiksaurus.h>")
+ elif (conf.CheckCXXHeader("Aiksaurus/Aiksaurus.h")):
+ utils.addToConfig("#define AIKSAURUS_H_LOCATION <Aiksaurus/Aiksaurus.h>")
+ else:
+ utils.addToConfig("#define AIKSAURUS_H_LOCATION")
# USE_ASPELL
# USE_PSPELL
spell_detected = False
if spell_engine in ['auto', 'aspell'] and \
conf.CheckLib('aspell'):
- utils.addToConfig('#define USE_ASPELL 1')
+ utils.addToConfig('#define USE_ASPELL 1', desc = 'Define as 1 to use the aspell library')
env['USE_ASPELL'] = True
env['USE_PSPELL'] = False
env['USE_ISPELL'] = False
- env['EXTRA_LIBS'].append('aspell')
spell_detected = True
elif spell_engine in ['auto', 'pspell'] and \
conf.CheckLib('pspell'):
- utils.addToConfig('#define USE_PSPELL 1')
+ utils.addToConfig('#define USE_PSPELL 1', desc = 'Define as 1 to use the pspell library')
env['USE_ASPELL'] = False
env['USE_PSPELL'] = True
env['USE_ISPELL'] = False
- env['EXTRA_LIBS'].append('pspell')
spell_detected = True
elif spell_engine in ['auto', 'ispell'] and \
conf.CheckLib('ispell'):
- utils.addToConfig('#define USE_ISPELL 1')
+ utils.addToConfig('#define USE_ISPELL 1', desc = 'Define as 1 to use the ispell library')
env['USE_ASPELL'] = False
env['USE_PSPELL'] = False
env['USE_ISPELL'] = True
- env['EXTRA_LIBS'].append('ispell')
spell_detected = True
if not spell_detected:
utils.addToConfig('/* #undef BOOST_POSIX */')
# MKDIR_TAKES_ONE_ARG
+ description = 'Define if mkdir takes only one argument.'
if conf.CheckMkdirOneArg():
- utils.addToConfig('#define MKDIR_TAKES_ONE_ARG 1')
+ utils.addToConfig('#define MKDIR_TAKES_ONE_ARG 1', desc = description)
else:
- utils.addToConfig('/* #undef MKDIR_TAKES_ONE_ARG */')
+ utils.addToConfig('/* #undef MKDIR_TAKES_ONE_ARG */', desc = description)
# SELECT_TYPE_ARG1
# SELECT_TYPE_ARG234
# SELECT_TYPE_ARG5
(arg1, arg234, arg5) = conf.CheckSelectArgType()
- utils.addToConfig('#define SELECT_TYPE_ARG1 %s' % arg1)
- utils.addToConfig('#define SELECT_TYPE_ARG234 %s' % arg234)
- utils.addToConfig('#define SELECT_TYPE_ARG5 %s' % arg5)
+ utils.addToConfig('#define SELECT_TYPE_ARG1 %s' % arg1,
+ desc = "Define to the type of arg 1 for `select'.")
+ utils.addToConfig('#define SELECT_TYPE_ARG234 %s' % arg234,
+ desc = "Define to the type of arg 2, 3, 4 for `select'.")
+ utils.addToConfig('#define SELECT_TYPE_ARG5 %s' % arg5,
+ desc = "Define to the type of arg 5 for `select'.")
# mkstemp
# USE_BOOST_FORMAT
# WANT_GETFILEATTRIBUTESEX_WRAPPER
utils.endConfigH(TOP_SRC_DIR)
- # env['EXTRA_LIBS'] will be modified later, so a unique copy is needed
- # NOTE that we do *not* save qt_libs in environment.
- env_cache['EXTRA_LIBS'] = copy.copy(env['EXTRA_LIBS'])
- env_cache['USE_ASPELL'] = env['USE_ASPELL']
- env_cache['USE_PSPELL'] = env['USE_PSPELL']
- env_cache['USE_ISPELL'] = env['USE_ISPELL']
- env_cache['HAVE_ASPRINTF'] = env['HAVE_ASPRINTF']
- env_cache['HAVE_WPRINTF'] = env['HAVE_WPRINTF']
- env_cache['HAVE_SNPRINTF'] = env['HAVE_SNPRINTF']
- env_cache['HAVE_POSIX_PRINTF'] = env['HAVE_POSIX_PRINTF']
- env_cache['HAVE_FCNTL'] = env['HAVE_FCNTL']
-
+ for key in ['USE_ASPELL', 'USE_PSPELL', 'USE_ISPELL', 'HAVE_ASPRINTF', \
+ 'HAVE_WPRINTF', 'HAVE_SNPRINTF', 'HAVE_POSIX_PRINTF', 'HAVE_FCNTL', \
+ 'HAVE_ICONV', 'HAVE_LIBGDI32', 'HAVE_LIBC', 'HAVE_LIBAIKSAURUS']:
+ env_cache[key] = env[key]
else:
#
# this comes as a big surprise, without this line
# Note that the exact header file to check does not matter
conf.CheckCHeader('io.h')
# only a few variables need to be rescanned
- env['EXTRA_LIBS'] = copy.copy(env_cache['EXTRA_LIBS'])
- env['USE_ASPELL'] = env_cache['USE_ASPELL']
- env['USE_PSPELL'] = env_cache['USE_PSPELL']
- env['USE_ISPELL'] = env_cache['USE_ISPELL']
- env['HAVE_ASPRINTF'] = env_cache['HAVE_ASPRINTF']
- env['HAVE_WPRINTF'] = env_cache['HAVE_WPRINTF']
- env['HAVE_SNPRINTF'] = env_cache['HAVE_SNPRINTF']
- env['HAVE_POSIX_PRINTF'] = env_cache['HAVE_POSIX_PRINTF']
- env['HAVE_FCNTL'] = env_cache['HAVE_FCNTL']
+ for key in ['USE_ASPELL', 'USE_PSPELL', 'USE_ISPELL', 'HAVE_ASPRINTF', \
+ 'HAVE_WPRINTF', 'HAVE_SNPRINTF', 'HAVE_POSIX_PRINTF', 'HAVE_FCNTL', \
+ 'HAVE_ICONV', 'HAVE_LIBGDI32', 'HAVE_LIBC', 'HAVE_LIBAIKSAURUS']:
+ env[key] = env_cache[key]
+
#
# Finish auto-configuration
#----------------------------------------------------------
#
-# QT_LIB etc (EXTRA_LIBS holds lib for each frontend)
+# QT_LIB
#
# NOTE: Tool('qt') or Tool('qt4') will be loaded later
# in their respective directory and specialized env.
if frontend == 'qt3':
# note: env.Tool('qt') my set QT_LIB to qt
env['QT_LIB'] = 'qt-mt'
- env['EXTRA_LIBS'].append('qt-mt')
+ env['FRONTEND_LIBS'] = ['qt-mt']
if platform_name == 'cygwin' and use_X11:
- env['EXTRA_LIBS'].extend(['GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr', 'Xcursor',
- 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE', 'resolv',
- 'pthread'])
env.AppendUnique(LIBPATH = ['/usr/X11R6/lib'])
elif frontend == 'qt4':
if platform_name == "win32":
env['QT_LIB'] = ['QtCore4', 'QtGui4']
else:
env['QT_LIB'] = ['QtCore', 'QtGui']
- env['EXTRA_LIBS'] += env['QT_LIB']
+ env['FRONTEND_LIBS'] = env['QT_LIB']
except:
print "Can not locate qt tools"
print "What I get is "
# the final link step needs stdc++ to succeed under mingw
# FIXME: shouldn't g++ automatically link to stdc++?
if use_vc:
- env['SYSTEM_LIBS'] = ['shlwapi', 'gdi32', 'shell32', 'advapi32', 'zdll']
+ env['SYSTEM_LIBS'] = ['shlwapi', 'shell32', 'advapi32', 'zdll']
else:
env['SYSTEM_LIBS'] = ['shlwapi', 'stdc++', 'z']
+elif platform_name == 'cygwin' and use_X11:
+ env['SYSTEM_LIBS'] = ['GL', 'Xmu', 'Xi', 'Xrender', 'Xrandr', 'Xcursor',
+ 'Xft', 'freetype', 'fontconfig', 'Xext', 'X11', 'SM', 'ICE', 'resolv',
+ 'pthread', 'z']
else:
env['SYSTEM_LIBS'] = ['z']
+libs = [
+ ('HAVE_ICONV', 'iconv'),
+ ('HAVE_LIBGDI32', 'gdi32'),
+ ('HAVE_LIBAIKSAURUS', 'Aiksaurus'),
+ ('USE_ASPELL', 'aspell'),
+ ('USE_ISPELL', 'ispell'),
+ ('USE_PSPELL', 'pspell'),
+]
+
+for lib in libs:
+ if env[lib[0]]:
+ env['SYSTEM_LIBS'].append(lib[1])
+
#
# Build parameters CPPPATH etc
#
env['CPPPATH'].remove(env['QT_INC_PATH'])
env['CPPPATH'] += ['$TOP_SRC_DIR/boost', '$TOP_SRC_DIR/src']
-# TODO: add (more) appropriate compiling options (-DNDEBUG etc)
+# add appropriate compiling options (-DNDEBUG etc)
# for debug/release mode
if ARGUMENTS.get('mode', default_build_mode) == 'debug':
- env.AppendUnique(CCFLAGS = [])
+ if use_vc:
+ env.AppendUnique(CCFLAGS = [])
+ else:
+ env.AppendUnique(CCFLAGS = ['-Wall', '-g'])
else:
- env.AppendUnique(CCFLAGS = [])
+ if use_vc:
+ env.AppendUnique(CCFLAGS = ['/O2'])
+ else:
+ env.AppendUnique(CCFLAGS = ['-Wall', '-O2'])
#
# Customized builders
#
# src/support/package.C.in needs the following to replace
# LYX_ABS_INSTALLED_DATADIR (e.g. /usr/local/lyx/share/lyx)
-env['LYX_DIR'] = env['SHARE_DIR']
+env['LYX_DIR'] = Dir(env['SHARE_DIR']).abspath
# LYX_ABS_INSTALLED_LOCALEDIR
-env['LOCALEDIR'] = env['LOCALE_DIR']
-env['TOP_SRCDIR'] = env['TOP_SRC_DIR']
+env['LOCALEDIR'] = Dir(env['LOCALE_DIR']).abspath
+# during variable substitution, absolute path is needed.
+env['TOP_SRCDIR'] = Dir(env['TOP_SRC_DIR']).abspath
# needed by src/version.C.in => src/version.C
env['PACKAGE_VERSION'] = PACKAGE_VERSION
# fill in the version info
Local library directory: %s
Libraries pathes: %s
Boost libraries: %s
- Extra libraries: %s
+ Frontend libraries: %s
System libraries: %s
include search path: %s
Frontend:
env.subst('$LINKFLAGS'), env.subst('$LINKFLAGS'),
env.subst('$BUILDDIR'), env.subst('$LOCALLIBPATH'),
str(env['LIBPATH']), str(env['BOOST_LIBRARIES']),
- str(env['EXTRA_LIBS']), str(env['SYSTEM_LIBS']), str(env['CPPPATH']),
+ str(env['FRONTEND_LIBS']), str(env['SYSTEM_LIBS']), str(env['CPPPATH']),
env['frontend'], packaging_method,
env['PREFIX'], env['BIN_DEST_DIR'], env['SHARE_DIR'])