No comments

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index a6e33e1184e3e658187499fea728f6e644afefda..66a70a18822de6d4f6ea6d75fc6e6aa691a08ce3 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -60,7 +60,7 @@
  @endif;
 
  @if ( %DBMS == "DFLT" ) then
-    @set %CMPLRS_CXX_DBMSOpt = "-DCSFDB";
+    @set %CMPLRS_CXX_DBMSOpt = "-DCSFDB -DHAVE_WOK_CONFIG_H  -DHAVE_CONFIG_H ";
  @endif;
 
  @ifnotdefined ( %DebugMode ) then
@@ -309,6 +309,7 @@
     @set %CMPLRS_C_SysOptions   = %CSF_C_SysOptions;
     @set %CMPLRS_C_Options      = %CSF_C_Options;
     @set %CMPLRS_C_INCLUDE      = %CSF_C_INCLUDE ;
+    @set %CMPLRS_C_INCLUDE      = %CSF_C_INCLUDE ;
 
     @set %CMPLRS_F77_COMPILER   = %CSF_F77_COMPILER ;
     @set %CMPLRS_F77_SysOptions = %CSF_F77_SysOptions;
@@ -388,7 +389,8 @@
                                               %CMPLRS_C_SysOptions ,
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
-                                              %IncDirectives ,
+                                              %CMPLRS_C_INCLUDE ,
+                                             %IncDirectives ,
                                               %CMPLRS_Unit_C_Options ,
                                               %CMPLRS_C_WOKDirectives ,
                                               %Entity ) is
@@ -397,6 +399,7 @@
     $CMPLRS_C_SysOptions   = %CMPLRS_C_SysOptions
     $CMPLRS_C_Options      = %CMPLRS_C_Options 
     $CMPLRS_Unit_C_Options = %CMPLRS_Unit_C_Options 
+    $CMPLRS_C_INCLUDE      = %CMPLRS_C_INCLUDE
     $CMPLRS_C_WOKDirectives= %CMPLRS_C_WOKDirectives
     $Dynamic include directives are :
     $%IncDirectives
@@ -405,7 +408,9 @@
                                               %CMPLRS_C_SysOptions ,
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
+                                             %CMPLRS_CXX_DBMSOpt ,
 --                                              %C_Export ,
+                                             %CMPLRS_C_INCLUDE ,
                                               %IncDirectives ,
                                               %CMPLRS_Unit_C_Options ,
                                               %CMPLRS_C_WOKDirectives ,
@@ -413,9 +418,9 @@
                                              %BaseName, 
                                              %OutputDir ,
                                               %TmpFile , %Entity ) is
-     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
+     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt  %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
       $set stat = $status
-      $echo '$C_COMPILER  %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
+      $echo '$C_COMPILER  %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
       $if ( $stat == 0 ) then
       $  if ( -e %OutputDir/%BaseName.d ) then
       $   sed -e '/:/d' -e 's/\\/ /g'  %OutputDir/%BaseName.d | tr ' ' '\012' | sort -u > %OutputDir/%BaseName.m
@@ -448,7 +453,8 @@
     @template CMPLRS_CXX_CmdLine ( %CMPLRS_CXX_COMPILER,
                                                %CMPLRS_CXX_SysOptions ,
                                                 %CMPLRS_CXX_Options ,
-                                                %CMPLRS_CXX_ModeOpt , %CMPLRS_CXX_DBMSOpt ,
+                                                %CMPLRS_CXX_ModeOpt , 
+                                               %CMPLRS_CXX_DBMSOpt ,
                                                %CMPLRS_CXX_INCLUDE ,
                                                %CMPLRS_CXX_WOKDirectives ,
                                                 %IncDirectives ,
@@ -541,6 +547,7 @@
                                               %CMPLRS_C_SysOptions ,
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
+                                              %CMPLRS_C_INCLUDE ,
                                               %IncDirectives ,
                                               %CMPLRS_Unit_C_Options ,
                                               %CMPLRS_C_WOKDirectives ,
@@ -550,6 +557,7 @@
     $CMPLRS_C_SysOptions   = %CMPLRS_C_SysOptions
     $CMPLRS_C_Options      = %CMPLRS_C_Options 
     $CMPLRS_Unit_C_Options = %CMPLRS_Unit_C_Options 
+    $CMPLRS_C_INCLUDE      = %CMPLRS_C_INCLUDE
     $CMPLRS_C_WOKDirectives= %CMPLRS_C_WOKDirectives
     $Dynamic include directives are :
     $%IncDirectives
@@ -559,6 +567,8 @@
                                               %CMPLRS_C_SysOptions ,
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
+                                             %CMPLRS_CXX_DBMSOpt ,
+                                             %CMPLRS_C_INCLUDE ,
                                               %IncDirectives ,
                                               %CMPLRS_Unit_C_Options ,
                                               %CMPLRS_C_WOKDirectives ,
@@ -567,9 +577,9 @@
                                              %OutputDir ,
                                               %TmpFile , %Entity ) is
 
-     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source  -o %OutputDir/%BaseName.o 
+     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt  %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source  -o %OutputDir/%BaseName.o 
      $set stat = $status
-     $echo  '$C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
+     $echo  '$C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt  -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
      $if ( $stat == 0 ) then
      $ cpp  %IncDirectives -Usun -DSOLARIS -M  %Source \^
      $      | sed -e '1d' -e 's/.*://g' -e 's/[         *]*//g' -e 's%/./%/%g' -e 's%//%/%g' \^
