anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCons: require Python 2.6 for SCons for LyX 2.0 (branch and other Python files will stay as they are), this keeps us on track to Python 3.0 as discussed on the list.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28249 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Uwe Stöhr 2009-01-18 18:54:43 +00:00
parent 0f66c45e8a
commit 53064b49e8
3 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
INSTALL.Win32
View File

@ -14,10 +14,10 @@ Compiling with MSVC 2008
2 Install Python 2 Install Python
Get the latest Python 2.5 version at Get the latest Python 2.6 version at
http://www.python.org/download/ http://www.python.org/download/
Install in C:\Python25 and add this directory to the PATH environment Install in C:\Python26 and add this directory to the PATH environment
variable (Start > Settings > Control Panel > System > Advanced > variable (Start > Settings > Control Panel > System > Advanced >
Environment Variables). Environment Variables).

4
INSTALL.scons
View File

@ -30,13 +30,13 @@ Prerequisites:
-------------- --------------
* Python: * Python:
Python >= 1.5.2 is required to run scons, but Python >= 2.3 is used by Python >= 2.6.0 is required to run scons, but Python >= 2.3 is used by
lyx itself so the newer version is needed. Python is widely lyx itself so the newer version is needed. Python is widely
available on non-windows systems. Windows users can download and install available on non-windows systems. Windows users can download and install
python from http://www.python.org. python from http://www.python.org.
* SCons: * SCons:
scons >= 0.96.92 is needed. You can either use a full system-wide scons scons >= 1.1.0 is needed. You can either use a full system-wide scons
distribution or a light-weight one (called scons-local) installed along distribution or a light-weight one (called scons-local) installed along
with the lyx source tree. Both variants of scons are freely available with the lyx source tree. Both variants of scons are freely available
from http://www.scons.org. Note that LyX source may ship with scons-base from http://www.scons.org. Note that LyX source may ship with scons-base

60
development/scons/SConstruct
View File

@ -110,16 +110,16 @@ if os.path.isfile('config.py'):
print "Getting options from config.py..." print "Getting options from config.py..."
print open('config.py').read() print open('config.py').read()
opts = Options(['config.py']) opts = Variables(['config.py'])
opts.AddOptions( opts.AddVariables(
# frontend # frontend
EnumOption('frontend', 'Main GUI', 'qt4', EnumVariable('frontend', 'Main GUI', 'qt4',
allowed_values = ('qt4',) ), allowed_values = ('qt4',) ),
# debug or release build # debug or release build
EnumOption('mode', 'Building method', default_build_mode, EnumVariable('mode', 'Building method', default_build_mode,
allowed_values = ('debug', 'release') ), allowed_values = ('debug', 'release') ),
# boost libraries # boost libraries
EnumOption('boost', EnumVariable('boost',
'Use included, system boost library, or try sytem boost first.', 'Use included, system boost library, or try sytem boost first.',
'auto', allowed_values = ( 'auto', allowed_values = (
'auto', # detect boost, if not found, use included 'auto', # detect boost, if not found, use included
@ -127,7 +127,7 @@ opts.AddOptions(
'system', # always use system boost, fail if can not find 'system', # always use system boost, fail if can not find
) ), ) ),
# #
EnumOption('gettext', EnumVariable('gettext',
'Use included, system gettext library, or try sytem gettext first', 'Use included, system gettext library, or try sytem gettext first',
'auto', allowed_values = ( 'auto', allowed_values = (
'auto', # detect gettext, if not found, use included 'auto', # detect gettext, if not found, use included
@ -135,46 +135,46 @@ opts.AddOptions(
'system', # always use system gettext, fail if can not find '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', 'auto', 'no') ), allowed_values = ('aspell', 'pspell', 'ispell', 'auto', 'no') ),
# packaging method # 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')), 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) # 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 # enable assertion, (config.h has ENABLE_ASSERTIOS
BoolOption('assertions', 'Use assertions', True), BoolVariable('assertions', 'Use assertions', True),
# config.h define _GLIBCXX_CONCEPT_CHECKS # config.h define _GLIBCXX_CONCEPT_CHECKS
# Note: for earlier version of gcc (3.3) define _GLIBCPP_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 # 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? # 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 # 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 # 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), ('rebuild', 'Obsolete option', None),
# can be set to a non-existing directory # can be set to a non-existing directory
@ -184,9 +184,9 @@ opts.AddOptions(
# the deps package used to create minimal installer (qt and other libraries) # 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, zlib and qt libraries', None),
# whether or not build bundle installer # 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 # 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 directory, will use $mode if not set
('build_dir', 'Build directory', None), ('build_dir', 'Build directory', None),
# version suffix # version suffix
@ -200,7 +200,7 @@ opts.AddOptions(
# #
('optimization', 'optimization CCFLAGS option.', None), ('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 # log file
('logfile', 'save commands (not outputs) to logfile', default_log_file), ('logfile', 'save commands (not outputs) to logfile', default_log_file),
# provided for backward compatibility # provided for backward compatibility
@ -220,7 +220,7 @@ opts.AddOptions(
# allowed options # allowed options
all_options = [x.key for x in opts.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 # We need to use them before a boolean ARGUMENTS option is available
# in env as bool. # in env as bool.
true_strings = ('y', 'yes', 'true', 't', '1', 'on' , 'all' ) true_strings = ('y', 'yes', 'true', 't', '1', 'on' , 'all' )