No comments

diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl
index 002c928d838c80a9ad1bb2e380a4d380e271d24c..852c7a6789934a8397e6c2c30f4f75c3bfc6fc9a 100755 (executable)
--- a/src/WOKBuilderDef/CMPLRS.edl
+++ b/src/WOKBuilderDef/CMPLRS.edl
@@ -332,6 +332,8 @@
             ) is
   $C++ compiler: \^
   $%CMPLRS_CXX_Command %CMPLRS_CXX_Options %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \
+  $ -I/PRODUCTS/java1.2.2/include         \
+  $ -I/PRODUCTS/java1.2.2/include/irix \
   $%IncDirectives %DBDirectives -MDupdate -c <Source.cxx> -o <Object.o>
   @end;
 
@@ -341,6 +343,8 @@
              %BaseName, %OutputDir, %TmpFile
             ) is
   $%CMPLRS_CXX_Command %CMPLRS_CXX_Options %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \
+  $ -I/PRODUCTS/java1.2.2/include         \
+  $ -I/PRODUCTS/java1.2.2/include/irix \
   $ %IncDirectives %DBDirectives -MDupdate %TmpFile \
   $  -c %Source -o %OutputDir/%BaseName.o
   $set stat = $status
@@ -591,7 +595,7 @@
   @set %CMPLRS_F77_Options = "-fPIC";
 
   @set %CMPLRS_C_Command = "/usr/bin/gcc -fPIC";
-  @set %CMPLRS_C_Options = "-DLIN -DLININTEL -DCSFDB -funsigned-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
@@ -617,7 +621,7 @@
   @end;
 
   @set %CMPLRS_CXX_Command = "/usr/bin/g++ -fPIC";
-  @set %CMPLRS_CXX_Options = "-DLIN -DLININTEL -DCSFDB -DNO_CXX_EXCEPTION -funsigned-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,
@@ -636,6 +640,7 @@
             ) is
    $%CMPLRS_CXX_Command %CMPLRS_CXX_Options \^
    $%CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \^
+   $-I/PRODUCTS/java/jdk1.2.2/include \^
    $-I/PRODUCTS/java/jdk1.2.2/include/linux \^
    $%IncDirectives %DBDirectives -H  \^
    $-c %Source -o %OutputDir/%BaseName.o >& %TmpFile
@@ -659,8 +664,8 @@
 
  @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_CXX_ModeOpt = "-g -DDEB -D_DEBUG";
+   @set %CMPLRS_C_ModeOpt   = "-g -DDEB -D_DEBUG";
    @set %CMPLRS_F77_ModeOpt = "-g  -DDEB -D_DEBUG";
   @else
    @set %CMPLRS_CXX_ModeOpt = "-O2 ";
@@ -714,6 +719,7 @@
             ) is
    $C++ compiler: \^
    $%CMPLRS_CXX_Command %CMPLRS_CXX_Options  %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt \
+  $ -I/usr/java_dev2/include \
    $%IncDirectives %DBDirectives -c <Source.cxx> -o <Object.o> > &<tmp_file>
   @end;
 
@@ -722,17 +728,20 @@
              %CMPLRS_CXX_DBMSOpt, %IncDirectives, %DBDirectives, %Source,
              %BaseName, %OutputDir, %TmpFile
             ) is
+   $cd %OutputDir
    $%CMPLRS_CXX_Command %CMPLRS_CXX_Options \^
+   $-I/usr/java_dev2/include \
    $%CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives %DBDirectives  \^
-   $-c %Source -o %OutputDir/%BaseName.o >& %TmpFile
+   $-M  -c %Source -o %OutputDir/%BaseName.o 
    $set stat = $status
    $if ( $stat == 0 ) then
-   $ sed -e 's/ //g' -e '/:/d' %TmpFile | sort -u > %OutputDir/%BaseName.m
+   $ sed   -e 's#%OutputDir/%BaseName.o:##g' %BaseName.u | sort -u > %OutputDir/%BaseName.m
    $endif
-   $if( -e %TmpFile ) grep ':' %TmpFile
-   $/bin/rm -f %TmpFile
+   $/bin/rm -f %BaseName.u
    $set status = $stat
   @end;
+
+
  @endif;
 
  @if (  defined( %UnitType )  )  then

diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl
index fa0b7fe2a359671efff46a4b803cd8161414dfbf..53830aad3d158b915caafdd7d4845ffc6871f554 100755 (executable)
--- a/src/WOKBuilderDef/CSF.edl
+++ b/src/WOKBuilderDef/CSF.edl
@@ -69,6 +69,7 @@
       @string %CSF_dpsLibs = "-L" %X11_LIB " -ldps" ;
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
       @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ;
+      @string %CSF_MotifLibs = "-L" %MOTIF_LIB " -lXm -L"%X11_LIB " -lXt -lX11 " ;
 
       @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"; 
@@ -102,6 +103,7 @@
       @set %CSF_dpsLibs = "-L/usr/lib32 -ldps" ;
       @string %CSF_XwLibs  = "-L" %X11_LIB " -lX11 -lXext -lXmu";
       @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ;
+      @string %CSF_MotifLibs = " -lXm -lXt -lX11 " ;
 
       @set %CSF_TclLibs = "-L/usr/tcltk.64/lib -rpath /usr/tcltk.64/lib -ltcl7.5i"; 
       @set %CSF_TclTkLibs = "-L/usr/tcltk.64/lib -rpath /usr/tcltk.64/lib -ltk4.1i"; 

diff --git a/src/WOKBuilderDef/JAVA.edl b/src/WOKBuilderDef/JAVA.edl
index 1522fe92b8ad7daf75595afec00efb5dd764126e..d7998148c8286db63ef7a95967942a707b4330d9 100755 (executable)
--- a/src/WOKBuilderDef/JAVA.edl
+++ b/src/WOKBuilderDef/JAVA.edl
@@ -1,19 +1,22 @@
 @ifnotdefined ( %JAVA_EDL ) then
  @set %JAVA_EDL = "";
 
- @set %JAVA_Home = "/PRODUCTS/java/jdk1.2.2.2";
+ @set %JAVA_Home = "/PRODUCTS/java/jdk1.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";
+  @set %JAVA_Home = "/PRODUCTS/java1.2.2";
  @endif;
  @if ( %Station == "lin" ) then
-  @set %JAVA_Home = "/PRODUCTS/java/jdk1.2.2";
+  @set %JAVA_Home = "/PRODUCTS/java/jdk1.2";
  @endif;
  @if ( %Station == "wnt" ) then
    @set %JAVA_Home = "D:/jdk1.2.2";
  @endif;
+ @if ( %Station == "aix" ) then
+   @set %JAVA_Home = "/usr/java_dev2";
+ @endif;
 
  @string %JAVA_Command       = %JAVA_Home "/bin/javac";
  @string %JAVA_HeaderCommand = %JAVA_Home "/bin/javah";