anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug fixes to the scons system.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13831 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Bo Peng 2006-05-11 05:35:01 +00:00
parent bee53b6c8d
commit c7fa09fe9f
3 changed files with 193 additions and 163 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
development/scons/SConscript
View File

@ -16,7 +16,7 @@ Import('env')
# boost libraries # boost libraries
# #
if env['INCLUDED_BOOST']: if env['INCLUDED_BOOST']:
env.BuildDir('#$BUILDDIR/common', '$TOP_SRC_DIR/boost/libs', duplicate = 0) env.BuildDir('$BUILDDIR/boost', '$TOP_SRC_DIR/boost/libs', duplicate = 0)
boostenv = env.Copy() boostenv = env.Copy()
boostenv.Append(CCFLAGS = '-DBOOST_USER_CONFIG="<config.h>"') boostenv.Append(CCFLAGS = '-DBOOST_USER_CONFIG="<config.h>"')
@ -27,7 +27,7 @@ if env['INCLUDED_BOOST']:
filesystem = boostenv.StaticLibrary( filesystem = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_filesystem', target = '$LOCALLIBPATH/boost_filesystem',
source = ["#$BUILDDIR/common/filesystem/src/%s" % x for x in Split(''' source = ["$BUILDDIR/boost/filesystem/src/%s" % x for x in Split('''
convenience.cpp convenience.cpp
exception.cpp exception.cpp
operations_posix_windows.cpp operations_posix_windows.cpp
@ -39,7 +39,7 @@ if env['INCLUDED_BOOST']:
regex = boostenv.StaticLibrary( regex = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_regex', target = '$LOCALLIBPATH/boost_regex',
source = ["#$BUILDDIR/common/regex/src/%s" % x for x in Split(''' source = ["$BUILDDIR/boost/regex/src/%s" % x for x in Split('''
cpp_regex_traits.cpp cpp_regex_traits.cpp
c_regex_traits.cpp c_regex_traits.cpp
cregex.cpp cregex.cpp
@ -52,16 +52,11 @@ if env['INCLUDED_BOOST']:
''')] ''')]
) )
# Return the library
Return('regex')
Import('boostenv')
print 'Processing files in boost/libs/signals/src...' print 'Processing files in boost/libs/signals/src...'
signals = boostenv.StaticLibrary( signals = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_signals', target = '$LOCALLIBPATH/boost_signals',
source = ["#$BUILDDIR/common/signals/src/%s" % x for x in Split(''' source = ["$BUILDDIR/boost/signals/src/%s" % x for x in Split('''
connection.cpp connection.cpp
named_slot_map.cpp named_slot_map.cpp
signal_base.cpp signal_base.cpp
@ -74,7 +69,7 @@ if env['INCLUDED_BOOST']:
iostreams = boostenv.StaticLibrary( iostreams = boostenv.StaticLibrary(
target = '$LOCALLIBPATH/boost_iostreams', target = '$LOCALLIBPATH/boost_iostreams',
source = ["#$BUILDDIR/common/iostreams/src/%s" % x for x in Split(''' source = ["$BUILDDIR/boost/iostreams/src/%s" % x for x in Split('''
file_descriptor.cpp file_descriptor.cpp
mapped_file.cpp mapped_file.cpp
zlib.cpp zlib.cpp
@ -86,7 +81,7 @@ if env['INCLUDED_BOOST']:
# Now, src code under src/ # Now, src code under src/
# #
env.BuildDir('#$BUILDDIR/common', '$TOP_SRC_DIR/src', duplicate = 0) env.BuildDir('$BUILDDIR/common', '$TOP_SRC_DIR/src', duplicate = 0)
# #
# src/support # src/support
@ -97,11 +92,11 @@ print "Processing files in src/support"
env.Append(CPPPATH = ['.']) env.Append(CPPPATH = ['.'])
env['SUBST_KEYS'] = ['LYX_DIR', 'LOCALEDIR', 'TOP_SRCDIR', 'PROGRAM_SUFFIX'] env['SUBST_KEYS'] = ['LYX_DIR', 'LOCALEDIR', 'TOP_SRCDIR', 'PROGRAM_SUFFIX']
env.substFile('#$BUILDDIR/common/support/package.C', '$TOP_SRC_DIR/src/support/package.C.in') env.substFile('$BUILDDIR/common/support/package.C', '$TOP_SRC_DIR/src/support/package.C.in')
supports = env.StaticLibrary( supports = env.StaticLibrary(
target = '$LOCALLIBPATH/supports', target = '$LOCALLIBPATH/supports',
source = ['#$BUILDDIR/common/support/%s' % x for x in Split(''' source = ['$BUILDDIR/common/support/%s' % x for x in Split('''
FileMonitor.C FileMonitor.C
abort.C abort.C
chdir.C chdir.C
@ -141,7 +136,7 @@ print "Processing files in src/mathed"
mathed = env.StaticLibrary( mathed = env.StaticLibrary(
target = '$LOCALLIBPATH/mathed', target = '$LOCALLIBPATH/mathed',
source = ["#$BUILDDIR/common/mathed/%s" % x for x in Split(''' source = ["$BUILDDIR/common/mathed/%s" % x for x in Split('''
textpainter.C textpainter.C
math_amsarrayinset.C math_amsarrayinset.C
math_arrayinset.C math_arrayinset.C
@ -225,7 +220,7 @@ print "Processing files in src/insets"
insets = env.StaticLibrary( insets = env.StaticLibrary(
target = '$LOCALLIBPATH/insets', target = '$LOCALLIBPATH/insets',
source = ["#$BUILDDIR/common/insets/%s" % x for x in Split(''' source = ["$BUILDDIR/common/insets/%s" % x for x in Split('''
mailinset.C mailinset.C
ExternalSupport.C ExternalSupport.C
ExternalTemplate.C ExternalTemplate.C
@ -287,7 +282,7 @@ print "Processing files in src/frontends"
frontends = env.StaticLibrary( frontends = env.StaticLibrary(
target = '$LOCALLIBPATH/frontends', target = '$LOCALLIBPATH/frontends',
source = ["#$BUILDDIR/common/frontends/%s" % x for x in Split(''' source = ["$BUILDDIR/common/frontends/%s" % x for x in Split('''
Alert.C Alert.C
Dialogs.C Dialogs.C
LyXView.C LyXView.C
@ -309,7 +304,7 @@ print "Processing files in src/graphics"
graphics = env.StaticLibrary( graphics = env.StaticLibrary(
target = '$LOCALLIBPATH/graphics', target = '$LOCALLIBPATH/graphics',
source = ["#$BUILDDIR/common/graphics/%s" % x for x in Split(''' source = ["$BUILDDIR/common/graphics/%s" % x for x in Split('''
GraphicsCache.C GraphicsCache.C
GraphicsCacheItem.C GraphicsCacheItem.C
GraphicsConverter.C GraphicsConverter.C
@ -332,7 +327,7 @@ print "Processing files in src/frontends/controllers"
controllers = env.StaticLibrary( controllers = env.StaticLibrary(
target = '$LOCALLIBPATH/controllers', target = '$LOCALLIBPATH/controllers',
source = ["#$BUILDDIR/common/frontends/controllers/%s" % x for x in Split(''' source = ["$BUILDDIR/common/frontends/controllers/%s" % x for x in Split('''
Dialog.C Dialog.C
Kernel.C Kernel.C
biblio.C biblio.C
@ -389,7 +384,7 @@ controllers = env.StaticLibrary(
# #
frontend = env['frontend'] frontend = env['frontend']
env.BuildDir('#$BUILDDIR/$frontend', '$TOP_SRC_DIR/src/frontend/$frontend', duplicate = 0) env.BuildDir('$BUILDDIR/$frontend', '$TOP_SRC_DIR/src/frontend/$frontend', duplicate = 0)
if frontend == 'qt3': if frontend == 'qt3':
print "Processing files in src/frontends/qt3" print "Processing files in src/frontends/qt3"
@ -400,11 +395,11 @@ if frontend == 'qt3':
qt3env.Tool('qt') qt3env.Tool('qt')
qt3env.Append(CPPPATH = [ qt3env.Append(CPPPATH = [
'#$BUILDDIR/common', '$BUILDDIR/common',
'#$BUILDDIR/common/frontends', '$BUILDDIR/common/frontends',
'#$BUILDDIR/common/images', '$BUILDDIR/common/images',
'#$BUILDDIR/common/frontends/controllers', '$BUILDDIR/common/frontends/controllers',
'#$BUILDDIR/common/frontends/qt3', '$BUILDDIR/common/frontends/qt3',
'$QT_INC_DIR', '$QT_INC_DIR',
'.'] '.']
) )
@ -482,7 +477,7 @@ if frontend == 'qt3':
''') ''')
qt3_moc_files = ["#$BUILDDIR/common/frontends/qt3/%s" % x for x in Split(''' qt3_moc_files = ["$BUILDDIR/common/frontends/qt3/%s" % x for x in Split('''
BulletsModule.C BulletsModule.C
emptytable.C emptytable.C
FileDialog_private.C FileDialog_private.C
@ -548,11 +543,11 @@ if frontend == 'qt3':
# file extension from .C to .cpp # file extension from .C to .cpp
qt3_moced_files = [] qt3_moced_files = []
if os.name == 'nt' or sys.platform == 'cygwin': if os.name == 'nt' or sys.platform == 'cygwin':
qt3_moced_files = [qt3env.Moc('$BUILDDIR/common/frontends/qt3/'+x.replace('.C', '.h')) for x in moc_files] qt3_moced_files = [qt3env.Moc('$BUILDDIR/common/frontends/qt3/'+x.replace('.C', '.h')) for x in qt3_moc_files]
qt3 = qt3env.StaticLibrary( qt3 = qt3env.StaticLibrary(
target = '$LOCALLIBPATH/qt3', target = '$LOCALLIBPATH/qt3',
source = ["#$BUILDDIR/common/frontends/qt3/%s" % x for x in Split(''' source = ["$BUILDDIR/common/frontends/qt3/%s" % x for x in Split('''
QDialogView.C QDialogView.C
Alert_pimpl.C Alert_pimpl.C
Dialogs.C Dialogs.C
@ -615,7 +610,7 @@ if frontend == 'qt3':
qt_helpers.C qt_helpers.C
''')] + ''')] +
qt3_moc_files + qt3_moced_files + qt3_moc_files + qt3_moced_files +
['#$BUILDDIR/common/frontends/qt3/ui/' + x for x in qt3_ui_files] ['$BUILDDIR/common/frontends/qt3/ui/' + x for x in qt3_ui_files]
) )
elif frontend == 'qt4': elif frontend == 'qt4':
print "Processing files in src/frontends/qt4" print "Processing files in src/frontends/qt4"
@ -629,15 +624,15 @@ elif frontend == 'qt4':
# process .C file!!! (add to cxx_suffixes ) # process .C file!!! (add to cxx_suffixes )
# #
if frontend == 'qt4': if frontend == 'qt4':
qt4env.Tool('qt4', '.') qt4env.Tool('qt4', [env['SCONS_DIR']])
qt4env.EnableQt4Modules(env['QT_LIB'], debug = False) qt4env.EnableQt4Modules(env['QT_LIB'], debug = False)
qt4env.Append(CPPPATH = [ qt4env.Append(CPPPATH = [
'#$BUILDDIR/common', '$BUILDDIR/common',
'#$BUILDDIR/common/images', '$BUILDDIR/common/images',
'#$BUILDDIR/common/frontends', '$BUILDDIR/common/frontends',
'#$BUILDDIR/common/frontends/qt4', '$BUILDDIR/common/frontends/qt4',
'#$BUILDDIR/common/frontends/controllers', '$BUILDDIR/common/frontends/controllers',
'$QT_INC_PATH', '$QT_INC_PATH',
'$QT_INC_PATH/Qt', '$QT_INC_PATH/Qt',
'$QT_INC_PATH/QtCore', '$QT_INC_PATH/QtCore',
@ -793,7 +788,7 @@ elif frontend == 'qt4':
# Compile resources # Compile resources
# #
for x in qt4_ui_files: for x in qt4_ui_files:
qt4env.Uic4('#$BUILDDIR/common/frontends/qt4/ui/' + x) qt4env.Uic4('$BUILDDIR/common/frontends/qt4/ui/' + x)
qt4_source_files = Split(''' qt4_source_files = Split('''
QDialogView.C QDialogView.C
@ -862,8 +857,8 @@ elif frontend == 'qt4':
qt4 = qt4env.StaticLibrary( qt4 = qt4env.StaticLibrary(
target = '$LOCALLIBPATH/qt4', target = '$LOCALLIBPATH/qt4',
LIBS = qt4env['QT_LIB'], LIBS = qt4env['QT_LIB'],
source = ["#$BUILDDIR/common/frontends/qt4/%s" % x for x in qt4_source_files] + \ source = ["$BUILDDIR/common/frontends/qt4/%s" % x for x in qt4_source_files] + \
["#$BUILDDIR/common/frontends/qt4/%s" % x for x in qt4_moc_files] ["$BUILDDIR/common/frontends/qt4/%s" % x for x in qt4_moc_files]
) )
@ -871,72 +866,71 @@ elif frontend == 'qt4':
# src/client # src/client
# #
if 'client' in env['BUILD_TARGETS']: env.BuildDir('$BUILDDIR/common', '$TOP_SRC_DIR/src', duplicate = 0)
env.BuildDir('#$BUILDDIR/common', '$TOP_SRC_DIR/src', duplicate = 0)
print "Processing files in src/client" print "Processing files in src/client"
lyxclient = env.Program( lyxclient = env.Program(
target = '#$BUILDDIR/common/client/lyxclient', target = '$BUILDDIR/common/client/lyxclient',
LIBS = env['BOOST_LIBRARIES'] + env['socket_libs'], LIBS = env['BOOST_LIBRARIES'] + env['socket_libs'] + ['supports'],
source = ["#$BUILDDIR/common/client/%s" % x for x in Split(''' source = ["$BUILDDIR/common/client/%s" % x for x in Split('''
boost.C boost.C
client.C client.C
debug.C debug.C
gettext.C gettext.C
messages.C messages.C
''')] ''')]
) )
env.fileCopy('$BUILDDIR/lyxclient', '$BUILDDIR/common/client/lyxclient')
env.copyFile('#$BUILDDIR/lyxclient', '#$BUILDDIR/common/client/lyxclient') Alias('lyxclient', lyxclient)
# #
# tex2lyx # tex2lyx
# #
if 'tex2lyx' in env['BUILD_TARGETS']: print "Processing files in src/tex2lyx"
print "Processing files in src/tex2lyx"
tex2lyx_env = env.Copy() tex2lyx_env = env.Copy()
# the order is important here. # the order is important here.
tex2lyx_env.Prepend(CPPPATH = ['#$BUILDDIR/common/tex2lyx']) tex2lyx_env.Prepend(CPPPATH = ['$BUILDDIR/common/tex2lyx'])
tex2lyx_env.Append(LIBPATH = ['#$LOCALLIBPATH']) tex2lyx_env.Append(LIBPATH = ['#$LOCALLIBPATH'])
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/FloatList.C', 'src/FloatList.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/FloatList.C', '$TOP_SRC_DIR/src/FloatList.C')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/Floating.C', 'src/Floating.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/Floating.C', '$TOP_SRC_DIR/src/Floating.C')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/counters.C', 'src/counters.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/counters.C', '$TOP_SRC_DIR/src/counters.C')
# for some reason I do not know, I have to copy the header files as well. # for some reason I do not know, I have to copy the header files as well.
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/lyxlayout.h', 'src/lyxlayout.h') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/lyxlayout.h', '$TOP_SRC_DIR/src/lyxlayout.h')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/lyxlayout.C', 'src/lyxlayout.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/lyxlayout.C', '$TOP_SRC_DIR/src/lyxlayout.C')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/lyxtextclass.h', 'src/lyxtextclass.h') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/lyxtextclass.h', '$TOP_SRC_DIR/src/lyxtextclass.h')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/lyxtextclass.C', 'src/lyxtextclass.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/lyxtextclass.C', '$TOP_SRC_DIR/src/lyxtextclass.C')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/lyxlex.C', 'src/lyxlex.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/lyxlex.C', '$TOP_SRC_DIR/src/lyxlex.C')
tex2lyx_env.fileCopy('#$BUILDDIR/common/tex2lyx/lyxlex_pimpl.C', 'src/lyxlex_pimpl.C') tex2lyx_env.fileCopy('$BUILDDIR/common/tex2lyx/lyxlex_pimpl.C', '$TOP_SRC_DIR/src/lyxlex_pimpl.C')
tex2lyx = tex2lyx_env.Program(
target = '#$BUILDDIR/common/tex2lyx/tex2lyx',
LIBS = ['supports'] + env['BOOST_LIBRARIES'] + env['SYSTEM_LIBS'],
source = ["#$BUILDDIR/common/tex2lyx/%s" % x for x in Split('''
FloatList.C
Floating.C
counters.C
lyxlayout.C
lyxtextclass.C
lyxlex.C
lyxlex_pimpl.C
boost.C
context.C
gettext.C
lengthcommon.C
lyxfont.C
texparser.C
tex2lyx.C
preamble.C
math.C
table.C
text.C
''')]
)
tex2lyx = tex2lyx_env.Program(
target = '$BUILDDIR/common/tex2lyx/tex2lyx',
LIBS = ['supports'] + env['BOOST_LIBRARIES'] + env['SYSTEM_LIBS'],
source = ["$BUILDDIR/common/tex2lyx/%s" % x for x in Split('''
FloatList.C
Floating.C
counters.C
lyxlayout.C
lyxtextclass.C
lyxlex.C
lyxlex_pimpl.C
boost.C
context.C
gettext.C
lengthcommon.C
lyxfont.C
texparser.C
tex2lyx.C
preamble.C
math.C
table.C
text.C
''')]
)
env.fileCopy('$BUILDDIR/tex2lyx', '$BUILDDIR/common/tex2lyx/tex2lyx')
Alias('tex2lyx', tex2lyx)
# #
# src/ # src/
# #
@ -944,7 +938,7 @@ if 'tex2lyx' in env['BUILD_TARGETS']:
print "Processing files in src" print "Processing files in src"
env['SUBST_KEYS'] = ['PACKAGE_VERSION', 'VERSION_INFO'] env['SUBST_KEYS'] = ['PACKAGE_VERSION', 'VERSION_INFO']
env.substFile('#$BUILDDIR/common/version.C', '$TOP_SRC_DIR/src/version.C.in') env.substFile('$BUILDDIR/common/version.C', '$TOP_SRC_DIR/src/version.C.in')
lyx_source = Split(''' lyx_source = Split('''
Bidi.C Bidi.C
@ -1065,13 +1059,12 @@ elif env.has_key('USE_PSPELL') and env['USE_PSPELL']:
elif env.has_key('USE_ISPELL') and env['USE_ISPELL']: elif env.has_key('USE_ISPELL') and env['USE_ISPELL']:
lyx_source.append('ispell.C') lyx_source.append('ispell.C')
env.BuildDir('#$BUILDDIR/common', '$TOP_SRC_DIR/src', duplicate = 0)
# #
# Build lyx with given frontend # Build lyx with given frontend
# #
lyx = env.Program( lyx = env.Program(
target = '#$BUILDDIR/$frontend/lyx', target = '$BUILDDIR/$frontend/lyx',
source = ["#$BUILDDIR/common/%s" % x for x in lyx_source], source = ["$BUILDDIR/common/%s" % x for x in lyx_source],
LIBS = [ LIBS = [
'mathed', 'mathed',
'insets', 'insets',
@ -1084,4 +1077,17 @@ lyx = env.Program(
env['EXTRA_LIBS'] + env['EXTRA_LIBS'] +
env['SYSTEM_LIBS'] env['SYSTEM_LIBS']
) )
Alias('lyx', lyx)
env.fileCopy('$BUILDDIR/lyx$frontend', '$BUILDDIR/$frontend/lyx')
# other targets include client, tex2lyx
Default('lyx')
Alias('install', env.installProg(Dir(env['BIN_DIR']),
[lyx, tex2lyx, lyxclient]))
## Alias('install', env.installProg(Dir(os.path.join(env['PREFIX'], 'share/lyx/')),
## [Dir(env.subst('$TOP_SRC_DIR/lib/') + dir) for dir in ['images', 'layouts', 'scripts', 'templates', \
## 'examples', 'kbd', 'lyx2lyx', 'tex', 'clipart', 'doc', 'ui'] ] + \
## [File(env.subst('$TOP_SRC_DIR/lib/') + file) for file in ['configure.py', 'encodings', 'chkconfig.ltx', 'CREDITS', \
## 'external_templates', 'symbols', 'languages', 'lyxrc.example', 'syntax.default']]))

70
development/scons/SConstruct
View File

@ -12,19 +12,28 @@
# This is a scons based building system for lyx, you can use it as follows: # This is a scons based building system for lyx, you can use it as follows:
# (after of course installation of scons from www.scons.org) # (after of course installation of scons from www.scons.org)
# #
# scons [frontend=qt3|gt4] [boost=included|auto] ... # $ cd development/scons
# $ scons [options] [targets]
# or:
# $ scons -f development/scons/SConstruct [options] [targets]
#
# After compiling, you can install lyx by
# $ scons [prefix=.] install
# #
# Where: # Where:
# * use scons -h for details about parameters # * targets can be one or more of lyx, tex2lyx, client, default to lyx
# * qt3 is used by default on linux, cygwin and mac # * options: use scons -h for details about parameters, the most important
# * qt4 is used by default on win32 # one is frontend=qt3|qt4.
# * qt3 is used by default on linux, cygwin and mac
# * qt4 is used by default on win32/mingw
# #
# File layouts (Important): # File layouts (Important):
# * Unless you specify builddir=dir, building will happen # * Unless you specify builddir=dir, building will happen
# in $BUILDDIR = $mode/$platform-$frontend. E.g., something like # in $BUILDDIR = $mode, which can be debug or release
# debug/linux-qt3/ # * $BUILDDIR has subdirectories
# * All shared libs will be put in $BUILDDIR/libs, e.g. # libs: all intermediate libraries
# debug/linux-qt3/libs # boost: boost libraries, if boost=included is used
# qt3: build result
# * lyx executable will be in directories like debug/linux-qt3 # * lyx executable will be in directories like debug/linux-qt3
# #
# Hints: # Hints:
@ -79,8 +88,16 @@ EnsurePythonVersion(1, 5)
# Please use at least 0.96.91 (not 0.96.1) # Please use at least 0.96.91 (not 0.96.1)
EnsureSConsVersion(0, 96) EnsureSConsVersion(0, 96)
# I am in TOP_SRC_DIR/developement/scons # determine where I am ...
TOP_SRC_DIR = '../..' #
# called as 'scons -f development/scons/SConstruct'
if os.path.isfile('SConstruct'):
TOP_SRC_DIR = '../..'
SCONS_DIR = '.'
# called as 'cd development/scons; scons'
else:
TOP_SRC_DIR = '.'
SCONS_DIR = 'development/scons'
#---------------------------------------------------------- #----------------------------------------------------------
# Global definitions # Global definitions
@ -232,10 +249,10 @@ opts.AddOptions(
BoolOption('nls', '(NA) Whether or not use native language support', False), BoolOption('nls', '(NA) Whether or not use native language support', False),
# FIXME: not implemented # FIXME: not implemented
BoolOption('profile', '(NA) Whether or not enable profiling', False), BoolOption('profile', '(NA) Whether or not enable profiling', False),
# FIXME: not implemented #
PathOption('prefix', '(NA) install architecture-independent files in PREFIX', '.'), PathOption('prefix', 'install architecture-independent files in PREFIX', '.'),
# FIXME: not implemented #
PathOption('exec_prefix', '(NA) install architecture-independent executable files in PREFIX', '.'), PathOption('exec_prefix', 'install architecture-independent executable files in PREFIX', '.'),
# FIXME: not implemented # FIXME: not implemented
BoolOption('std_debug', '(NA) Whether or not turn on stdlib debug', False), BoolOption('std_debug', '(NA) Whether or not turn on stdlib debug', False),
# using x11? # using x11?
@ -270,14 +287,17 @@ use_X11 = ARGUMENTS.get('X11', default_with_x)
# Setting up environment # Setting up environment
#--------------------------------------------------------- #---------------------------------------------------------
env = Environment( env = Environment(options = opts)
options = opts
)
# set environment since I do not really like ENV = os.environ # set environment since I do not really like ENV = os.environ
#env['ENV']['PATH'] = os.environ.get('PATH') env['ENV']['PATH'] = os.environ.get('PATH')
env['ENV']['HOME'] = os.environ.get('HOME') env['ENV']['HOME'] = os.environ.get('HOME')
env['TOP_SRC_DIR'] = TOP_SRC_DIR env['TOP_SRC_DIR'] = TOP_SRC_DIR
env['SCONS_DIR'] = SCONS_DIR
# install to current directory by default
env['PREFIX'] = ARGUMENTS.get('prefix', '.')
env['BIN_DIR'] = ARGUMENTS.get('exec_prefix',
os.path.join(env['PREFIX'], 'bin'))
# speed up source file processing # speed up source file processing
#env['CPPSUFFIXES'] = ['.C', '.cc', '.cpp'] #env['CPPSUFFIXES'] = ['.C', '.cc', '.cpp']
@ -322,10 +342,10 @@ if ARGUMENTS.has_key('build_dir'):
env['BUILDDIR'] = build_dir env['BUILDDIR'] = build_dir
else: else:
# Determine the name of the build (platform+frontend # Determine the name of the build (platform+frontend
env['BUILDDIR'] = env['mode'] env['BUILDDIR'] = '#' + env['mode']
# all built libraries will go to build_dir/libs # all built libraries will go to build_dir/libs
# (This is different from the make file approach) # (This is different from the make file approach)
env['LOCALLIBPATH'] = '#$BUILDDIR/libs' env['LOCALLIBPATH'] = '$BUILDDIR/libs'
env.AppendUnique(LIBPATH = ['$LOCALLIBPATH']) env.AppendUnique(LIBPATH = ['$LOCALLIBPATH'])
# #
@ -771,6 +791,9 @@ else:
env['BUILDERS']['substFile'] = Builder(action = utils.env_subst) env['BUILDERS']['substFile'] = Builder(action = utils.env_subst)
# FIXME: there must be a better way. # FIXME: there must be a better way.
env['BUILDERS']['fileCopy'] = Builder(action = utils.env_filecopy) env['BUILDERS']['fileCopy'] = Builder(action = utils.env_filecopy)
# install
env['BUILDERS']['installProg'] = Builder(action = utils.env_installProg)
env['BUILDERS']['installFile'] = Builder(action = utils.env_installFile)
# #
# A Link script for cygwin see # A Link script for cygwin see
@ -874,11 +897,6 @@ SConsignFile(os.path.abspath('%s/sconsign' % env['BUILDDIR']))
print "Building all targets recursively" print "Building all targets recursively"
# Now, specification of targets is difficult env.SConscript('$SCONS_DIR/SConscript', duplicate = 0)
# we can do this though:
#
env['BUILD_TARGETS'] = BUILD_TARGETS
env.SConscript('SConscript', duplicate = 0)

76
development/scons/scons_utils.py
View File

@ -329,8 +329,6 @@ def processLang(env, folder):
if not languages or country in languages: if not languages or country in languages:
result = env.Transfiles(file) result = env.Transfiles(file)
# FIXME # FIXME
# dir=env.join( getInstDirForResType(env, 'KDELOCALE'), country)
# env.bksys_install(env.join(dir, 'LC_MESSAGES'), result, destfile=appname+'.mo')
def installCygwinLDScript(path): def installCygwinLDScript(path):
@ -619,40 +617,48 @@ def setLoggedSpawn(env, logfile = '', longarg=False, info=''):
# replace the old SPAWN by the new function # replace the old SPAWN by the new function
env['SPAWN'] = ls.spawn env['SPAWN'] = ls.spawn
#
# Install program with permission
# http://www.scons.org/cgi-sys/cgiwrap/scons/moin.cgi/InstallTargets
#
import SCons
from SCons.Script.SConscript import SConsEnvironment
SConsEnvironment.Chmod = SCons.Action.ActionFactory(os.chmod,
lambda dest, mode: 'Chmod("%s", 0%o)' % (dest, mode))
def installPerm(target, source, env, perm):
''' install program with permission, will copy
files recursively if needed '''
# FIXME: mixed use of scons and python interfaces?
target_dir = str(target[0])
if os.path.isfile(target_dir):
print "Target should be a directory: ", target_dir
return
if not os.path.isdir(target_dir):
os.makedirs(target_dir)
objs = []
for fnode in source:
fname = str(fnode)
print "Installing", fname, "to", target_dir
if os.path.isfile(fname):
objs.append(os.path.join(target_dir, fname))
shutil.copy(fname, target_dir)
elif os.path.isdir(fname):
# FIXME: directory permission is not set
if os.path.isdir(os.path.join(target_dir, fname)):
shutil.rmtree(os.path.join(target_dir, fname))
shutil.copytree(fname, target_dir)
#for i in objs:
# env.AddPostAction(File(i), env.Chmod(i, perm))
return target
def env_installProg(target, source, env):
installPerm(target, source, env, 0755)
def env_installFile(target, source, env):
installPerm(target, source, env, 0644)
## def CheckPython(context, minver):
## context.Message('Checking for Python >= %s...' % '.'.join(str(x) for x in minver))
## try:
## python = context.env['PYTHON']
## except KeyError:
## try:
## python = os.environ['PYTHON']
## except KeyError:
## python = WhereIs("python")
## if not python:
## python = python = WhereIs("python%i.%i" % (minver[0], minver[1]))
## minverhex = 0
## minver = list(minver) + [0, 0, 0, 0]
## for i in xrange(0, 4):
## minverhex = (minverhex << 8) + minver[i]
## prog = "import sys; sys.exit(sys.hexversion >= %s)" % minverhex
## if python is None:
## python = 'python'
## try:
## result = Popen([python, "-c", prog]).wait()
## except OSError:
## context.Result(False)
## return False
## context.Result(result)
## if result:
## context.env.Replace(PYTHON=python)
## proc = Popen([python, "-c", "import sys; print sys.version[:3]"], stdout=PIPE)
## pyver = proc.communicate()[0].rstrip()
## context.env.Replace(PYTHON_VERSION=pyver)
## context.env.Replace(pythondir="$prefix/lib/python$PYTHON_VERSION/site-packages")
## context.env.Replace(pyexecdir="${exec_prefix}/lib/python$PYTHON_VERSION/site-packages")
## return result
##
## def DistSources(env, node): ## def DistSources(env, node):
## env.DistFiles(_get_sources(env, node)) ## env.DistFiles(_get_sources(env, node))
## ##