Improvments for OCCTDocumentation generation and WOK tuning for IRIX64 platform

diff --git a/src/WOKBuilderDef/LDEXE.edl b/src/WOKBuilderDef/LDEXE.edl
index 3185fe29013e9137b06a93e5ef08256da3f345d8..1538fe7f099ba7eaaf7514f21f65d2893ab0f8bb 100755 (executable)
--- a/src/WOKBuilderDef/LDEXE.edl
+++ b/src/WOKBuilderDef/LDEXE.edl
@@ -61,10 +61,15 @@
 -- Definition du Link Silicon Graphics
 
  @if( %Station == "sil" ) then
-
-  @template LDEXE_Header ( %Target ) is
-   $ /usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -call_shared -o %Target \
-  @end;
+     @set %LDEXE_Opt = "-64 -mips4 -Wl,-mmap -multigot -call_shared";
+--@template LDEXE_Header ( %Target ) is
+--$ /usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -call_shared -o %Target \
+--@end;
+     @template LDEXE_Header ( %Target, %CSF_CXX_COMPILER, %LDEXE_Opt ) is
+         $set CSF_CXX_COMPILER = "%CSF_CXX_COMPILER"
+        $set LDEXE_Opt = "%LDEXE_Opt"
+         $${CSF_CXX_COMPILER} ${LDEXE_Opt} -o %Target \
+     @end;
 
  @endif;
 

diff --git a/src/WOKBuilderDef/LDSHR.edl b/src/WOKBuilderDef/LDSHR.edl
index 190f0fb35d6ab73d774a3a950c78fd2ae3aba092..eadecbebb9f21a4c9930f77af6f1d13e7efde764 100755 (executable)
--- a/src/WOKBuilderDef/LDSHR.edl
+++ b/src/WOKBuilderDef/LDSHR.edl
@@ -133,14 +133,27 @@
  @endif;
 
  @if( %Station == "sil" ) then
-  @template LDSHR_Header ( %LDSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList,%CSF_LINKER_SysShared ) is
-   $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -ignore_unresolved %CSF_LINKER_SysShared %LDSHR_DBMSOpt -o %Target \
-   $  -all -none \
-  @end;
-
-  @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt ) is
-   $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %LDSHR_DBMSOpt -o %Target -soname %LogicalName \
-  @end;
+     @set %LDSHR_Opt = "-64 -mips4 -Wl,-mmap -multigot -ignore_unresolved -shared";
+     @set %LDSHR_Check = "-64 -mips4 -Wl,-mmap -multigot -no_prelink";
+--@template LDSHR_Header ( %LDSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList,%CSF_LINKER_SysShared ) is
+--$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -ignore_unresolved %CSF_LINKER_SysShared %LDSHR_DBMSOpt -o %Target \
+--$  -all -none \
+--@end;
+     @template LDSHR_Header ( %LDSHR_DBMSOpt, %CSF_CXX_COMPILER, %LDSHR_Opt, %Target, %LogicalName, %LD_ObjList,%CSF_LINKER_SysShared ) is
+         $set CSF_CXX_Compiler = "%CSF_CXX_COMPILER"
+        $set LDSHR_Opt = "%LDSHR_Opt"
+         $${CSF_CXX_COMPILER} ${LDSHR_Opt} %LDSHR_DBMSOpt -o %Target \
+         $  -all -none \
+     @end;
+
+--@template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt ) is
+--$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %LDSHR_DBMSOpt -o %Target -soname %LogicalName \
+--@end;
+     @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt, %CSF_CXX_COMPILER, %LDSHR_Check ) is
+         $set CSF_CXX_Compiler = "%CSF_CXX_COMPILER"
+        $set LDSHR_Check = "%LDSHR_Check"
+         $${CSF_CXX_COMPILER} ${LDSHR_Check} %LDSHR_DBMSOpt -o %Target -soname %LogicalName \
+     @end;
 
   @template LDSHR_CheckUndefFooter () is
    $ ;

