Update of /cvsroot/csp/APPLICATIONS/SimData
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16079
Modified Files:
CHANGES.current SConstruct build_config.py build_support.py
Removed Files:
construct.py
Log Message:
Index: CHANGES.current
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/CHANGES.current,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** CHANGES.current 31 Jan 2004 06:24:07 -0000 1.95
--- CHANGES.current 1 Feb 2004 10:01:03 -0000 1.96
***************
*** 1,4 ****
--- 1,11 ----
Version 0.4.0 (in progress)
===========================
+ 2003-01-31: onsight
+ * Added debian packaging files (experimental).
+
+ * Added 'docs --clean' target to scons.
+
+ * Fixed the source directory for building scons sdist.
+
2003-01-30: onsight
* Starting with version 1.3.20 of SWIG, the python runtime
Index: SConstruct
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/SConstruct,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SConstruct 1 Nov 2003 16:08:40 -0000 1.3
--- SConstruct 1 Feb 2004 10:01:03 -0000 1.4
***************
*** 48,52 ****
EnsureSConsVersion(0,9)
EnsurePythonVersion(2,2)
- #EnsureSwigVersion('1.3.16 1.3.17 1.3.20') # only needed for shared lib
if ARGUMENTS.get('PLATFORM', 0):
--- 48,51 ----
***************
*** 56,60 ****
ConfigPython(env)
- ConfigPlatform(env)
package = Package(env)
--- 55,58 ----
***************
*** 77,94 ****
options.Add('ARCHIVE_FORMATS',
help='File format(s) for distribution archives',
! default=None)
options.Add('PACKAGE_PREFIX',
help='Installation path for the SimData package',
! default=env['PYTHON_LIB'])
options.Add('INCLUDE_PREFIX',
help='Installation path for the SimData headers and interfaces',
! default=env['PYTHON_INC'])
options.Update(env)
Help(options.GenerateHelpText(env))
! # construct.addSwigSupport(env)
! conf = Configure(env)
! addConfigTests(conf)
if not conf.checkSwig('1.3.16', ('1.3.18','1.3.19')):
print
--- 75,91 ----
options.Add('ARCHIVE_FORMATS',
help='File format(s) for distribution archives',
! default=None)
options.Add('PACKAGE_PREFIX',
help='Installation path for the SimData package',
! default=env['PYTHON_LIB'])
options.Add('INCLUDE_PREFIX',
help='Installation path for the SimData headers and interfaces',
! default=env['PYTHON_INC'])
options.Update(env)
Help(options.GenerateHelpText(env))
! # Configuration tests
! conf = CustomConfigure(env)
if not conf.checkSwig('1.3.16', ('1.3.18','1.3.19')):
print
***************
*** 99,102 ****
--- 96,102 ----
print
Exit(1)
+ env = conf.Finish()
+
+ ConfigPlatform(env)
# Export('env', 'construct', 'Package')
Index: build_config.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_config.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_config.py 1 Nov 2003 16:08:40 -0000 1.1
--- build_config.py 1 Feb 2004 10:01:03 -0000 1.2
***************
*** 1,3 ****
! from build_support import Config
--- 1,3 ----
! from build_support import Config, compareVersions
***************
*** 8,15 ****
self.CPPPATH = ['#/Include', self.PYTHON_INC]
self.SHLINKFLAGS = ' -shared -Wl,-z,lazyload'
! self.SHLINKLIBS = ['dl', 'swigpy']
! self.SWIGFLAGS = ' -c -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
self.CXXFILESUFFIX = '.cpp'
self.ARCHIVE_FORMATS = None
class Config_msvc(Config):
--- 8,24 ----
self.CPPPATH = ['#/Include', self.PYTHON_INC]
self.SHLINKFLAGS = ' -shared -Wl,-z,lazyload'
! self.SHLINKLIBS = ['dl']
self.CXXFILESUFFIX = '.cpp'
self.ARCHIVE_FORMATS = None
+ self.configSwig(env)
+ def configSwig(self, env):
+ version = env['SWIG_VERSION']
+ self.SWIGFLAGS = ' -c++ -python -noexcept -IInclude -I%s' % self.PYTHON_INC
+ if compareVersions(version, '1.3.20') >= 0:
+ self.SWIGFLAGS = self.SWIGFLAGS + ' -runtime'
+ else:
+ self.SWIGFLAGS = self.SWIGFLAGS + ' -c'
+ self.SHLINKLIBS.append('swigpy')
+
class Config_msvc(Config):
Index: build_support.py
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/build_support.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build_support.py 1 Nov 2003 16:08:40 -0000 1.1
--- build_support.py 1 Feb 2004 10:01:03 -0000 1.2
***************
*** 30,33 ****
--- 30,34 ----
import SCons.Errors
+
Action = SCons.Action.Action
Builder = SCons.Builder.Builder
***************
*** 123,126 ****
--- 124,132 ----
conf.AddTests(configure_tests)
+ def CustomConfigure(env):
+ conf = env.Configure()
+ addConfigTests(conf)
+ return conf
+
############################################################################
***************
*** 193,196 ****
--- 199,203 ----
if ok:
context.Result("yes (%s)" % swig_version)
+ context.env['SWIG_VERSION'] = swig_version
else:
context.Result("no")
***************
*** 481,488 ****
install_package = installPythonSources(env, package_target, package_files)
install_headers = installPythonSources(env, include_target, include_files)
env.Alias('install', install_package + install_headers)
def Prefix(dir, names):
! return map(lambda x: os.path.normpath(os.path.join(dir, x)), names.split())
--- 488,499 ----
install_package = installPythonSources(env, package_target, package_files)
install_headers = installPythonSources(env, include_target, include_files)
+ env.Alias('install_package', install_package)
+ env.Alias('install_headers', install_headers)
env.Alias('install', install_package + install_headers)
def Prefix(dir, names):
! if type(names) == type(''):
! names = names.split()
! return map(lambda x: os.path.normpath(os.path.join(dir, x)), names)
--- construct.py DELETED ---
|
