0023657: Fails compilation with WOK after patch 22980

Added key -I to CSF_TCL_INCLUDE variable

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 3df0925ebe34a04aefeec7fc7782f0e2ebb82791..314e23c513d87746945b82fc0751d5991c7d0ed6 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -56,8 +56,7 @@
   @string %CSF_CXX_INCLUDE = "";
 
   @set %CSF_TCL_HOME = "";
-  -- workaround against dummy code in WOKSH_CMPLRS.edl that append -I%CSF_TCL_INCLUDE
-  @set %CSF_TCL_INCLUDE = ": ";
+  @set %CSF_TCL_INCLUDE = "";
   @set %CSF_JAVA_INCLUDE = "";
 
   @set %CSF_X11_INCLUDE = "";

diff --git a/src/WOKBuilderDef/CSF_AIX.edl b/src/WOKBuilderDef/CSF_AIX.edl
index 0a323ccc96b662c41f18324871b78595eba1e5b1..5592e4d1d671006c0523d4b563785ef7305a7417 100644 (file)
--- a/src/WOKBuilderDef/CSF_AIX.edl
+++ b/src/WOKBuilderDef/CSF_AIX.edl
@@ -26,7 +26,7 @@
   @set %CSF_SOCKETLibs = " ";
 
   @set %CSF_TCL_HOME = "/missing/missing ";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
 
   @set %CSF_ThreadLibs = "-lpthread";
 

diff --git a/src/WOKBuilderDef/CSF_AO1.edl b/src/WOKBuilderDef/CSF_AO1.edl
index c759666126ff325b1ffc19b333a9d29b82fab715..48edae91c1d2815ee95187a3c300050183bc519d 100644 (file)
--- a/src/WOKBuilderDef/CSF_AO1.edl
+++ b/src/WOKBuilderDef/CSF_AO1.edl
@@ -31,7 +31,7 @@
   @set %CSF_C_Options    = "-DDECOSF1 -O3 -DOCC_CONVERT_SIGNALS";
 
   @set %CSF_TCL_HOME = "/usr/tcltk";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include/itcl ";
 
   @string %CSF_JavaHome     = "/PRODUCTS/java/j2sdk1_3_1";
   @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/solaris ";

diff --git a/src/WOKBuilderDef/CSF_BSD.edl b/src/WOKBuilderDef/CSF_BSD.edl
index 9ebbdf1679ef7e7e47664afd4cb11a95f659b07c..1d0d2e7a8d828cdcf1ca857155f0c9c993ecd1b8 100644 (file)
--- a/src/WOKBuilderDef/CSF_BSD.edl
+++ b/src/WOKBuilderDef/CSF_BSD.edl
@@ -53,7 +53,7 @@
   @set %CSF_TCL_HOME = "/usr/local";
   -->> END TODO
 
-  @string %CSF_TCL_INCLUDE = "/usr/local/include/tcl8.4 ";
+  @string %CSF_TCL_INCLUDE = "-I/usr/local/include/tcl8.4 ";
 
   --<< TODO : If applicable , modify the root location where Java is installed.
   @set %CSF_JavaHome        = "/usr/local/diablo-jdk1.5.0";

diff --git a/src/WOKBuilderDef/CSF_HP.edl b/src/WOKBuilderDef/CSF_HP.edl
index 846030837d877fbc400ddb5cb68be6169b9a95bf..86fa9601a560e9c29cc34ab4741c2ca9eedfea79 100644 (file)
--- a/src/WOKBuilderDef/CSF_HP.edl
+++ b/src/WOKBuilderDef/CSF_HP.edl
@@ -26,7 +26,7 @@
   @set %CSF_C_Options = " -DHPUX ";
 
   @set %CSF_TCL_HOME = "/missing/missing ";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
 
   @set %CSF_X11_INCLUDE    = "-I/usr/include/X11R6 ";
   @set %CSF_XMU_INCLUDE    = "-I/usr/contrib/X11R6/include ";

diff --git a/src/WOKBuilderDef/CSF_LIN.edl b/src/WOKBuilderDef/CSF_LIN.edl
index c62b50041a1d0bcd8f3c9595c22d5703d539e736..73e5a98131aaabfd0fc6c54265d0e0215f8dc19b 100644 (file)
--- a/src/WOKBuilderDef/CSF_LIN.edl
+++ b/src/WOKBuilderDef/CSF_LIN.edl
@@ -65,7 +65,7 @@
 
   -- Tcl/Tk configuration
   @if (%CSF_TCL_HOME != "") then
-    @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+    @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
     @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
     @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk8.5 -L" %X11_LIB " -lX11 ";
   @else

diff --git a/src/WOKBuilderDef/CSF_MAC.edl b/src/WOKBuilderDef/CSF_MAC.edl
index b286e20e48495289484037802c8448dc5d7af354..41f2f2f7f2f4ebf6d17dc8cf1e23bb233606a55f 100644 (file)
--- a/src/WOKBuilderDef/CSF_MAC.edl
+++ b/src/WOKBuilderDef/CSF_MAC.edl
@@ -77,7 +77,7 @@
 
   -- Tcl/Tk configuration
   @if (%CSF_TCL_HOME != "") then
-    @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+    @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include ";
     @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl8.5 ";
     @string %CSF_TclTkLibs = "-L" %X11_LIB " -lX11 -L" %CSF_TCL_HOME "/lib -ltk8.5 ";
   @else

