No comments

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index 9096e94048105f606d52f5bb1ee09ffd5c4d2bbe..e18fff14bff7fd917131e9410aebda1b70f91aca 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -507,7 +507,7 @@
   $  %IncDirectives %CMPLRS_C_ModeOpt \^
   $ -Fd%PDBName -c -Tc %Source -Fo%OutputDir%BaseName.obj;
   $set cmplrs_status=%status%;
-  $@wokACPP -M -m -+ %CMPLRS_C_Options -D_DLL -D_MT %CMPLRS_ExportBehaviour %IncDirectives\^
+  $@acpp.exe -M -m -+ %CMPLRS_C_Options -D_DLL -D_MT %CMPLRS_ExportBehaviour %IncDirectives\^
   $ %Source -o %OutputDir%BaseName.m;
   $set status=%cmplrs_status%;
   @end;
@@ -538,7 +538,7 @@
   $  %IncDirectives %CMPLRS_CXX_ModeOpt %CMPLRS_CXX_DBMSOpt\^
   $ -Fd%PDBName -c -Tp %Source -Fo%OutputDir%BaseName.obj;
   $set cmplrs_status=%status%;
-  $@wokACPP -M -m -+ %CMPLRS_CXX_Options -D__cplusplus -D_DLL -D_MT %CMPLRS_ExportBehaviour %IncDirectives\^
+  $@acpp.exe -M -m -+ %CMPLRS_CXX_Options -D__cplusplus -D_DLL -D_MT %CMPLRS_ExportBehaviour %IncDirectives\^
   $ %Source -o %OutputDir%BaseName.m;
   $set status=%cmplrs_status%;
   @end;
@@ -579,7 +579,7 @@
   @else
    @set %CMPLRS_CXX_ModeOpt = "-O3 -DNDEBUG -DNo_Exception";
    @set %CMPLRS_C_ModeOpt   = "-O3 -DNDEBUG -DNo_Exception";
-   @set %CMPLRS_F77ModeOpt  = "-O3 -DNDEBUG -DNo_Exception";
+   @set %CMPLRS_F77_ModeOpt  = "-O3 -DNDEBUG -DNo_Exception";
   @endif;
 
   @if ( %DBMS == "OBJS" ) then
@@ -594,7 +594,7 @@
   @set %CMPLRS_F77_Options = "-fPIC";
 
   @set %CMPLRS_C_Command = "/usr/bin/gcc -fPIC";
