Ticket #9245: geometry-svn.patch

libs/geometry/doc/index/make_qbk.py

@@ -17 +17 @@
 cmd = cmd + " --output_style alt"
 cmd = cmd + " > generated/%s.qbk"
 
-os.system("doxygen Doxyfile")
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1rtree", "rtree"))
-os.system(cmd % ("group__rtree__functions", "rtree_functions"))
+def run_command(command):
+    if os.system(command) != 0:
+        raise Exception("Error running %s" % command)
 
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1linear", "rtree_linear"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1quadratic", "rtree_quadratic"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1rstar", "rtree_rstar"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__linear", "rtree_dynamic_linear"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__quadratic", "rtree_dynamic_quadratic"))
-os.system(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__rstar", "rtree_dynamic_rstar"))
+run_command("doxygen Doxyfile")
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1rtree", "rtree"))
+run_command(cmd % ("group__rtree__functions", "rtree_functions"))
 
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1indexable", "indexable"))
-os.system(cmd % ("structboost_1_1geometry_1_1index_1_1equal__to", "equal_to"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1linear", "rtree_linear"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1quadratic", "rtree_quadratic"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1rstar", "rtree_rstar"))
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__linear", "rtree_dynamic_linear"))
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__quadratic", "rtree_dynamic_quadratic"))
+run_command(cmd % ("classboost_1_1geometry_1_1index_1_1dynamic__rstar", "rtree_dynamic_rstar"))
 
-os.system(cmd % ("group__predicates", "predicates"))
-#os.system(cmd % ("group__nearest__relations", "nearest_relations"))
-os.system(cmd % ("group__adaptors", "adaptors"))
-os.system(cmd % ("group__inserters", "inserters"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1indexable", "indexable"))
+run_command(cmd % ("structboost_1_1geometry_1_1index_1_1equal__to", "equal_to"))
 
-#os.system("b2")
+run_command(cmd % ("group__predicates", "predicates"))
+#run_command(cmd % ("group__nearest__relations", "nearest_relations"))
+run_command(cmd % ("group__adaptors", "adaptors"))
+run_command(cmd % ("group__inserters", "inserters"))
+
+#run_command("b2")

libs/geometry/doc/make_qbk.py

@@ -34 +34 @@
 cmd = cmd + " --output_member_variables false"
 cmd = cmd + " > generated/%s.qbk"
 
+def run_command(command):
+    if os.system(command) != 0:
+        raise Exception("Error running %s" % command)
+
 def call_doxygen():
     os.chdir("doxy");
-    os.system("rm -f doxygen_output/xml/*.xml")
-    os.system(doxygen_cmd)
+    run_command("rm -f doxygen_output/xml/*.xml")
+    run_command(doxygen_cmd)
     os.chdir("..")
 
 def group_to_quickbook(section):
-    os.system(cmd % ("group__" + section.replace("_", "__"), section))
+    run_command(cmd % ("group__" + section.replace("_", "__"), section))
 
 def model_to_quickbook(section):
-    os.system(cmd % ("classboost_1_1geometry_1_1model_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("classboost_1_1geometry_1_1model_1_1" + section.replace("_", "__"), section))
 
 def model_to_quickbook2(classname, section):
-    os.system(cmd % ("classboost_1_1geometry_1_1model_1_1" + classname, section))
+    run_command(cmd % ("classboost_1_1geometry_1_1model_1_1" + classname, section))
 
 def struct_to_quickbook(section):
-    os.system(cmd % ("structboost_1_1geometry_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("structboost_1_1geometry_1_1" + section.replace("_", "__"), section))
 
 def class_to_quickbook(section):
-    os.system(cmd % ("classboost_1_1geometry_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("classboost_1_1geometry_1_1" + section.replace("_", "__"), section))
 
 def strategy_to_quickbook(section):
     p = section.find("::")
     ns = section[:p]
     strategy = section[p+2:]
-    os.system(cmd % ("classboost_1_1geometry_1_1strategy_1_1" 
+    run_command(cmd % ("classboost_1_1geometry_1_1strategy_1_1"
         + ns.replace("_", "__") + "_1_1" + strategy.replace("_", "__"), 
         ns + "_" + strategy))
         
 def cs_to_quickbook(section):
-    os.system(cmd % ("structboost_1_1geometry_1_1cs_1_1" + section.replace("_", "__"), section))
+    run_command(cmd % ("structboost_1_1geometry_1_1cs_1_1" + section.replace("_", "__"), section))
         
 
 call_doxygen()
@@ -158 +162 @@
 os.chdir("..")
 
 # Use either bjam or b2 or ../../../b2 (the last should be done on Release branch)
-os.system("bjam") 
+run_command("bjam")