0032251: Documentation, gendoc.tcl - reference manual excludes TKIVtk and other optio...

gendoc.tcl -refman now temporarily sets HAVE_ environment variables for including optional modules.

diff --git a/adm/gendoc.tcl b/adm/gendoc.tcl
index 19eb10a973be8c13c1997e3158f24fb8367a138e..3ee5fd142fadb486f03010c5c865b5dd9b3b6d8f 100644 (file)
--- a/adm/gendoc.tcl
+++ b/adm/gendoc.tcl
@@ -686,6 +686,17 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
   # Write specific options
   if { $docType == "REFMAN" } {
 
+    # always include optional components
+    set aHaveD3dBack  ""
+    set aHaveGlesBack ""
+    set aHaveVtkBack  ""
+    if { [info exists ::env(HAVE_D3D)]   } { set aHaveD3dBack  "$::env(HAVE_D3D)" }
+    if { [info exists ::env(HAVE_GLES2)] } { set aHaveGlesBack "$::env(HAVE_GLES2)" }
+    if { [info exists ::env(HAVE_VTK)]   } { set aHaveVtkBack  "$::env(HAVE_VTK)" }
+    set ::env(HAVE_D3D)   "true"
+    set ::env(HAVE_GLES2) "true"
+    set ::env(HAVE_VTK)   "true"
+
     # Load lists of modules scripts
     if { $productsPath == "" } {
       set modules_scripts [glob -nocomplain -type f -directory "[OCCDoc_GetSourceDir $productsPath]/OS/" *.tcl]
@@ -811,6 +822,11 @@ proc OCCDoc_MakeDoxyfile {docType outDir tagFileDir {doxyFileName} {generatorMod
 
     puts $doxyFile ""
 
+    # restore environment variables
+    set ::env(HAVE_D3D)   "$aHaveD3dBack"
+    set ::env(HAVE_GLES2) "$aHaveGlesBack"
+    set ::env(HAVE_VTK)   "$aHaveVtkBack"
+
   } elseif { $docType == "OVERVIEW" } {
 
     # Add common options for generation of Overview and User Guides

diff --git a/src/OS/Draw.tcl b/src/OS/Draw.tcl
index a72770b69e109ce04e2cb9dac6eeddf6bb684384..786ff58584673b8202276227b5198dd328537492 100644 (file)
--- a/src/OS/Draw.tcl
+++ b/src/OS/Draw.tcl
@@ -21,15 +21,13 @@ proc Draw:toolkits { } {
   if { [info exists ::env(HAVE_GLES2)] && "$::env(HAVE_GLES2)" == "true" } {
     lappend aResult "TKOpenGlesTest"
   }
-  if { "$::tcl_platform(platform)" == "windows" } {
-    if { [info exists ::env(HAVE_D3D)] } {
-      if { "$::env(HAVE_D3D)" == "true" } {
-        lappend aResult "TKD3DHostTest"
-      }
-    } elseif { [info exists ::env(VCVER)] && "$::env(VCVER)" != "vc8" && "$::env(VCVER)" != "vc9" && "$::env(VCVER)" != "vc10" } {
+
+  if { [info exists ::env(HAVE_D3D)] } {
+    if { "$::env(HAVE_D3D)" == "true" } {
       lappend aResult "TKD3DHostTest"
     }
   }
+
   if { [info exists ::env(HAVE_VTK)] && "$::env(HAVE_VTK)" == "true" } {
     lappend aResult "TKIVtkDraw"
   }

diff --git a/src/OS/Visualization.tcl b/src/OS/Visualization.tcl
index cf881b5ca7e11119afffd2620e2bfd28c9ad0d16..7a17efff814f44a2799329b5b6e757cfb86bf7e9 100644 (file)
--- a/src/OS/Visualization.tcl
+++ b/src/OS/Visualization.tcl
@@ -21,15 +21,13 @@ proc Visualization:toolkits { } {
   if { [info exists ::env(HAVE_GLES2)] && "$::env(HAVE_GLES2)" == "true" } {
     lappend aResult "TKOpenGles"
   }
-  if { "$::tcl_platform(platform)" == "windows" } {
-    if { [info exists ::env(HAVE_D3D)] } {
-      if { "$::env(HAVE_D3D)" == "true" } {
-        lappend aResult "TKD3DHost"
-      }
-    } elseif { [info exists ::env(VCVER)] && "$::env(VCVER)" != "vc8" && "$::env(VCVER)" != "vc9" && "$::env(VCVER)" != "vc10" } {
+
+  if { [info exists ::env(HAVE_D3D)] } {
+    if { "$::env(HAVE_D3D)" == "true" } {
       lappend aResult "TKD3DHost"
     }
   }
+
   if { [info exists ::env(HAVE_VTK)] && "$::env(HAVE_VTK)" == "true" } {
     lappend aResult "TKIVtk"
   }