-  @set %CMPLRS_C_Options = "-DLIN -DLININTEL -DCSFDB -fununsigned-char -Wall";
+  @set %CMPLRS_C_Options = "-DLIN -DLININTEL -DCSFDB -funsigned-char -Wall";
 
   @template CMPLRS_C_OptLine (
              %CMPLRS_C_Command, %CMPLRS_C_Options, %CMPLRS_C_ModeOpt, %IncDirectives
@@ -620,7 +620,7 @@
   @end;
 
   @set %CMPLRS_CXX_Command = "/usr/bin/g++ -fPIC";
-  @set %CMPLRS_CXX_Options = "-DLIN -DLININTEL -DCSFDB -DNO_CXX_EXCEPTION -fununsigned-char -Wall";
+  @set %CMPLRS_CXX_Options = "-DLIN -DLININTEL -DCSFDB -DNO_CXX_EXCEPTION -funsigned-char -Wall";
 
   @template CMPLRS_CXX_OptLine (
              %CMPLRS_CXX_Command, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,

diff --git a/src/WOKBuilderDef/COMMAND.edl b/src/WOKBuilderDef/COMMAND.edl
index 8e142791c6aa125b5d1e2a04fbfed91a922bf3fb..aeb0d91a7057ba385c6d8d596894beb4d6603699 100755 (executable)
--- a/src/WOKBuilderDef/COMMAND.edl
+++ b/src/WOKBuilderDef/COMMAND.edl
@@ -15,12 +15,16 @@
   @set %COMMAND_CMPCmd = "/usr/bin/cmp";
 @endif;
 
-@if ( %Station == "hp" ) then
+@if ( %Station == "hp" || %Station == "lin") then
   @set %COMMAND_CPCmd = "/bin/cp";
   @set %COMMAND_CHMODCmd = "/bin/chmod";
   @set %COMMAND_MVCmd = "/bin/mv";
   @set %COMMAND_RMCmd = "/bin/rm";
-  @set %COMMAND_CMPCmd = "/bin/cmp";
+  @if ( %Station == "hp" ) then
+    @set %COMMAND_CMPCmd = "/bin/cmp";
+  @else
+    @set %COMMAND_CMPCmd = "/usr/bin/cmp";
+  @endif;
 @endif;
 
 

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 1031c1deab48c9e47dabf64737eaea50246be5d6..fc30dc630ff9de86b058be7c4f778f7d47d3ab0a 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -4,61 +4,131 @@
 -- Copyright:   Matra Datavision 1996
 
 @ifnotdefined ( %CSF_EDL) then
-@set %CSF_EDL = "";
+   @set %CSF_EDL = "";
 
-@set %CSF_SOCKETLibs  = "";
+   @set %CSF_SOCKETLibs  = "";
+   @set %CSF_RISCRETURNObject = "" ;
+   @set %CSF_FPELibs = "" ;
 
-@set %CSF_OODBLibs = "";
-@set %CSF_STANDARDDB = "StandardTRAN";
+   @set %CSF_advapi32 = "" ;
+   @set %CSF_gdi32 = "" ;
+   @set %CSF_user32 = "" ;
+   @set %CSF_glu32 = "" ;
+   @set %CSF_opengl32 = "" ;
+   @set %CSF_wsock32 = "" ;
+   @set %CSF_dpsLibs = "" ;
 
-@ifnotdefined ( %DBMS ) then
-  @set %DBMS = "DFLT";
-@endif;
+   @set %CSF_TclLibs = "" ;
+   @set %CSF_TclTkLibs = "" ;
 
-@set %CSF_SOCKETLibs  = "";
+   @set %CSF_OODBLibs = "";
+   @set %CSF_STANDARDDB = "StandardTRAN";
 
-@if ( %DBMS == "DFLT") then
-@set %CSF_STANDARDDB = "StandardCSFDB";
-@endif;
+   @ifnotdefined ( %DBMS ) then
+     @set %DBMS = "DFLT";
+   @endif;
 
-@if ( %DBMS == "OBJY" ) then
-       @set %CSF_STANDARDDB = "StandardOBJY";
-@endif;
+   @if ( %DBMS == "DFLT") then
+      @set %CSF_STANDARDDB = "StandardCSFDB";
+   @endif;
 
-@if ( %DBMS == "OBJS" ) then
-       @set %CSF_STANDARDDB = "StandardOBJS";
-@endif;
+   @if ( %DBMS == "OBJY" ) then
+      @set %CSF_STANDARDDB = "StandardOBJY";
+   @endif;
 
-@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_SOCKETLibs  = " -lsocket -lnsl";
-       @set %CSF_TclLibs = "-L/usr/tcltk/lib -R /usr/tcltk/lib -ltcl7.5i"; 
-@endif;
+   @if ( %DBMS == "OBJS" ) then
+      @set %CSF_STANDARDDB = "StandardOBJS";
+   @endif;
 
+   @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_SOCKETLibs = "-lsocket -lnsl -lsunmath -lm -ldl" ;
+      @set %CSF_RISCRETURNObject = "/adv_23/KL/dev/ref/src/EngineStarter/risc_return.o" ;
 
-@if ( %Station == "ao1" ) then
-       @if ( %DBMS == "OBJS" ) then
-               @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop";
-       @endif;
-       @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; 
-@endif;
+      @set %PHIGS_LIB = "/opt/SUNWits/Graphics-sw/sunphigs-3.0/lib";
+      @set %XGL_LIB   = "/opt/SUNWits/Graphics-sw/xgl-3.0/lib";
+      @set %MOTIF_LIB = "/usr/dt/lib";
 
-@if ( %Station == "sil" ) then
-       @if ( %DBMS == "OBJS" ) then
-               @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.3/lib/ -los -losths -loscol -losmop";
-       @endif;
-       @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; 
-@endif;
+      @set %X11_LIB   = "/usr/openwin/lib";
+      @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
+      @set %CSF_dpsLibs = "-ldps" ;
+
+      @set %CSF_TclLibs = "-L/usr/tcltk/lib -R /usr/tcltk/lib -ltcl7.5i"; 
+      @set %CSF_TclTkLibs = "-L/usr/tcltk/lib -R /usr/tcltk/lib -ltk4.1i"; 
+   @endif;
+
+   @if ( %Station == "ao1" ) then
+      @if ( %DBMS == "OBJS" ) then
+        @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop";
+      @endif;
+
+      @set %X11_LIB = "/usr/shlib";
+      @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
+      @set %CSF_dpsLibs = "-ldps" ;
+
+      @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; 
+   @endif;
+
+   @if ( %Station == "sil" ) then
+      @if ( %DBMS == "OBJS" ) then
+        @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.3/lib/ -los -losths -loscol -losmop";
+      @endif;
+
+      @set %CSF_FPELibs = "-L/usr/lib32 -lfpe" ;
+
+      @set %X11_LIB = "/usr/lib32";
+      @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
+      @set %CSF_dpsLibs = "-ldps" ;
+
+      @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; 
+   @endif;
+
+   @if ( %Station == "hp" ) then
+      @if ( %DBMS == "OBJS" ) then
+        @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop";
+      @endif;
+
+      @set %XMU_LIB = "/usr/contrib/X11R6/lib";
+
+      @set %X11_LIB = "/usr/lib/X11R6";
+      @string %CSF_XwLibs = "-L" %X11_LIB " -L" %XMU_LIB " -lX11 -lXext -lXmu";
+
+      @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; 
+   @endif;
+
+@if (%Station == "wnt") then
+
+   @set %CSF_advapi32 = "advapi32.lib" ;
+   @set %CSF_gdi32 = "gdi32.lib" ;
+   @set %CSF_user32 = "user32.lib" ;
+   @set %CSF_glu32 = "glu32.lib" ;
+   @set %CSF_opengl32 = "opengl32.lib" ;
+   @set %CSF_wsock32 = "wsock32.lib" ;
+
+   @set %X11_LIB = "";
+
+   @string %CSF_XwLibs  = "";
+
+   @set %CSF_TclLibs = "D:/DevTools/TclTk/lib/tcl76i.lib";
 
-@if ( %Station == "hp" ) then
-       @if ( %DBMS == "OBJS" ) then
-               @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop";
-       @endif;
-       @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; 
 @endif;
 
+   @if ( %Station == "lin" ) then
+      @if ( %DBMS == "OBJS" ) then
+        @set %CSF_OODBLibs = "";
+      @endif;
+
+      @set %CSF_SOCKETLibs = " -ldl" ;
+
+      @set %X11_LIB = "/usr/X11R6/lib";
+      @set %CSF_XwLibs = "-L/usr/X11R6/lib -lX11 -lXext -lXmu -lMesaGL -lMesaGLU -lglut -lXi";
+
+      @set %CSF_TclLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltcl8.0"; 
+      @set %CSF_TclTkLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltk8.0";
+   @endif;
+
 
 @endif;

diff --git a/src/WOKBuilderDef/LDSHR.edl b/src/WOKBuilderDef/LDSHR.edl
index 8610d585b66983a45e71b8b342fec4ebfe25e90c..944c09439c688ffd9fb2d189282990fe1373cdd7 100755 (executable)
--- a/src/WOKBuilderDef/LDSHR.edl
+++ b/src/WOKBuilderDef/LDSHR.edl
@@ -135,7 +135,7 @@
   @end;
 
   @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt ) is
-   $/usr/bin/g++ -nostartfiles %LDSHR_DBMSOpt -o %Target \
+   $/usr/bin/ld -nostartfiles %LDSHR_DBMSOpt -o %Target \
   @end;
 
   @template LDSHR_CheckUndefFooter () is

diff --git a/src/WOKBuilderDef/LINKSHR.edl b/src/WOKBuilderDef/LINKSHR.edl
index 3d5aaa9e4a4df4df5656d038143bb9e0c2c4c5d7..9d4ae5dbf5a0792339c6b2e85ed4683aa1d97c24 100755 (executable)
--- a/src/WOKBuilderDef/LINKSHR.edl
+++ b/src/WOKBuilderDef/LINKSHR.edl
@@ -3,8 +3,9 @@
 -- History:    Fri Feb 16 17:04:32 1996        Jean GAUTIER    Creation
 -- Copyright:   Matra Datavision 1996
 
-@ifnotdefined ( %LINKSHR_EDL ) then
+--@ifnotdefined ( %LINKSHR_EDL ) then
  @set %LINKSHR_EDL = "";
+ @cout "LinuxWOK_LINKSHR_EDL";
 
  @ifnotdefined ( %LDSHR_EDL ) then
   @uses "LDSHR.edl";
@@ -65,7 +66,7 @@
              %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH
             ) is 
    $if ( $?LD_LIBRARY_PATH ) then
