Correction in EDL files for WOK

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index 66a70a18822de6d4f6ea6d75fc6e6aa691a08ce3..1f610e205aec9931285a8578f2716ab57c38abc0 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -418,6 +418,7 @@
                                              %BaseName, 
                                              %OutputDir ,
                                               %TmpFile , %Entity ) is
+     $cd %OutputDir
      $%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_C_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_Unit_C_Options %CMPLRS_C_WOKDirectives -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/c.compile
@@ -463,19 +464,21 @@
                                                %BaseName,
                                                 %OutputDir ,
                                                 %TmpFile , %Entity ) is
+     $cd %OutputDir
      $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source -o %OutputDir/%BaseName.o  >& %TmpFile
       $set stat = $status
-      $echo  '$CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options $INCDIRS %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %DBDirectives -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/cxx.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
       $  endif
       $endif
-      $if( -e %TmpFile ) grep ':' %TmpFile
-      $/bin/rm -f %TmpFile
+--      $if( -e %TmpFile ) grep ':' %TmpFile
+--      $/bin/rm -f %TmpFile
       $set status = $stat
+    
     @end;
 
+
  @endif;
 
 
@@ -623,7 +626,7 @@
                                                %BaseName,
                                                 %OutputDir ,
                                                 %TmpFile , %Entity) is
-     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE %CMPLRS_CXX_DBMSOpt  %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source  -o %OutputDir/%BaseName.o  >& %TmpFile
+     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options         %CMPLRS_CXX_INCLUDE  %CMPLRS_CXX_DBMSOpt  %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives -c %Source  -o %OutputDir/%BaseName.o  >& %TmpFile
      $set stat = $status
      $echo '$CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options $INCDIRS %CMPLRS_CXX_INCLUDE  %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/cxx.compile
      $if ( $stat == 0 ) then
@@ -734,13 +737,19 @@
 
 
 
-  @template CMPLRS_CXX_CmdLine (
-             %CMPLRS_CXX_COMPILER, %CMPLRS_CXX_SysOptions, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,
-             %IncDirectives, %PDBName, %Source,
-             %BaseName, %OutputDir, %CMPLRS_ExportBehaviour
-            ) is
+  @template CMPLRS_CXX_CmdLine ( %CMPLRS_CXX_COMPILER, 
+                                %CMPLRS_CXX_SysOptions, 
+                                %CMPLRS_CXX_Options, 
+                                %CMPLRS_CXX_ModeOpt,
+                                 %CMPLRS_CXX_DBMSOpt ,
+                                %IncDirectives, 
+                                %PDBName, 
+                                %Source,
+                                %BaseName, 
+                                %OutputDir, 
+                                %CMPLRS_ExportBehaviour  ) is
   $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_ExportBehaviour\^
-  $  %IncDirectives %CMPLRS_CXX_ModeOpt \^
+  $  %IncDirectives %CMPLRS_CXX_ModeOpt  %CMPLRS_CXX_DBMSOpt  \^
   $ -Fd%PDBName -c -Tp %Source -Fo%OutputDir%BaseName.obj;
   $set cmplrs_status=%status%;
   $@acpp.exe -M -m -+ %CMPLRS_CXX_Options -D__cplusplus -D_DLL -D_MT %CMPLRS_ExportBehaviour %IncDirectives\^
@@ -749,14 +758,14 @@
   @end;
 
   @template CMPLRS_C_OptLine (%CMPLRS_C_COMPILER ,
-                                            %CMPLRS_C_SysOptions ,
-                                            %CMPLRS_C_Options ,
-                                            %CMPLRS_C_ModeOpt ,
-                                            %IncDirectives ,
-                                            %CMPLRS_Unit_C_Options ,
-                                            %CMPLRS_C_WOKDirectives ,
-                                            %CMPLRS_ExportBehaviour ,
-                                            %Entity ) is
+                              %CMPLRS_C_SysOptions ,
+                              %CMPLRS_C_Options ,
+                              %CMPLRS_C_ModeOpt ,
+                              %IncDirectives ,
+                              %CMPLRS_Unit_C_Options ,
+                              %CMPLRS_C_WOKDirectives ,
+                              %CMPLRS_ExportBehaviour ,
+                              %Entity ) is
   $Following parameters make up C compilation command in this order:
   $CMPLRS_C_COMPILER      = %CMPLRS_C_COMPILER 
   $CMPLRS_C_SysOptions    = %CMPLRS_C_SysOptions