@@ -840,6 +850,7 @@
     $CMPLRS_C_SysOptions   = %CMPLRS_C_SysOptions
     $CMPLRS_C_Options      = %CMPLRS_C_Options 
     $CMPLRS_Unit_C_Options = %CMPLRS_Unit_C_Options 
+    $CMPLRS_C_INCLUDE      = %CMPLRS_C_INCLUDE
     $CMPLRS_C_WOKDirectives= %CMPLRS_C_WOKDirectives
     $Dynamic include directives are :
     $%IncDirectives
@@ -849,6 +860,8 @@
                                               %CMPLRS_C_SysOptions ,
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
+                                              %CMPLRS_C_ModeOpt ,
+                                             %CMPLRS_CXX_DBMSOpt ,
                                               --%CMPLRS_C_Export ,
                                               %IncDirectives ,
                                               %CMPLRS_Unit_C_Options ,
@@ -857,9 +870,9 @@
                                               %Source ,
                                              %BaseName, 
                                              %OutputDir, %Entity ) is
-     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
+     $%CMPLRS_C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt %IncDirectives %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c %Source -o %OutputDir/%BaseName.o 
      $set cmplrs_status = $status
-     $echo  '$C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
+     $echo  '$C_COMPILER %CMPLRS_C_SysOptions %CMPLRS_C_Options $INCDIRS %CMPLRS_C_ModeOpt %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
      $if ( $cmplrs_status == 0 ) then
      $ /usr/lib/cpp %CMPLRS_C_Options %IncDirectives -M -DIRIX %Source | \^
      $ sed -e '1d' -e 's/.*://g' -e 's/[        *]*//g' -e 's%/./%/%g' -e 's+//+/+g' |  sort -u  >  %OutputDir/%BaseName.m 
@@ -978,6 +991,7 @@
                                               %CMPLRS_C_SysOptions ,
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
+                                             %CMPLRS_C_INCLUDE ,
                                               %CMPLRS_C_Export ,
                                               %IncDirectives ,
                                               %Unit_C_Options ,
@@ -987,7 +1001,7 @@
                                              %BaseName, 
                                              %OutputDir ,
                                               %TmpFile ) is
-     $%CMPLRS_C_COMPILER %C_SysOptions %C_Options %C_ModeOpt %C_Export %IncDirectives %Unit_C_Options %C_WOKDirectives %C_PDBName %Files %DTmpFile
+     $%CMPLRS_C_COMPILER %C_SysOptions %C_Options %CMPLRS_C_INCLUDE %CMPLRS_CXX_DBMSOpt %C_ModeOpt %C_Export %IncDirectives %Unit_C_Options %C_WOKDirectives %C_PDBName %Files %DTmpFile
      $if ( $status == 0 ) then
      $ cc %IncDirectives -E %CMPLRS_C_Options  %Source | egrep -e '^#' | awk '{print $3}' \
      $| sed -e 's/\"//g' -e '/^$/d'  -e 's%/./%/%g' | sort -u | grep -v %Source | grep '/' > %OutputDir/%BaseName.m

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index b88a9ec7068d51ddcf3c137b4fd41211b24cdcb0..50883a41ac3a5fb890d5d1c15cd98212abc4df40 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -30,7 +30,7 @@
 -- %CSF_USE_EXTERNLIB      = "Yes"
 
 
-
+  @set %CSF_WOKHOME = "WOKHOME_TO_DEFINE" ;
 
 
 -- if "Yes" ===> WOK will "extract" cdl files listed in FILES
@@ -159,8 +159,8 @@
    @set %CSF_JavaHome = "";
    @set %CSF_JavaLibs = "";
 
-   @set %CSF_C_INCLUDE = "";
-   @set %CSF_CXX_INCLUDE = "";
+   @string %CSF_C_INCLUDE   = " -I" %CSF_WOKHOME "/lib ";
+   @string %CSF_CXX_INCLUDE = " -I" %CSF_WOKHOME "/lib " ;
 
    @set %CSF_TCL_HOME = "";
    @set %CSF_TCL_INCLUDE = "";
@@ -271,12 +271,11 @@
       @set %CSF_CXX_COMPILER = "/opt/DEV5_1/SUNWspro/bin/CC ";
       @set %CSF_CXX_SysOptions  = "-PIC -xchip=ultra -xarch=v8 -vdelx -Usun " ;
       @set %CSF_CXX_Options  = "-DSOLARIS -DNO_CXX_EXCEPTION " ;
-      @set %CSF_CXX_INCLUDE = "-I/opt/DEV5_1/SUNWspro/SC4.2/include/CC ";
+      @string %CSF_CXX_INCLUDE += " -I/opt/DEV5_1/SUNWspro/SC4.2/include/CC ";
 
       @set %CSF_C_COMPILER   = "/opt/DEV5_1/SUNWspro/bin/cc ";
       @set %CSF_C_SysOptions    = "-K PIC -Usun ";
       @set %CSF_C_Options    = "-DSOLARIS ";
-      @set %CSF_C_INCLUDE    = "";
 
       @set %CSF_F77_COMPILER = "f77 ";
       @set %CSF_F77_SysOptions  = "-PIC";
@@ -306,7 +305,7 @@
       @string %CSF_JavaLibs = " -L" %CSF_JavaHome "/jre/lib/sparc/ -ljava ";
 
       @set %CSF_TCL_HOME = "/usr/tcltk";
-      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include/itcl ";
+      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
 
       @set %CSF_X11_INCLUDE = "-I/usr/openwin/include/X11 ";
       @set %CSF_OPENGL_INCLUDE = "-I/usr/openwin/include ";