-   $ setenv LD_LIBRARY_PATH ${LD_LIBRARY_PATH}:%LD_LIBRARY_PATH
+   $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH:${LD_LIBRARY_PATH}
    $else
    $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH
    $endif
@@ -73,7 +74,7 @@
   @end;
 
   @template LINKSHR_CheckUndefFooter () is
-    $ -lC -lc ;
+    $ ;
     $ set status=$ld_status
     $ if ( $?ld_library_path ) then
     $  setenv LD_LIBRARY_PATH $ld_library_path
@@ -148,18 +149,33 @@
   @end;
 
   @template LINKSHR_Footer () is
-   $ ;
+   $ -lc;
    $ set ld_status=$status;
+   $ if ( $?LD_LIBRARY_PATH ) then
+   $  set ld_library_path=$LD_LIBRARY_PATH
+   $ endif
   @end;
 
-  @template LINKSHR_CheckUndefHeader ( %Target, %LINKSHR_DBMSOpt ) is
-   $/usr/bin/g++ -nostartfiles %LINKSHR_DBMSOpt -o /dev/null \
+  @template LINKSHR_CheckUndefHeader (
+             %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH
+            ) is 
+   $if ( $?LD_LIBRARY_PATH ) then
+   $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH:${LD_LIBRARY_PATH}
+   $else
+   $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH
+   $endif
+   $/usr/bin/ld -nostartfiles %LINKSHR_DBMSOpt -o /dev/null \
   @end;
 
   @template LINKSHR_CheckUndefFooter () is
    $ ;
    $ set status=$ld_status;
+   $ if ( $?ld_library_path ) then
+   $  setenv LD_LIBRARY_PATH $ld_library_path
+   $ else
+   $  unsetenv LD_LIBRARY_PATH
+   $ endif
   @end;
  @endif;
-@endif;
+--@endif;