@@ -861,7 +870,8 @@
                                               %CMPLRS_C_Options ,
                                               %CMPLRS_C_ModeOpt ,
                                               %CMPLRS_C_ModeOpt ,
-                                             %CMPLRS_CXX_DBMSOpt ,
+                                             %CMPLRS_C_INCLUDE ,
+                                             %CMPLRS_CXX_DBMSOpt ,
                                               --%CMPLRS_C_Export ,
                                               %IncDirectives ,
                                               %CMPLRS_Unit_C_Options ,
@@ -915,7 +925,7 @@
                                                %BaseName,
                                                 %OutputDir ,
                                                 %TmpFile, %Entity ) is
-     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CSF_CXX_INCLUDE  %CMPLRS_CXX_DBMSOpt  %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives %TmpFile -c %Source  -o %OutputDir/%BaseName.o  
+     $%CMPLRS_CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options %CMPLRS_CXX_INCLUDE  %CMPLRS_CXX_DBMSOpt  %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives %CMPLRS_CXX_WOKDirectives %TmpFile -c %Source  -o %OutputDir/%BaseName.o  
      $set stat = $status
      $echo '$CXX_COMPILER %CMPLRS_CXX_SysOptions %CMPLRS_CXX_Options $INCDIRS %CMPLRS_CXX_INCLUDE  %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/cxx.compile
      $if ( $stat == 0 ) then

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 1c693fc77ceb4924496796e34fcd6ec161eb5f8f..f154f8bb9bee1f77b6b1417ecdd4cb44e6bcd6d9 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -1,133 +1,25 @@
--- File:       CSF.edl
--- Author:     Jean GAUTIER - Jean Rahuel
--- History:    Thu Mar 14 19:28:20 1996        Jean GAUTIER    Creation
--- Copyright:   Matra Datavision 1996
-
--- Symbols for global WOK management
-
+-- WOK Build process configuration file.
+-- This file contains the definiton of parameters used during compilation
+-- and link process launched by the commands umake or wprocess.
+-- The items you have to modify are surrounded py a comment beginning with the
+-- string "--<<TODO" .
+-- This mainly concerns the actual location of the C++, C compilers.
+-- Several platforms are listed. Each beginning by a comment. For
+-- example : "-- For Linux platforms".
+-- You just need to adapt the part for the platform you want. 
+--
 @ifnotdefined ( %CSF_EDL ) then
    @set %CSF_EDL = "";
 
    @set %CSF_SYMBOLS = "C_COMPILER C_SysOptions C_Options CXX_COMPILER CXX_SysOptions CXX_Options F77_COMPILER F77_SysOptions F77_Options CSF_LINKER CXX_COMPILERLINKER CSF_VirtualDevice LINKER_DBMSOpt LINKER_SysShared LINKER_SysExeC LINKER_SysExeW LINKER_SysOpt LINKER_SysLib LINKER_CheckOpt LINKER_CheckOut LibraryHeaderLib LibraryHeaderOpt JavaHome JavaLibs C_INCLUDE CXX_INCLUDE TCL_INCLUDE JAVA_COMPILER JAVA_JNI JAVA_INCLUDE X11_INCLUDE XMU_INCLUDE MOTIF_INCLUDE OPENGL_INCLUDE SOCKETLibs FPELibs advapi32 gdi32 user32 glu32 opengl32 wsock32 dpsLibs XwLibs OpenGlLibs MotifLibs TclLibs TclTkLibs" ;
 