diff --git a/src/WOKBuilderDef/CSF_SIL.edl b/src/WOKBuilderDef/CSF_SIL.edl
index 6030ccbed68220d331354db5a1be822dc4e6a059..011e0cf05317ae52a2c202ec93cc5d1427b49338 100644 (file)
--- a/src/WOKBuilderDef/CSF_SIL.edl
+++ b/src/WOKBuilderDef/CSF_SIL.edl
@@ -48,7 +48,7 @@
   @set %CSF_pthread = "-lpthread";
 
   @set %CSF_TCL_HOME = "/usr/tcltk.64";
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include/itcl ";
 
   @set %CSF_X11_INCLUDE_EXTENSION = " -I/usr/include/X11/extensions ";
 

diff --git a/src/WOKBuilderDef/CSF_SUN.edl b/src/WOKBuilderDef/CSF_SUN.edl
index f162dcc15b303df4fedafb85a5611cc8777c5c63..e39079b2d1e0a7e660abf1bbfbe2b5acfaa75b01 100644 (file)
--- a/src/WOKBuilderDef/CSF_SUN.edl
+++ b/src/WOKBuilderDef/CSF_SUN.edl
@@ -74,7 +74,7 @@
   @set %CSF_TCL_HOME = "/PRODUCTS/tcltk-84";
   -->> END TODO
 
-  @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include -DUSE_NON_CONST ";
+  @string %CSF_TCL_INCLUDE = "-I" %CSF_TCL_HOME "/include -DUSE_NON_CONST ";
   @string %CSF_TclLibs     = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltcl8.4 ";
   @string %CSF_TclTkLibs   = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltk8.4 ";
 

diff --git a/src/WOKLibs/WOKLibs_CMPLRS.edl b/src/WOKLibs/WOKLibs_CMPLRS.edl
index 56c1a0071bdb2d356f9a3901f6e73ab7787eca29..36fe6345807b73045feeea6c5730110f27c15a63 100755 (executable)
--- a/src/WOKLibs/WOKLibs_CMPLRS.edl
+++ b/src/WOKLibs/WOKLibs_CMPLRS.edl
@@ -8,7 +8,7 @@
 
  @uses "CSF.edl";
 
- @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
+ @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 @if ( %Station == "wnt" ) then
        @string %CMPLRS_ExportBehaviour = " -D__" %Entity "_DLL";
 @endif;

diff --git a/src/WOKSH/WOKSH_CMPLRS.edl b/src/WOKSH/WOKSH_CMPLRS.edl
index adf7ba4ad40eb3558e8054fbd0236ebb3ae2d255..3ca71a327e4698660c0d9b41c15d343e6c58c31d 100755 (executable)
--- a/src/WOKSH/WOKSH_CMPLRS.edl
+++ b/src/WOKSH/WOKSH_CMPLRS.edl
@@ -8,6 +8,6 @@
 
  @uses "CSF.edl";
 
- @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
+ @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;

diff --git a/src/WOKTCL/WOKTCL_CMPLRS.edl b/src/WOKTCL/WOKTCL_CMPLRS.edl
index 11565293efec575bd863f7c8d5fd5b1f4e69cf7b..7d1a1e8a89a969aef538828f496093f2e53760d4 100755 (executable)
--- a/src/WOKTCL/WOKTCL_CMPLRS.edl
+++ b/src/WOKTCL/WOKTCL_CMPLRS.edl
@@ -8,6 +8,6 @@
 
  @uses "CSF.edl";
 
- @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
+ @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;

diff --git a/src/WOKTclLib/OS.tcl b/src/WOKTclLib/OS.tcl
index 6c448c107e1c828b3e2931bed55b8a8222c9deba..08c50ce9ce9b7f98c0e5673fab361f84e371f85a 100644 (file)
--- a/src/WOKTclLib/OS.tcl
+++ b/src/WOKTclLib/OS.tcl
@@ -2442,7 +2442,7 @@ proc OS:edcomp { plat lhdr comp {except {}} {incstr <incDirectories>} {tcstr ""}
                    set TCLINC "[lindex [wokparam -v %CSF_TCL_INCLUDE] 0]"
                    if { "$new " == $CXXINC} {
                        append str "-I\${COMPINCLUDE} "
-                   } elseif  {"$new " == $TCLINC} {
+                   } elseif  {"-I$new " == $TCLINC} {
                        append str "-I\${TCLHOME}/include "
                    } elseif  {"$tok " == "[lindex [wokparam -v %CSF_X11_INCLUDE] 0]"} {
                        #puts "X11 was captured"

diff --git a/src/WOKTclTools/WOKTclTools_CMPLRS.edl b/src/WOKTclTools/WOKTclTools_CMPLRS.edl
index 7a709dedea19d4fd3925f10113fbccfa31700323..0e965442cfc36878648f9b728fd1e138f7746c05 100755 (executable)
--- a/src/WOKTclTools/WOKTclTools_CMPLRS.edl
+++ b/src/WOKTclTools/WOKTclTools_CMPLRS.edl
@@ -8,6 +8,6 @@
 
  @uses "CSF.edl";
 
- @string %CMPLRS_CXX_Options = " -I"%CSF_TCL_INCLUDE %CMPLRS_CXX_Options ;
+ @string %CMPLRS_CXX_Options += " " %CSF_TCL_INCLUDE;
 
 @endif;