No comments

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index 0d77a5b80177a5f91c5b56c969a64ec0a96d48f2..002c928d838c80a9ad1bb2e380a4d380e271d24c 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -3,7 +3,7 @@
 -- History:    Mon Feb 19 12:04:00 1996        Jean GAUTIER    Creation
 -- Copyright:   Matra Datavision 1996
 
---@ifnotdefined ( %CMPLRS_EDL ) then
+@ifnotdefined ( %CMPLRS_EDL ) then
  @set %CMPLRS_EDL = "";
 
  @set %CMPLRS_C_Template     = "CmdLine";
@@ -433,7 +433,6 @@
              %CMPLRS_CXX_Command, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,
              %CMPLRS_CXX_DBMSOpt, %IncDirectives, %Source, %BaseName, %OutputDir
             ) is
-  --$cd %OutputDir
   $%CMPLRS_CXX_Command %CMPLRS_CXX_Options %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives  \
   $  -c %Source -o %OutputDir/%BaseName.o
   $set stat = $status
@@ -626,6 +625,7 @@
             ) is
    $C++ compiler: \^
    $%CMPLRS_CXX_Command %CMPLRS_CXX_Options  %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \
+   $-I/PRODUCTS/java/jdk1.2.2/include/linux \
    $%IncDirectives %DBDirectives -H -c <Source.cxx> -o <Object.o> > &<tmp_file>
   @end;
 
@@ -635,7 +635,95 @@
              %BaseName, %OutputDir, %TmpFile
             ) is
    $%CMPLRS_CXX_Command %CMPLRS_CXX_Options \^
-   $%CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives -H \^
+   $%CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \^
+   $-I/PRODUCTS/java/jdk1.2.2/include/linux \^
+   $%IncDirectives %DBDirectives -H  \^
+   $-c %Source -o %OutputDir/%BaseName.o >& %TmpFile
+   $set stat = $status
+   $if ( $stat == 0 ) then
+   $ sed -e 's/ //g' -e '/:/d' %TmpFile | sort -u > %OutputDir/%BaseName.m
+   $endif
+   $if( -e %TmpFile ) grep ':' %TmpFile
+   $/bin/rm -f %TmpFile
+   $set status = $stat
+  @end;
+ @endif;
+
+--     #######   ###   #     #     --
+--     #     #    #     #   #      --
+--     #     #    #      # #       --
+--     #######    #       #        --
+--     #     #    #      # #       --
+--     #     #    #     #   #      --
+--     #     #   ###   #     #     --
+
+ @if ( %Station == "aix" ) then
+  @if ( %DebugMode == "True" ) then
+   @set %CMPLRS_CXX_ModeOpt = "-g0 -DDEB -D_DEBUG";
+   @set %CMPLRS_C_ModeOpt   = "-g0 -DDEB -D_DEBUG";
+   @set %CMPLRS_F77_ModeOpt = "-g  -DDEB -D_DEBUG";
+  @else
+   @set %CMPLRS_CXX_ModeOpt = "-O2 ";
+   @set %CMPLRS_C_ModeOpt   = "-O2 ";
+   @set %CMPLRS_F77_ModeOpt  = "-O2 ";
+  @endif;
+
+  @if ( %DBMS == "OBJS" ) then
+   @set %CMPLRS_CXX_DBMSOpt = "-DOBJS";
+  @endif;
+
+  @if ( %DBMS == "DFLT" ) then
+   @set %CMPLRS_CXX_DBMSOpt = "-DCSFDB";
+  @endif;
+
+  @set %CMPLRS_F77_Command = "/usr/bin/f77 ";
+  @set %CMPLRS_F77_Options = "-fPIC";
+
+  @set %CMPLRS_C_Command = "xlC_r";
+  @set %CMPLRS_C_Options = " -DAIX -DCSFDB ";
+
+  @template CMPLRS_C_OptLine (
+             %CMPLRS_C_Command, %CMPLRS_C_Options, %CMPLRS_C_ModeOpt, %IncDirectives
+            ) is
+   $C compiler: \^
+   $%CMPLRS_C_Command %CMPLRS_C_Options %CMPLRS_C_ModeOpt \
+   $%IncDirectives  -c <Source.c> -o <Object.o> > &<tmp_file>
+  @end;
+
+  @template CMPLRS_C_CmdLine (
+             %CMPLRS_C_Command, %CMPLRS_C_Options, %CMPLRS_C_ModeOpt,
+             %IncDirectives, %DBDirectives, %Source, %BaseName, %OutputDir, %TmpFile
+            ) is
+   $%CMPLRS_C_Command %CMPLRS_C_Options %DBDirectives %CMPLRS_C_ModeOpt %IncDirectives  -c %Source \^
+   $-o %OutputDir/%BaseName.o >& %TmpFile
+   $set stat = $status
+   $if ( $stat == 0 ) then
+   $ sed -e 's/ //g' -e '/:/d' %TmpFile | sort -u > %OutputDir/%BaseName.m
+   $endif
+   $if( -e %TmpFile ) grep ':' %TmpFile
+   $/bin/rm -f %TmpFile
+   $set status = $stat
+  @end;
+
+  @set %CMPLRS_CXX_Command = "xlC_r";
+  @set %CMPLRS_CXX_Options = " -DAIX  -DCSFDB ";
+
+  @template CMPLRS_CXX_OptLine (
+             %CMPLRS_CXX_Command, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,
+             %CMPLRS_CXX_DBMSOpt, %IncDirectives,  %DBDirectives
+            ) is
+   $C++ compiler: \^
+   $%CMPLRS_CXX_Command %CMPLRS_CXX_Options  %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \
+   $%IncDirectives %DBDirectives -c <Source.cxx> -o <Object.o> > &<tmp_file>
+  @end;
+
+  @template CMPLRS_CXX_CmdLine (
+             %CMPLRS_CXX_Command, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt,
+             %CMPLRS_CXX_DBMSOpt, %IncDirectives, %DBDirectives, %Source,
+             %BaseName, %OutputDir, %TmpFile
+            ) is
+   $%CMPLRS_CXX_Command %CMPLRS_CXX_Options \^
+   $%CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives  \^
    $-c %Source -o %OutputDir/%BaseName.o >& %TmpFile
    $set stat = $status
    $if ( $stat == 0 ) then