--- Standard configuration will be :
--- ==============================
--- %CSF_USE_CDL           = "Yes"
---     see "ucreate -h", "uinfo -h", "w_info -h" and "wprocess -h"
---     For executable units, default is now WITHOUT cdl processing
--- %CSF_CREATE_FILES       = "No"
--- %CSF_CREATE_CLASSES     = "No"
--- %CSF_CREATE_GENERATED   = "No"
--- %CSF_CREATE_CGEN_FILES  = "No"
--- %CSF_USE_SOURCEINCLUDE  = "No"
--- %CSF_CREATE_COMP        = "No"
--- %CSF_ECHO_COMP          = "No"
--- %CSF_CREATE_DEP         = "No"
--- %CSF_USEFILES_COMP      = "No"
--- %CSF_CREATEOBJECTS      = "No";
--- %CSF_CREATE_LINK        = "No"
--- %CSF_ECHO_LINK          = "No"
--- %CSF_USE_EXTERNLIB      = "Yes"
-
-
-  @set %CSF_WOKHOME = "/adv_11/KAS/BAG/wok-POP" ;
-
-
--- if "Yes" ===> WOK will "extract" cdl files listed in FILES
---                        "generate" source and include files
---                                   listed in GENERATED.files
---                                   (not listed in FILES)
--- if "No" ====> WOK will NOT "extract" cdl files
---                        NOT "generate" cxx, ixx, jxx & hxx files
--- ( only for management team of CasCade sources :
---   see "ucreate -h", "uinfo -h", "w_info -h" and "wprocess -h" for new options
---   For executable units, default was    WITHOUT cdl processing )
---   For executable units, default is now WITH    cdl processing )
-   @set %CSF_USE_CDL = "Yes";
-
--- if "Yes" ===> Will force creation src/UdName/FILES
---                  after reading src/UdName/FILES
---                        extraction process (add .cdl and .cxx)
---                        add EXTERNLIB for toolkits and executables
---                        add PACKAGES for toolkits
--- if "No" ====> If src/UdName/FILES does not exist,
---                  will create src/UdName/FILES
---                       after reading src/UdName/FILES
---                  will create CLASSES.files
---                  will create GENERATED.files ...
---         ====> If src/UdName/FILES exists in src/UdName/
---                  will check existences of files
---                  will check CLASSES.files and update if necessary
---                  will check GENERATED.files and update if necessary
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATE_FILES = "No";
-
--- if "Yes" ===> Will force creation src/UdName/CLASSES.files
--- if "No" ====> Will check that files listed in src/UdName/CLASSES.files
---                  exist in src/UdName/ directory.
---         With standard mode (%CSF_USE_CDL = "Yes"),
---            if there is modifications of sources files, this file is
---            updated automatically.
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATE_CLASSES = "No";
-
--- if "Yes" ===> Will force creation src/UdName/GENERATED.files
--- if "No" ====> Will check that files listed in src/UdName/GENERATED.files
---                  exist in drv/UdName/ and inc directories.
---         With standard mode (%CSF_USE_CDL = "Yes"),
---            if there is modifications of derivated files, this file is
---            updated automatically.
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATE_GENERATED = "No";
-
--- if "Yes" ===> will do obj.cgen step and generate lex/yacc files
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATE_CGEN_FILES = "No";
-
--- if "Yes" ===> will accept .edl files with %WOKStepsDef_UseSourceInclude
---               defined in src/UdName/UdName_WOKStepsDef.edl
---               in order to add -I/.../src/UdName at compile time
--- ( only for management team of CasCade sources )
-   @set %CSF_USE_SOURCEINCLUDE = "No";
-
--- if "Yes" ===> will create compile .build file in src/UdName/
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATE_COMP = "Yes";
-
--- if "Yes" ===> Echo of Compiler commands
--- ( only for management team of CasCade sources )
-   @set %CSF_ECHO_COMP = "Yes";
-
--- if "Yes" ===> will create .d files (include dependencies)
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATECOMP_DEP = "Yes";
-
--- if "Yes" ===> will create OBJECTS.files (list of .o or .so files)
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATEOBJECTS = "Yes";
-
--- if "Yes" ===> Will use FILES and GENERATED.files for compiling
---               Not yet implemented
--- if "No" ====> will use dependencies computed by WOK
---               but controls that compiled files are listed in FILES,
---               CLASSES.files or in GENERATED.files
--- ( only for management team of CasCade sources )
-   @set %CSF_USEFILES_COMP = "No";
-
--- if "Yes" ===> will create link .build file in src/UdName/
--- ( only for management team of CasCade sources )
-   @set %CSF_CREATE_LINK = "Yes";
-
--- if "Yes" ===> Echo of Link commands
--- ( only for management team of CasCade sources )
-   @set %CSF_ECHO_LINK = "Yes";
-
--- if "Yes" ===> will use EXTERNLIB file in Toolkits and Executables
---               will use OBJECTS.files of units listed in PACKAGES in Toolkits
---               will use OBJECTS.files in Executables
--- if "No" ====> will use dependencies computed by WOK
---               only for management team of CasCade sources
-   @set %CSF_USE_EXTERNLIB = "Yes";
+  @set %CSF_CREATECOMP_DEP = "Yes" ;
+  @set %CSF_USE_EXTERNLIB  = "Yes" ;
+
+
+--<< TODO : Place here the location where the tarball has been downloaded. >> 
+  @set %CSF_WOKHOME = "/adv_11/KAS/BAG/wok-dev" ;
+-->> END TODO
 
    @set %CSF_C_COMPILER = "";
    @set %CSF_C_SysOptions  = "";
