Apply the name change to SConstruct, generating libstrophe.a instead
of libxmpp.a.
This commit is contained in:
22
SConstruct
22
SConstruct
@@ -16,8 +16,8 @@
|
|||||||
|
|
||||||
# invoke with 'scons' to build the library
|
# invoke with 'scons' to build the library
|
||||||
|
|
||||||
LIBXMPP_VERSION_MAJOR=0
|
LIBSTROPHE_VERSION_MAJOR=0
|
||||||
LIBXMPP_VERSION_MINOR=0
|
LIBSTROPHE_VERSION_MINOR=7
|
||||||
|
|
||||||
from os.path import join
|
from os.path import join
|
||||||
|
|
||||||
@@ -80,14 +80,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)
|
||||||
|
|
||||||
xmppenv = env.Copy()
|
stropheenv = env.Copy()
|
||||||
xmppenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
stropheenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
||||||
|
|
||||||
xmpp = xmppenv.Library('xmpp', path("src", Sources))
|
strophe = stropheenv.Library('strophe', path("src", Sources))
|
||||||
Default(xmpp)
|
Default(strophe)
|
||||||
|
|
||||||
exenv = xmppenv.Copy()
|
exenv = stropheenv.Copy()
|
||||||
exenv.Append(LIBS=["xmpp", "expat"])
|
exenv.Append(LIBS=["strophe", "expat"])
|
||||||
exenv.Append(LIBPATH=["."])
|
exenv.Append(LIBPATH=["."])
|
||||||
for e in path("examples", Examples):
|
for e in path("examples", Examples):
|
||||||
example = exenv.Program(e)
|
example = exenv.Program(e)
|
||||||
@@ -95,9 +95,9 @@ for e in path("examples", Examples):
|
|||||||
|
|
||||||
# generate a MSVC project for convenience
|
# generate a MSVC project for convenience
|
||||||
# TODO: this doesn't seem to be implemented?
|
# TODO: this doesn't seem to be implemented?
|
||||||
#env.MSVSProject(target = 'xmpp' + env['MSVSPROJECTSUFFIX'],
|
#env.MSVSProject(target = 'strophe' + env['MSVSPROJECTSUFFIX'],
|
||||||
# srcs = path("src", Sources), incs = path("src", Headers),
|
# srcs = path("src", Sources), incs = path("src", Headers),
|
||||||
# variant = 'Release', buildtarget = xmpp)
|
# variant = 'Release', buildtarget = strophe)
|
||||||
|
|
||||||
### unit and regression tests
|
### unit and regression tests
|
||||||
|
|
||||||
@@ -125,7 +125,7 @@ def testcase_runner(target, source, env):
|
|||||||
|
|
||||||
testenv = env.Copy()
|
testenv = env.Copy()
|
||||||
testenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
testenv.Append(CPPPATH=['.', 'src', join('expat','lib')])
|
||||||
testenv.Append(LIBS=['xmpp', 'expat'])
|
testenv.Append(LIBS=['strophe', 'expat'])
|
||||||
testenv.Append(LIBPATH=['.'])
|
testenv.Append(LIBPATH=['.'])
|
||||||
|
|
||||||
import SCons.Node
|
import SCons.Node
|
||||||
|
|||||||
Reference in New Issue
Block a user