@@ -659,5 +747,5 @@
   @endif;
  @endif;
 
---@endif;
+@endif;
 

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index 444a47808080d465b542b9445d6b996f18c5756e..fa0b7fe2a359671efff46a4b803cd8161414dfbf 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -173,5 +173,24 @@
       @set %CSF_TclTkLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltk8.0 -L/usr/X11R6/lib -lX11";
    @endif;
 
+  @if ( %Station == "aix" ) then
+      @if ( %DBMS == "OBJS" ) then
+        @set %CSF_OODBLibs = "";
+      @endif;
+
+      @set %CSF_SOCKETLibs = " " ;
+
+      @set %CSF_TCL_INCLUDE = "/usr/local/include ";
+
+      @set %X11_LIB = "/usr/lpp/X11/lib/R6";
+      @set %CSF_XwLibs = "-L/usr/lpp/X11/lib/R6 -lX11 -lXext -lXmu ";
+
+      @set %OPENGL_LIB = "/usr/lpp/OpenGL/lib";
+      @string %CSF_OpenGlLibs = "-L" %OPENGL_LIB " -lGLU -lGL ";
+
+      @set %CSF_TclLibs   = "-I/usr/local/lib/libtcl8.1.exp "; 
+      @set %CSF_TclTkLibs = "-I/usr/local/lib/libtk8.1.exp ";
+  @endif;
+
 
 @endif;

diff --git a/src/WOKBuilderDef/JAVA.edl b/src/WOKBuilderDef/JAVA.edl
index d9cca4298b911dae0e1e3dda932518eaf78504e3..1522fe92b8ad7daf75595afec00efb5dd764126e 100755 (executable)
--- a/src/WOKBuilderDef/JAVA.edl
+++ b/src/WOKBuilderDef/JAVA.edl
@@ -1,12 +1,18 @@
 @ifnotdefined ( %JAVA_EDL ) then
  @set %JAVA_EDL = "";
 
+ @set %JAVA_Home = "/PRODUCTS/java/jdk1.2.2.2";
  @if ( %Station == "sun" ) then
+  @set %JAVA_Home = "/PRODUCTS/java/jdk1.2.2";
+ @endif;
+ @if ( %Station == "sil" ) then
   @set %JAVA_Home = "/PRODUCTS/java/jdk1.2";
- @else
-  @if ( %Station == "wnt" ) then
+ @endif;
+ @if ( %Station == "lin" ) then
+  @set %JAVA_Home = "/PRODUCTS/java/jdk1.2.2";
+ @endif;
+ @if ( %Station == "wnt" ) then
    @set %JAVA_Home = "D:/jdk1.2.2";
-  @endif;
  @endif;
 
  @string %JAVA_Command       = %JAVA_Home "/bin/javac";