@@ -210,23 +102,32 @@
       @set %CSF_STANDARDDB = "StandardOBJS";
    @endif;
 
-
-
-
+   --
+   -- For Linux platforms
+   --
    @if ( %Station == "lin" ) then
       @if ( %DBMS == "OBJS" ) then
         @set %CSF_OODBLibs = "";
       @endif;
 
+      --<< TODO : If applicable , modify the location of the C++ compiler. 
       @set %CSF_CXX_COMPILER = "/usr/bin/g++ ";
+      -->> END TODO
+
       @set %CSF_CXX_SysOptions  = "-fPIC -funsigned-char -Wall ";
       @set %CSF_CXX_Options  = "-DLIN -DLININTEL -DNO_CXX_EXCEPTION ";
 
+      --<< TODO : If applicable , modify the location of the c compiler. 
       @set %CSF_C_COMPILER = "/usr/bin/gcc ";
+      -->> END TODO
+
       @set %CSF_C_SysOptions  = "-fPIC -funsigned-char -Wall";
       @set %CSF_C_Options  = "-DLIN -DLININTEL ";
 
+      --<< TODO : If applicable , modify the location of the Fortran compiler. 
       @set %CSF_F77_COMPILER = "/usr/bin/f77 ";
+      -->> END TODO
+
       @set %CSF_F77_SysOptions  = "-fPIC ";
 
       @set %CSF_LINKER = "/usr/bin/ld ";
@@ -238,19 +139,24 @@
       @set %CSF_LINKER_SysLib = "-ldl -lc ";
       @set %CSF_LINKER_CheckOpt = "-nostartfiles ";
       @set %CSF_LINKER_CheckOut = "-o /dev/null ";
-
       @set %CSF_SOCKETLibs = " -ldl" ;
 
+      --<< TODO : If applicable , modify the root location where TCL is installed."
       @set %CSF_TCL_HOME = "/usr";
+      -->> END TODO
+
       @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
 
+      --<< TODO : If applicable , modify the root location where Java is installed."
       @set %CSF_JavaHome        = "/opt/jdk1.2.2";
+      -->> END TODO
+
       @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I"  %CSF_JavaHome "/include/linux ";
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
 
-      @set %CSF_X11_INCLUDE = " -I/usr/X11R6/include ";
-      @set %CSF_OPENGL_INCLUDE = " -I/usr/X11R6/include ";
+      @set %CSF_X11_INCLUDE = "-I/usr/X11R6/include ";
+      @set %CSF_OPENGL_INCLUDE = "-I/usr/X11R6/include ";
 
       @set %X11_LIB = "/usr/X11R6/lib";
 
@@ -258,23 +164,31 @@
 
       @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL -lglut " ;
 
-      @string %CSF_TclLibs = "-L" %CSF_TCL_HOME "/lib -Xlinker -rpath -Xlinker " %CSF_TCL_HOME "/lib -ltcl"; 
-      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -Xlinker -rpath -Xlinker " %CSF_TCL_HOME "/lib -ltk -L" %X11_LIB " -lX11";
+      @string %CSF_TclLibs = "-L" %CSF_TCL_HOME "/lib  -ltcl"; 
+      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib  -ltk -L" %X11_LIB " -lX11";
    @endif;
 
-
+   --
+   -- For SunOS platforms
+   --
    @if ( %Station == "sun" ) then
       @if ( %DBMS == "OBJS" ) then
         @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/sunpro/lib/ -los -losthr -loscol -losmop";
       @endif;
 
---      @set %CSF_CXX_COMPILER = "/home/forte/SUNWspro/bin/CC ";
-      @set %CSF_CXX_COMPILER = "/opt/DEV5_1/SUNWspro/bin/CC ";
+      --<< TODO : If applicable , modify the location of the C++ compiler. 
+      @set %CSF_CXX_COMPILER = "/opt/DEV5_1/SUNWspro/bin/CC";
+      -->> END TODO
+
       @set %CSF_CXX_SysOptions  = "-PIC -xchip=ultra -xarch=v8 -vdelx -Usun " ;
       @set %CSF_CXX_Options  = "-DSOLARIS -DNO_CXX_EXCEPTION " ;
-      @string %CSF_CXX_INCLUDE += " -I/opt/DEV5_1/SUNWspro/SC4.2/include/CC ";
+      --yan @string %CSF_CXX_INCLUDE += " -I/opt/DEV5_1/SUNWspro/SC4.2/include/CC ";
+      @string %CSF_CXX_INCLUDE += " -I" %CSF_CXX_COMPILER "/../../SC4.2/include/CC ";
 