diff --git a/src/WOKBuilderDef/LINKSHR.edl b/src/WOKBuilderDef/LINKSHR.edl
index 5d59950b18f7c58794d352c3cbebf52c4f0e82c2..2a2b75531bc8acc2e6fc4df076c554bb49fe22e4 100755 (executable)
--- a/src/WOKBuilderDef/LINKSHR.edl
+++ b/src/WOKBuilderDef/LINKSHR.edl
@@ -112,11 +112,21 @@
    $\^
   @end;
 
-  @template LINKSHR_Header ( %Target, %LINKSHR_DBMSOpt, %CSF_CXX_COMPILERLINKER, %LogicalName, %LD_ObjList, %CSF_LINKER_SysShared, %CSF_LINKER_SysOpt ) is
-   --$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
-   $%CSF_CXX_COMPILERLINKER %CSF_LINKER_SysShared %CSF_LINKER_SysOpt %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
-   $  -all -objectlist %LD_ObjList -none \
-  @end;
+    @set LINKSHR_Opt = "-64 -mips4 -Wl,-mmap -multigot -no_prelink";
+    @set LINKSHR_Check = "-64 -mips4 -mmap -multigot -no_unresolved";
+    @set LINKSHR_Linker = "/usr/bin/ld";
+
+-- @template LINKSHR_Header ( %Target, %LINKSHR_DBMSOpt, %CSF_CXX_COMPILERLINKER, %LogicalName, %LD_ObjList, %CSF_LINKER_SysShared, %CSF_LINKER_SysOpt ) is
+-- --$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
+-- $%CSF_CXX_COMPILERLINKER %CSF_LINKER_SysShared %CSF_LINKER_SysOpt %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
+-- $  -all -objectlist %LD_ObjList -none \
+-- @end;
+     @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList, %CSF_LINKER_SysShared, %CSF_CXX_COMPILER, %LINKSHR_Opt ) is
+         $set %CSF_CXX_COMPILER = "%CSF_CXX_COMPILER"
+        $set %LINKSHR_Opt = "%LINKSHR_Opt"
+         $${CSF_CXX_COMPILER} ${LINKSHR_Opt} %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \
+         $  -all -objectlist %LD_ObjList -none \
+     @end;
 
   @template LINKSHR_Footer ( %Station ) is
     $-lm ;
@@ -127,16 +137,24 @@
     --$ endif
   @end;
 
-  @template LINKSHR_CheckUndefHeader (%CSF_LINKER, %LD_LIBRARY_PATH, %CSF_LINKER_CheckOpt, %CSF_LINKER_CheckOut ) 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
-   $echo "Check of undefined symbols with LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
-   $echo "Does not run on SGI : -no_unresolved does give unresolved symbols of a shareable image ..."
-   $%CSF_LINKER %CSF_LINKER_CheckOpt %CSF_LINKER_CheckOut \
-  @end;
+--  @template LINKSHR_CheckUndefHeader (%CSF_LINKER, %LD_LIBRARY_PATH, %CSF_LINKER_CheckOpt, %CSF_LINKER_CheckOut ) 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
+--   $echo "Check of undefined symbols with LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+--   $echo "Does not run on SGI : -no_unresolved does give unresolved symbols of a shareable image ..."
+--   $%CSF_LINKER %CSF_LINKER_CheckOpt %CSF_LINKER_CheckOut \
+--  @end;
+
+     @template LINKSHR_CheckUndefHeader ( %LD_LIBRARY_PATH, %LINKSHR_Linker, %LINKSHR_Check ) is
+         $echo "Check of undefined symbols with LD_LIBRARY_PATH : $LD_LIBRARY_PATH"
+         $echo "Does not run on SGI : -no_unresolved does give unresolved symbols of a shareable image ..."
+        $set %LINKSHR_Linker = "%LINKSHR_Linker"
+        $set %LINKSHR_Check = "%LINKSHR_Check"
+         $${LINKSHR_Linker} ${LINKSHR_Check} -o /dev/null \
+     @end;
 
   @template LINKSHR_CheckUndefFooter () is
     $ ;