summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2010-10-10 13:38:19 (GMT)
committerRemko Tronçon <git@el-tramo.be>2010-10-10 13:38:19 (GMT)
commit5fcadd4e60d2e8bd8866bddef6bcefa59a18adf8 (patch)
tree198eafdec1dce1b7dc6ce21fbbd86bebbd4098cb /Documentation
parent29e4e51e21b8902c82456cc85af46fa5f5889f04 (diff)
downloadswift-5fcadd4e60d2e8bd8866bddef6bcefa59a18adf8.zip
swift-5fcadd4e60d2e8bd8866bddef6bcefa59a18adf8.tar.bz2
Move SoftwareVersionResponder constructor arguments to setter.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/API/SConscript9
-rw-r--r--Documentation/SConscript3
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp4
-rw-r--r--Documentation/SwiftenDevelopersGuide/SConscript3
4 files changed, 9 insertions, 10 deletions
diff --git a/Documentation/API/SConscript b/Documentation/API/SConscript
index 0a7ae36..df20b27 100644
--- a/Documentation/API/SConscript
+++ b/Documentation/API/SConscript
@@ -1,7 +1,6 @@
Import("env")
-myenv = env.Clone()
-
-myenv.Tool("DoxyGen", toolpath = ["#/BuildTools/SCons/Tools"])
-
-myenv.DoxyGen("Doxyfile")
+if "doc" in ARGUMENTS :
+ myenv = env.Clone()
+ myenv.Tool("DoxyGen", toolpath = ["#/BuildTools/SCons/Tools"])
+ myenv.DoxyGen("Doxyfile")
diff --git a/Documentation/SConscript b/Documentation/SConscript
index b42fc62..da93894 100644
--- a/Documentation/SConscript
+++ b/Documentation/SConscript
@@ -1,5 +1,4 @@
Import("env")
if env["SCONS_STAGE"] == "build" :
- if "doc" in ARGUMENTS :
- SConscript(dirs = ["SwiftenDevelopersGuide", "API"])
+ SConscript(dirs = ["SwiftenDevelopersGuide", "API"])
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
index 98a63d6..d675062 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
@@ -25,8 +25,8 @@ class EchoBot {
bind(&EchoBot::handlePresenceReceived, this, _1));
tracer = new ClientXMLTracer(client);
//...
- softwareVersionResponder = new SoftwareVersionResponder(
- "EchoBot", "1.0", client->getIQRouter());
+ softwareVersionResponder = new SoftwareVersionResponder(client->getIQRouter());
+ softwareVersionResponder->setVersion("EchoBot", "1.0");
softwareVersionResponder->start();
//...
client->connect();
diff --git a/Documentation/SwiftenDevelopersGuide/SConscript b/Documentation/SwiftenDevelopersGuide/SConscript
index fb08a8f..dc00ab4 100644
--- a/Documentation/SwiftenDevelopersGuide/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/SConscript
@@ -81,7 +81,8 @@ def generateDocBookCode(env, target, source) :
################################################################################
-env.DocBook("Swiften Developers Guide.xml")
+if "doc" in ARGUMENTS :
+ env.DocBook("Swiften Developers Guide.xml")
for i in range(1, 6) :
source = "Examples/EchoBot/EchoBot" + str(i) + ".cpp"