+      --<< TODO : If applicable , modify the location of the c compiler. 
       @set %CSF_C_COMPILER   = "/opt/DEV5_1/SUNWspro/bin/cc ";
+      -->> END TODO
+
       @set %CSF_C_SysOptions    = "-K PIC -Usun ";
       @set %CSF_C_Options    = "-DSOLARIS ";
 
@@ -293,28 +207,30 @@
       @set %CSF_LINKER_CheckOpt = "";
       @set %CSF_LINKER_CheckOut = "-o /dev/null ";
 
+      --<< TODO : If applicable , modify the root location where Java is installed."
       @set %CSF_JavaHome        = "/PRODUCTS/java/jdk1.2";
+      -->> END TODO
+
       @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I"  %CSF_JavaHome "/include/solaris ";
+      @string %CSF_JavaLibs     = " -L" %CSF_JavaHome "/jre/lib/sparc/ -ljava ";
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
 
-
       @set %CSF_SOCKETLibs = "-lsocket -lnsl -lsunmath -lm -ldl  -lc " ;
-      --@set %CSF_RISCRETURNObject = "/adv_23/KL/dev/ref/src/EngineStarter/risc_return.o" ;
       @set %CSF_RISCRETURNObject = "/missing/missing/risc_return.o" ;
 
-      @string %CSF_JavaLibs = " -L" %CSF_JavaHome "/jre/lib/sparc/ -ljava ";
-
+      --<< TODO : If applicable , modify the root location where TCL is installed."
       @set %CSF_TCL_HOME = "/PRODUCTS/tcltk-83";
-      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+      -->> END TODO
 
-      @set %CSF_X11_INCLUDE = " -I/usr/openwin/include/X11 ";
-      @set %CSF_OPENGL_INCLUDE = " -I/usr/openwin/include ";
+      @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
+      @string %CSF_TclLibs     = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltcl "; 
+      @string %CSF_TclTkLibs   = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltk "; 
 
-      @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltcl "; 
-      @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -R" %CSF_TCL_HOME "/lib -ltk "; 
 
-      @set %X11_LIB   = "/usr/openwin/lib";
+      @set %X11_LIB            = "/usr/openwin/lib";
+      @set %CSF_X11_INCLUDE    = "-I/usr/openwin/include/X11 ";
+      @set %CSF_OPENGL_INCLUDE = "-I/usr/openwin/include ";
 
       @string %CSF_dpsLibs = "-L" %X11_LIB " -ldps" ;
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
@@ -323,19 +239,30 @@
 
    @endif;
 
-
+   --
+   -- For Windows platform. The lines below works with MS Visual Studio installed on D:/DevTools
+   --
 
    @if (%Station == "wnt") then
 
+      --<< TODO : If applicable , modify the root location where C++ compiler is installed."
       @set %CSF_CXX_COMPILER = "D:/DevTools/VStudio/VC98/bin/cl ";
+      -->> END TODO
+
       @set %CSF_CXX_SysOptions  = "-nologo -MD -W3 -GX -Ob1 -Zi ";
       @set %CSF_CXX_Options  = "-DWNT -D_WINDOWS -DWIN32 ";
 
+      --<< TODO : If applicable , modify the root location where c compiler is installed (same as above)."
       @set %CSF_C_COMPILER   = "D:/DevTools/VStudio/VC98/bin/cl ";
+      -->> END TODO
+
       @set %CSF_C_SysOptions    = "-nologo -MD -W3 -GX -Ob1 -Zi ";
       @set %CSF_C_Options    = "-DWNT -D_WINDOWS -DWIN32 ";
 
+      --<< TODO : If applicable , modify the root location where the Fortran compiler is installed."
       @set %CSF_F77_COMPILER = "D:/DevTools/VStudio/DF98/bin/fl32 ";
+      -->> END TODO
+
       @set %CSF_F77_SysOptions  = "-nologo -libs:dll -Zi ";
 
       @set %CSF_LINKER = "D:/DevTools/VStudio/VC98/bin/link ";
@@ -352,7 +279,10 @@
       @set %CSF_LibraryHeaderLib = "D:/DevTools/VStudio/VC98/bin/lib ";
       @set %CSF_LibraryHeaderOpt = "-nologo ";
 
+      --<< TODO : If applicable , modify the root location where Java is installed."
       @string %CSF_JavaHome     = "D:/AppTools/jdk1.2.2";
