Changeset 1259 for trunk/SConstruct

Timestamp:

09/11/06 15:10:05 (18 years ago)

Author:

mar637

Message:

Merge from Release2.1.0b tag

File:

• trunk/SConstruct (modified) (3 diffs)

trunk/SConstruct

@@ -27 +27 @@
                 ("makedist",
                  "Make a binary archive giving a suffix, e.g. sarge or fc5",
-                 "")
+                 ""),
+                EnumOption("makedoc", "Build the userguide in specified format",
+                           "none",
+                           ["none", "pdf", "html"], ignorecase=1)
                 )
 
@@ -76 +79 @@
     env = conf.Finish()
 
-env["version"] = "2.1.0b1"
+env["version"] = "2.1.0b2"
 
 # general CPPFLAGS
@@ -149 +152 @@
                         env["stagedir"])
     env.AddPostAction(arch, Delete("$stagedir"))
+if env["makedoc"].lower() != "none":
+    env.SConscript("doc/SConscript")
 
 if env.GetOption("clean"):