devs/libstrophe-gh
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix SConstruct to use env.Clone() instead of deprecated env.Copy().

Browse Source
This commit is contained in:
Jack Moffitt
2008-08-14 03:32:06 +00:00
parent 839162f48d
commit 5856ecbacc
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SConstruct
View File

@@ -76,7 +76,7 @@ if env['CC'] == 'gcc':
if env['CC'] == 'cl': if env['CC'] == 'cl':
env.Append(CCFLAGS=["/MDd", "/ZI"]) env.Append(CCFLAGS=["/MDd", "/ZI"])
expatenv = env.Copy() expatenv = env.Clone()
# feature defs # feature defs
expatenv.Append(CCFLAGS=" -DXML_DTD") expatenv.Append(CCFLAGS=" -DXML_DTD")
expatenv.Append(CCFLAGS=" -DXML_NS") expatenv.Append(CCFLAGS=" -DXML_NS")
@@ -89,14 +89,14 @@ expatenv.Append(CCFLAGS=" -DHAVE_UNISTD")
expat = expatenv.Library('expat', path(join('expat', 'lib'), ExpatSources)) expat = expatenv.Library('expat', path(join('expat', 'lib'), ExpatSources))
Default(expat) Default(expat)
stropheenv = env.Copy() stropheenv = env.Clone()
stropheenv.Append(CCFLAGS=" -DXML_STATIC") stropheenv.Append(CCFLAGS=" -DXML_STATIC")
stropheenv.Append(CPPPATH=['.', 'src', join('expat','lib')]) stropheenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
strophe = stropheenv.Library('strophe', path("src", Sources)) strophe = stropheenv.Library('strophe', path("src", Sources))
Default(strophe) Default(strophe)
exenv = env.Copy() exenv = env.Clone()
exenv.Append(CPPPATH=['.']) exenv.Append(CPPPATH=['.'])
exenv.Append(LIBS=["strophe", "expat"]) exenv.Append(LIBS=["strophe", "expat"])
exenv.Append(LIBPATH=["."]) exenv.Append(LIBPATH=["."])
@@ -138,7 +138,7 @@ def testcase_runner(target, source, env):
result = unittest.TextTestRunner(verbosity=2).run(suite) result = unittest.TextTestRunner(verbosity=2).run(suite)
env.Execute(Touch(str(target[0]))) env.Execute(Touch(str(target[0])))
testenv = env.Copy() testenv = env.Clone()
testenv.Append(CPPPATH=['.', 'src', join('expat','lib')]) testenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
testenv.Append(LIBS=['strophe', 'expat']) testenv.Append(LIBS=['strophe', 'expat'])
if testenv["PLATFORM"] == "win32": if testenv["PLATFORM"] == "win32":