+      -->> END TODO
+
       @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/win32 ";
       @set %CSF_JAVA_COMPILER   = "javac";
       @set %CSF_JAVA_JNI        = "javah";
@@ -373,6 +303,9 @@
 
    @endif;
 
+   --
+   -- The Dec Ultrix platform is not supported
+   --
    @if ( %Station == "ao1" ) then
       @if ( %DBMS == "OBJS" ) then
         @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop";
@@ -398,6 +331,9 @@
       @string %CSF_TclTkLibs = %CSF_TCL_HOME "/lib -rpath " %CSF_TCL_HOME "/lib -ltcl"; 
    @endif;
 
+   --
+   -- The IRIX platform is not currently supported
+   --
    @if ( %Station == "sil" ) then
       @if ( %DBMS == "OBJS" ) then
         @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.3/lib/ -los -losths -loscol -losmop";
@@ -440,6 +376,9 @@
       @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -rpath " %CSF_TCL_HOME "/lib -ltk"; 
    @endif;
 
+   --
+   -- The HP-UX platform is not currently supported
+   --
    @if ( %Station == "hp" ) then
       @if ( %DBMS == "OBJS" ) then
         @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop";
@@ -454,10 +393,10 @@
       @set %CSF_TCL_HOME = "/missing/missing ";
       @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include ";
 
-      @set %CSF_X11_INCLUDE    = " -I/usr/include/X11R6 ";
-      @set %CSF_XMU_INCLUDE    = " -I/usr/contrib/X11R6/include ";
-      @set %CSF_MOTIF_INCLUDE  = " -I/usr/include/Motif1.2 ";
-      @set %CSF_OPENGL_INCLUDE = " -I/opt/graphics/OpenGL/include ";
+      @set %CSF_X11_INCLUDE = "-I/usr/include/X11R6 ";
+      @set %CSF_XMU_INCLUDE = "-I/usr/contrib/X11R6/include ";
+      @set %CSF_MOTIF_INCLUDE = "-I/usr/include/Motif1.2 ";
+      @set %CSF_OPENGL_INCLUDE = "-I/opt/graphics/OpenGL/include ";
 
       @set %CSF_SOCKETLibs = "" ;
 
@@ -474,8 +413,6 @@
       @string %CSF_TclLibs   = "-L" %CSF_TCL_HOME "/lib -ltcl"; 
       @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk"; 
 
-
-
       @string %CSF_JavaHome     = "/missing/JavaHome";
       @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/hp-ux ";
       @set %CSF_JAVA_COMPILER   = "javac";
@@ -484,6 +421,9 @@
 
    @endif;
 
+   --
+   -- The AIX platform is not currently supported
+   --
   @if ( %Station == "aix" ) then
       @if ( %DBMS == "OBJS" ) then
         @set %CSF_OODBLibs = "";

diff --git a/src/WOKBuilderDef/LINK.edl b/src/WOKBuilderDef/LINK.edl
index c18bcdc880686f9506ccde7c22c669c0b04de982..7d39a93fb30bfcc1809207e15a0e532f59388105 100755 (executable)
--- a/src/WOKBuilderDef/LINK.edl
+++ b/src/WOKBuilderDef/LINK.edl
@@ -7,7 +7,6 @@
 
 @ifnotdefined ( %LINK_EDL ) then
 -- @set %LINK_EDL = ""--; Syntax error
- @cout "LINK";
 
  @uses "CSF.edl";
 
@@ -54,16 +53,16 @@
  @end;
 
  @template LINK_LinkerHeaderDLL ( %CSF_LINKER ,
-                                               %Station,
-                                               %LINKModeOpt ) is
+                                  %Station,
+                                  %LINKModeOpt ) is
        $%CSF_LINKER -nologo -subsystem:windows -dll -incremental:no -machine:IX86 %LINKModeOpt \^
  @end;
 
  @template LINK_LinkerHeaderEXE ( %CSF_LINKER ,
-                                               %Station,
-                                               %LINKModeOpt,
-                                               %LINKSubsystem ) is
-       $%CSF_LINKER -nologo -subsystem:%LINKSubsystem -incremental:no -machine:IX86 %LINKModeOpt \^
+                                  %Station,
+                                  %LINKModeOpt,
+                                  %LinkSubsystem ) is
+       $%CSF_LINKER -nologo -subsystem:%LinkSubsystem -incremental:no -machine:IX86 %LINKModeOpt \^
  @end;
 
 @endif;