From 139ac7850fb15dfcd1bb3c305150d1db9f5ee653 Mon Sep 17 00:00:00 2001 From: cascade Date: Fri, 7 Sep 2007 14:50:58 +0000 Subject: [PATCH] OCC16602 [OCC Forum] Integration of code porting to MacOSX by Torsten Sadowski --- src/WOKBuilderDef/CDLTranslate.edl | 15 +- src/WOKBuilderDef/CMPLRS.edl | 311 +++++++++++++++++++++++++++++ src/WOKBuilderDef/CODEGEN.edl | 10 +- src/WOKBuilderDef/COMMAND.edl | 7 +- src/WOKBuilderDef/CPP.edl | 11 +- src/WOKBuilderDef/CPPCLIENT.edl | 22 +- src/WOKBuilderDef/CPPENG.edl | 25 +-- src/WOKBuilderDef/CPPINT.edl | 26 +-- src/WOKBuilderDef/CPPJINI.edl | 21 +- src/WOKBuilderDef/CSF.edl | 159 +++++++++++++++ src/WOKBuilderDef/CSFDBSCHEMA.edl | 7 +- src/WOKBuilderDef/JAVA.edl | 8 + src/WOKBuilderDef/LD.edl | 22 +- src/WOKBuilderDef/LDAR.edl | 2 +- src/WOKBuilderDef/LDEXE.edl | 12 ++ src/WOKBuilderDef/LDSHR.edl | 85 +++++++- src/WOKBuilderDef/LINKSHR.edl | 111 +++++++++- src/WOKBuilderDef/TCPP.edl | 16 +- 18 files changed, 774 insertions(+), 96 deletions(-) diff --git a/src/WOKBuilderDef/CDLTranslate.edl b/src/WOKBuilderDef/CDLTranslate.edl index 459597e..de07f8d 100755 --- a/src/WOKBuilderDef/CDLTranslate.edl +++ b/src/WOKBuilderDef/CDLTranslate.edl @@ -6,18 +6,17 @@ @ifnotdefined ( %CDLTranslate_EDL) then @set %CDLTranslate_EDL = ""; -@if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - --@set %CDLTranslate_SHARED = "libCDLFront.so"; - @set %CDLTranslate_SHARED = "libTKCDLFront.so"; -@endif; +@set %CDLTranslate_SHARED = "libTKCDLFront.so"; @if ( %LocalArch == "hp" ) then - --@set %CDLTranslate_SHARED = "libCDLFront.sl"; @set %CDLTranslate_SHARED = "libTKCDLFront.sl"; @endif; -@else - --@set %CDLTranslate_SHARED = "CDLFront.dll"; + +@if ( %LocalArch == "mac" ) then + @set %CDLTranslate_SHARED = "libTKCDLFront.dylib"; +@endif; + +@if ( %LocalArch == "wnt" ) then @set %CDLTranslate_SHARED = "TKCDLFront.dll"; @endif; diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl index 2a32830..01c63cb 100755 --- a/src/WOKBuilderDef/CMPLRS.edl +++ b/src/WOKBuilderDef/CMPLRS.edl @@ -655,6 +655,7 @@ @end; @endif; + -- # # # # ####### -- -- # # # ## # # -- -- # # # # # # # -- @@ -1182,3 +1183,313 @@ @endif; @endif; + +-- # # # #### -- +-- ## ## # # # # -- +-- # # # # # # # -- +-- # # # # # # -- +-- # # ####### # -- +-- # # # # # # -- +-- # # # # #### -- + +@if ( %Station == "mac" ) then + + @template CMPLRS_C_DTmpFile (%TmpFile) is + $>& %TmpFile \ + @end; + + @template CMPLRS_CXX_DTmpFile (%TmpFile) is + $>& %TmpFile \ + @end; + + @template CMPLRS_F77_DTmpFile (%TmpFile) is + $ \ + @end; + + @if ( %DebugMode == "True" ) then +-- @set %CMPLRS_CXX_ModeOpt = "-gdwarf-2 -O0 -DDEB -D_DEBUG"; +-- @set %CMPLRS_C_ModeOpt = "-gdwarf-2 -O0 -DDEB -D_DEBUG"; +-- @set %CMPLRS_F77_ModeOpt = "-gdwarf-2 -DDEB -D_DEBUG"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOptDeb ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOptDeb ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOptDeb ; + @else +-- @set %CMPLRS_CXX_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; +-- @set %CMPLRS_C_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; +-- @set %CMPLRS_F77_ModeOpt = "-O3 -DNDEBUG -DNo_Exception"; + @set %CMPLRS_CXX_ModeOpt = %CSF_CXX_ModeOpt ; + @set %CMPLRS_C_ModeOpt = %CSF_C_ModeOpt ; + @set %CMPLRS_F77_ModeOpt = %CSF_F77_ModeOpt ; + @endif; + + @set %CMPLRS_CXX_WOKDirectives = "-MD "; + @set %CMPLRS_C_WOKDirectives = "-MD "; + @set %CMPLRS_F77_WOKDirectives = ""; + + + @template CMPLRS_F77_OptLine ( + %CMPLRS_F77_COMPILER , + %CMPLRS_F77_SysOptions , + %CMPLRS_F77_ModeOpt + ) is + $Following parameters make up F77 compilation command in this order: + $CMPLRS_F77_COMPILER = %CMPLRS_F77_COMPILER + $CMPLRS_F77_SysOptions = %CMPLRS_F77_SysOptions + $CMPLRS_F77_ModeOpt = %CMPLRS_F77_ModeOpt + @end; + + @template CMPLRS_F77_CmdLine ( %CMPLRS_F77_COMPILER , %CMPLRS_F77_SysOptions , %CMPLRS_F77_ModeOpt , + %CMPLRS_F77_WOKDirectives , %Source , %OutputDir , %BaseName , %Entity ) is + $%CMPLRS_F77_COMPILER %CMPLRS_F77_SysOptions %CMPLRS_F77_ModeOpt %CMPLRS_F77_WOKDirectives -c %Source -o %OutputDir/%BaseName.o + $echo '$F77_COMPILER %CMPLRS_F77_SysOptions %CMPLRS_F77_ModeOpt $INCDIRS -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/f77.compile + $ touch %OutputDir/%BaseName.m + @end; + + + @template CMPLRS_C_OptLine (%CMPLRS_C_COMPILER , + %CMPLRS_C_SysOptions , + %CMPLRS_C_Options , + %CMPLRS_C_ModeOpt , + %CMPLRS_C_INCLUDE , + %IncDirectives , + %CMPLRS_Unit_C_Options , + %CMPLRS_C_WOKDirectives , + %Entity ) is + $Following parameters make up C compilation command in this order: + $CMPLRS_C_COMPILER = %CMPLRS_C_COMPILER + $CMPLRS_C_SysOptions = %CMPLRS_C_SysOptions + $CMPLRS_C_Options = %CMPLRS_C_Options + $CMPLRS_Unit_C_Options = %CMPLRS_Unit_C_Options + $CMPLRS_C_INCLUDE = %CMPLRS_C_INCLUDE + $CMPLRS_C_WOKDirectives= %CMPLRS_C_WOKDirectives + $Dynamic include directives are : + $%IncDirectives + @end; + @template CMPLRS_C_CmdLine ( %CMPLRS_C_COMPILER , + %CMPLRS_C_SysOptions , + %CMPLRS_C_Options , + %CMPLRS_C_ModeOpt , + %CMPLRS_CXX_DBMSOpt , +-- %C_Export , + %CMPLRS_C_INCLUDE , + %IncDirectives , + %CMPLRS_Unit_C_Options , + %CMPLRS_C_WOKDirectives , + %Source , + %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 + $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 + $set status = $stat + @end; + + @template CMPLRS_CXX_OptLine (%CMPLRS_CXX_COMPILER, + %CMPLRS_CXX_SysOptions , + %CMPLRS_CXX_Options , + %CMPLRS_CXX_ModeOpt , %CMPLRS_CXX_DBMSOpt , + %CMPLRS_CXX_INCLUDE , + %CMPLRS_CXX_WOKDirectives , + %IncDirectives , + %DBDirectives , + %Entity ) is + $Following parameters make up C++ compilation command in this order: + $CMPLRS_CXX_COMPILER = %CMPLRS_CXX_COMPILER + $CMPLRS_CXX_SysOptions = %CMPLRS_CXX_SysOptions + $CMPLRS_CXX_Options = %CMPLRS_CXX_Options + $CMPLRS_CXX_ModeOpt = %CMPLRS_CXX_ModeOpt + $CMPLRS_CXX_DBMSOpt = %CMPLRS_CXX_DBMSOpt + $CMPLRS_CXX_INCLUDE = %CMPLRS_CXX_INCLUDE + $CMPLRS_CXX_WOKDirectives = %CMPLRS_CXX_WOKDirectives + $Dynamic include directives are : + $%IncDirectives + @end; + + @template CMPLRS_CXX_CmdLine ( %CMPLRS_CXX_COMPILER, + %CMPLRS_CXX_SysOptions , + %CMPLRS_CXX_Options , + %CMPLRS_CXX_ModeOpt , + %CMPLRS_CXX_DBMSOpt , + %CMPLRS_CXX_INCLUDE , + %CMPLRS_CXX_WOKDirectives , + %IncDirectives , + %DBDirectives , + %Source, + %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 + + $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 + $set status = $stat + + @end; + +@endif; + + +-- ###### ##### ###### -- +-- # # # # # # -- +-- # # # # # -- +-- ###### ##### # # -- +-- # # # # # -- +-- # # # # # # -- +-- ###### ##### ###### -- + + +@if ( %Station == "bsd" ) then + + @template CMPLRS_C_DTmpFile (%TmpFile) is + $>& %TmpFile \ + @end; + + @template CMPLRS_CXX_DTmpFile (%TmpFile) is + $>& %TmpFile \ + @end; + + @template CMPLRS_F77_DTmpFile (%TmpFile) is + $ \ + @end; + + @if ( %DebugMode == "True" ) then + @set %CMPLRS_CXX_ModeOpt = "-g -O0 -DDEB -D_DEBUG"; + @set %CMPLRS_C_ModeOpt = "-g -O0 -DDEB -D_DEBUG"; + @set %CMPLRS_F77_ModeOpt = "-g -DDEB -D_DEBUG"; + @else + @set %CMPLRS_CXX_ModeOpt = "-O2 -fno-strict-aliasing -pipe -march=pentiumpro -DNDEBUG -DNo_Exception"; + @set %CMPLRS_C_ModeOpt = "-O2 -fno-strict-aliasing -pipe -march=pentiumpro -DNDEBUG -DNo_Exception"; + @set %CMPLRS_F77_ModeOpt = "-O -DNDEBUG -DNo_Exception"; + @endif; + + @set %CMPLRS_CXX_WOKDirectives = "-MD "; + @set %CMPLRS_C_WOKDirectives = "-MD "; + @set %CMPLRS_F77_WOKDirectives = ""; + + + @template CMPLRS_F77_OptLine ( + %CMPLRS_F77_COMPILER , + %CMPLRS_F77_SysOptions , + %CMPLRS_F77_ModeOpt + ) is + $Following parameters make up F77 compilation command in this order: + $CMPLRS_F77_COMPILER = %CMPLRS_F77_COMPILER + $CMPLRS_F77_SysOptions = %CMPLRS_F77_SysOptions + $CMPLRS_F77_ModeOpt = %CMPLRS_F77_ModeOpt + @end; + + @template CMPLRS_F77_CmdLine ( %CMPLRS_F77_COMPILER , %CMPLRS_F77_SysOptions , %CMPLRS_F77_ModeOpt , + %CMPLRS_F77_WOKDirectives , %Source , %OutputDir , %BaseName , %Entity ) is + $%CMPLRS_F77_COMPILER %CMPLRS_F77_SysOptions %CMPLRS_F77_ModeOpt %CMPLRS_F77_WOKDirectives -c %Source -o %OutputDir/%BaseName.o + $echo '$F77_COMPILER %CMPLRS_F77_SysOptions %CMPLRS_F77_ModeOpt $INCDIRS -c $SOURCE -o $OBJECT' > %OutputDir/../%Entity/.adm/f77.compile + $ touch %OutputDir/%BaseName.m + @end; + + + @template CMPLRS_C_OptLine (%CMPLRS_C_COMPILER , + %CMPLRS_C_SysOptions , + %CMPLRS_C_Options , + %CMPLRS_C_ModeOpt , + %CMPLRS_C_INCLUDE , + %IncDirectives , + %CMPLRS_Unit_C_Options , + %CMPLRS_C_WOKDirectives , + %Entity ) is + $Following parameters make up C compilation command in this order: + $CMPLRS_C_COMPILER = %CMPLRS_C_COMPILER + $CMPLRS_C_SysOptions = %CMPLRS_C_SysOptions + $CMPLRS_C_Options = %CMPLRS_C_Options + $CMPLRS_Unit_C_Options = %CMPLRS_Unit_C_Options + $CMPLRS_C_INCLUDE = %CMPLRS_C_INCLUDE + $CMPLRS_C_WOKDirectives= %CMPLRS_C_WOKDirectives + $Dynamic include directives are : + $%IncDirectives + @end; + @template CMPLRS_C_CmdLine ( %CMPLRS_C_COMPILER , + %CMPLRS_C_SysOptions , + %CMPLRS_C_Options , + %CMPLRS_C_ModeOpt , + %CMPLRS_CXX_DBMSOpt , +-- %C_Export , + %CMPLRS_C_INCLUDE , + %IncDirectives , + %CMPLRS_Unit_C_Options , + %CMPLRS_C_WOKDirectives , + %Source , + %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 + $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 + $set status = $stat + @end; + + @template CMPLRS_CXX_OptLine (%CMPLRS_CXX_COMPILER, + %CMPLRS_CXX_SysOptions , + %CMPLRS_CXX_Options , + %CMPLRS_CXX_ModeOpt , %CMPLRS_CXX_DBMSOpt , + %CMPLRS_CXX_INCLUDE , + %CMPLRS_CXX_WOKDirectives , + %IncDirectives , + %DBDirectives , + %Entity ) is + $Following parameters make up C++ compilation command in this order: + $CMPLRS_CXX_COMPILER = %CMPLRS_CXX_COMPILER + $CMPLRS_CXX_SysOptions = %CMPLRS_CXX_SysOptions + $CMPLRS_CXX_Options = %CMPLRS_CXX_Options + $CMPLRS_CXX_ModeOpt = %CMPLRS_CXX_ModeOpt + $CMPLRS_CXX_DBMSOpt = %CMPLRS_CXX_DBMSOpt + $CMPLRS_CXX_INCLUDE = %CMPLRS_CXX_INCLUDE + $CMPLRS_CXX_WOKDirectives = %CMPLRS_CXX_WOKDirectives + $Dynamic include directives are : + $%IncDirectives + @end; + + @template CMPLRS_CXX_CmdLine ( %CMPLRS_CXX_COMPILER, + %CMPLRS_CXX_SysOptions , + %CMPLRS_CXX_Options , + %CMPLRS_CXX_ModeOpt , + %CMPLRS_CXX_DBMSOpt , + %CMPLRS_CXX_INCLUDE , + %CMPLRS_CXX_WOKDirectives , + %IncDirectives , + %DBDirectives , + %Source, + %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 + + $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 + $set status = $stat + + @end; + + +@endif; + diff --git a/src/WOKBuilderDef/CODEGEN.edl b/src/WOKBuilderDef/CODEGEN.edl index 79b9df9..cfe2e69 100755 --- a/src/WOKBuilderDef/CODEGEN.edl +++ b/src/WOKBuilderDef/CODEGEN.edl @@ -16,10 +16,14 @@ @if ( %Station != "wnt" ) then - @if ( %Station != "lin" ) then - @set %CODEGEN_FlexBisHome = "/PRODUCTS/flexbis-253-125"; - @else + @if ( %Station == "lin" ) then @set %CODEGEN_FlexBisHome = "/usr"; + @else + @if ( %Station == "mac" ) then + @set %CODEGEN_FlexBisHome = "/sw"; + @else + @set %CODEGEN_FlexBisHome = "/PRODUCTS/flexbis-253-125"; + @endif; @endif; @template CODEGEN_LEX_Production ( %BaseName ) is diff --git a/src/WOKBuilderDef/COMMAND.edl b/src/WOKBuilderDef/COMMAND.edl index bce012f..840cd00 100755 --- a/src/WOKBuilderDef/COMMAND.edl +++ b/src/WOKBuilderDef/COMMAND.edl @@ -7,15 +7,14 @@ @set %COMMAND_EDL = ""; @if ( %Station != "wnt" ) then -@if ( %Station != "hp" && %Station != "lin") then + +@if ( %Station != "hp" && %Station != "lin" && %Station != "mac" ) then @set %COMMAND_CPCmd = "/usr/bin/cp"; @set %COMMAND_CHMODCmd = "/usr/bin/chmod"; @set %COMMAND_MVCmd = "/usr/bin/mv"; @set %COMMAND_RMCmd = "/usr/bin/rm"; @set %COMMAND_CMPCmd = "/usr/bin/cmp"; -@endif; - -@if ( %Station == "hp" || %Station == "lin") then +@else @set %COMMAND_CPCmd = "/bin/cp"; @set %COMMAND_CHMODCmd = "/bin/chmod"; @set %COMMAND_MVCmd = "/bin/mv"; diff --git a/src/WOKBuilderDef/CPP.edl b/src/WOKBuilderDef/CPP.edl index 3e621ef..ffab679 100755 --- a/src/WOKBuilderDef/CPP.edl +++ b/src/WOKBuilderDef/CPP.edl @@ -6,21 +6,20 @@ @ifnotdefined ( %CPP_EDL) then @set %CPP_EDL = ""; -@if ( %LocalArch != "hp" ) then - --@set %CPP_Shared = "libCPPExt.so"; - @set %CPP_Shared = "libTKCPPExt.so"; -@endif; +@set %CPP_Shared = "libTKCPPExt.so"; @if ( %LocalArch == "hp" ) then - --@set %CPP_Shared = "libCPPExt.sl"; @set %CPP_Shared = "libTKCPPExt.sl"; @endif; @if ( %LocalArch == "wnt" ) then - --@set %CPP_Shared = "CPPExt.dll"; @set %CPP_Shared = "TKCPPExt.dll"; @endif; +@if ( %LocalArch == "mac" ) then + @set %CPP_Shared = "libTKCPPExt.dylib"; +@endif; + @set %CPP_Name = "CPP"; @endif; diff --git a/src/WOKBuilderDef/CPPCLIENT.edl b/src/WOKBuilderDef/CPPCLIENT.edl index a966a2b..a55f6c7 100755 --- a/src/WOKBuilderDef/CPPCLIENT.edl +++ b/src/WOKBuilderDef/CPPCLIENT.edl @@ -7,28 +7,24 @@ @set %CPPCLIENT_EDL = ""; @if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - --@set %CPPCLIENT_SHARED = "libCPPClient.so"; + +@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then @set %CPPCLIENT_SHARED = "libTKCPPClient.so"; + @set %CPPCLIENT_Shared = "libTKCPPClient.so"; @endif; @if ( %LocalArch == "hp" ) then - --@set %CPPCLIENT_SHARED = "libCPPClient.sl"; @set %CPPCLIENT_SHARED = "libTKCPPClient.sl"; + @set %CPPCLIENT_Shared = "libTKCPPClient.sl"; @endif; -@set %CPPCLIENT_TMPLDIRS = "/home/wb/kl/nw/prod/CPPClient/src"; -@set %CPPCLIENT_NAME = "CPPClient"; - -@if ( %LocalArch != "hp" ) then - --@set %CPPCLIENT_Shared = "libCPPClient.so"; - @set %CPPCLIENT_Shared = "libTKCPPClient.so"; +@if ( %LocalArch == "mac" ) then + @set %CPPCLIENT_SHARED = "libTKCPPClient.dylib"; + @set %CPPCLIENT_Shared = "libTKCPPClient.dylib"; @endif; -@if ( %LocalArch == "hp" ) then - --@set %CPPCLIENT_Shared = "libCPPClient.sl"; - @set %CPPCLIENT_Shared = "libTKCPPClient.sl"; -@endif; +@set %CPPCLIENT_TMPLDIRS = "/home/wb/kl/nw/prod/CPPClient/src"; +@set %CPPCLIENT_NAME = "CPPClient"; @else --@set %CPPCLIENT_Shared = "CPPClient.dll"; diff --git a/src/WOKBuilderDef/CPPENG.edl b/src/WOKBuilderDef/CPPENG.edl index 63244c2..5f64b0a 100755 --- a/src/WOKBuilderDef/CPPENG.edl +++ b/src/WOKBuilderDef/CPPENG.edl @@ -4,34 +4,27 @@ -- Copyright: Matra Datavision 1996 @if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - --@string %CPPENG_SHARED = "libCPPIntExt.so"; + +@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then @string %CPPENG_SHARED = "libTKCPPIntExt.so"; + @string %CPPENG_Shared = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - --@string %CPPENG_SHARED = "libCPPIntExt.sl"; @string %CPPENG_SHARED = "libTKCPPIntExt.sl"; + @string %CPPENG_Shared = "libTKCPPIntExt.sl"; @endif; -@set %CPPENG_TMPLDIRS = "/home/wb/kl/nw/prod/CPPIntExt/src"; -@set %CPPENG_NAME = "CPPEng"; - -@if ( %LocalArch != "hp" ) then - --@string %CPPENG_Shared = "libCPPIntExt.so"; - @string %CPPENG_Shared = "libTKCPPIntExt.so"; -@endif; - -@if ( %LocalArch == "hp" ) then - --@string %CPPENG_Shared = "libCPPIntExt.sl"; - @string %CPPENG_Shared = "libTKCPPIntExt.sl"; +@if ( %LocalArch == "mac" ) then + @string %CPPENG_SHARED = "libTKCPPIntExt.dylib"; + @string %CPPENG_Shared = "libTKCPPIntExt.dylib"; @endif; +@set %CPPENG_TMPLDIRS = "/home/wb/kl/nw/prod/CPPIntExt/src"; +@set %CPPENG_NAME = "CPPEng"; @else - --@string %CPPENG_Shared = "CPPIntExt.dll"; @string %CPPENG_Shared = "TKCPPIntExt.dll"; - @endif; @set %CPPENG_Name = "CPPEng"; diff --git a/src/WOKBuilderDef/CPPINT.edl b/src/WOKBuilderDef/CPPINT.edl index f632e36..c7d1930 100755 --- a/src/WOKBuilderDef/CPPINT.edl +++ b/src/WOKBuilderDef/CPPINT.edl @@ -5,34 +5,28 @@ @if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - --@set %CPPINT_SHARED = "libCPPIntExt.so"; - @set %CPPINT_SHARED = "libTKCPPIntExt.so"; +@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then + @set %CPPINT_SHARED = "libTKCPPIntExt.so"; + @set %CPPINT_Shared = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - --@set %CPPINT_SHARED = "libCPPIntExt.sl"; - @set %CPPINT_SHARED = "libTKCPPIntExt.sl"; + @set %CPPINT_SHARED = "libTKCPPIntExt.sl"; + @set %CPPINT_Shared = "libTKCPPIntExt.sl"; +@endif; + +@if ( %LocalArch == "mac" ) then + @set %CPPINT_SHARED = "libTKCPPIntExt.dylib"; + @set %CPPINT_Shared = "libTKCPPIntExt.dylib"; @endif; @set %CPPINT_TMPLDIRS = "/home/wb/kl/nw/prod/CPPIntExt/src"; @set %CPPINT_NAME = "CPPInt"; -@if ( %LocalArch != "hp" ) then - --@set %CPPINT_Shared = "libCPPIntExt.so"; - @set %CPPINT_Shared = "libTKCPPIntExt.so"; -@endif; - -@if ( %LocalArch == "hp" ) then - --@set %CPPINT_Shared = "libCPPIntExt.sl"; - @set %CPPINT_Shared = "libTKCPPIntExt.sl"; @endif; @else - - --@set %CPPINT_Shared = "CPPIntExt.dll"; @set %CPPINT_Shared = "TKCPPIntExt.dll"; - @endif; @set %CPPINT_Name = "CPPInt"; diff --git a/src/WOKBuilderDef/CPPJINI.edl b/src/WOKBuilderDef/CPPJINI.edl index 3fc0c2e..d048742 100755 --- a/src/WOKBuilderDef/CPPJINI.edl +++ b/src/WOKBuilderDef/CPPJINI.edl @@ -7,30 +7,25 @@ @set %CPPJINI_EDL = ""; @if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - --@set %CPPJINI_SHARED = "libCPPJini.so"; + +@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then @set %CPPJINI_SHARED = "libTKCPPJini.so"; + @set %CPPJINI_Shared = "libTKCPPJini.so"; @endif; @if ( %LocalArch == "hp" ) then - --@set %CPPJINI_SHARED = "libCPPJini.sl"; @set %CPPJINI_SHARED = "libTKCPPJini.sl"; + @set %CPPJINI_Shared = "libTKCPPJini.sl"; @endif; -@set %CPPJINI_NAME = "CPPJini"; - -@if ( %LocalArch != "hp" ) then - --@set %CPPJINI_Shared = "libCPPJini.so"; - @set %CPPJINI_Shared = "libTKCPPJini.so"; +@if ( %LocalArch == "mac" ) then + @set %CPPJINI_SHARED = "libTKCPPJini.dylib"; + @set %CPPJINI_Shared = "libTKCPPJini.dylib"; @endif; -@if ( %LocalArch == "hp" ) then - --@set %CPPJINI_Shared = "libCPPJini.sl"; - @set %CPPJINI_Shared = "libTKCPPJini.sl"; -@endif; +@set %CPPJINI_NAME = "CPPJini"; @else - --@set %CPPJINI_Shared = "CPPJini.dll"; @set %CPPJINI_Shared = "TKCPPJini.dll"; @endif; diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl index 1e708af..9b25c74 100755 --- a/src/WOKBuilderDef/CSF.edl +++ b/src/WOKBuilderDef/CSF.edl @@ -613,5 +613,164 @@ @endif; + -- + -- For Mac platforms (not supported) + -- + @if ( %Station == "mac" ) 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 %STLPortHome = ""; + @if ( %STLPortHome != "") then + @string %STLPortInclude = ""; + @string %STLPortLib = ""; + @else + @set %STLPortInclude = " -I/sw/include "; + @set %STLPortLib = ""; + @endif; + @set %CSF_CXX_SysOptions = "-fPIC -funsigned-char -Wall -fmessage-length=0"; + @string %CSF_CXX_Options = " -DOCC_CONVERT_SIGNALS " %STLPortInclude; + @set %CSF_CXX_ModeOpt = " -O3 -DNDEBUG -DNo_Exception "; + @set %CSF_CXX_ModeOptDeb = " -gdwarf-2 -O0 -DDEB -D_DEBUG "; + + --<< TODO : If applicable , modify the location of the c compiler. + @set %CSF_C_COMPILER = "/usr/bin/gcc "; + @string %CSF_C_INCLUDE += ""; + -->> END TODO + + @set %CSF_C_SysOptions = "-fPIC -funsigned-char -Wall -fexceptions"; + @set %CSF_C_Options = ""; + @set %CSF_C_ModeOpt = " -O3 -DNDEBUG -DNo_Exception "; + @set %CSF_C_ModeOptDeb = " -gdwarf-2 -O0 -DDEB -D_DEBUG "; + + --<< TODO : If applicable , modify the location of the Fortran compiler. + @set %CSF_F77_COMPILER = "/sw/bin/gfortran "; + -->> END TODO + + @set %CSF_F77_SysOptions = "-fPIC "; + @set %CSF_F77_ModeOpt = " -O3 -DNDEBUG -DNo_Exception "; + @set %CSF_F77_ModeOptDeb = " -gdwarf-2 -DDEB -D_DEBUG "; + + @set %CSF_LINKER = "/usr/bin/ld "; + @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ; + @set %CSF_LINKER_DBMSOpt = ""; + @set %CSF_LINKER_SysShared = "-dynamiclib -Wl,-single_module "; + @set %CSF_LINKER_SysExe = ""; + @set %CSF_LINKER_SysOpt = ""; + @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 = "/sw"; + -->> END TODO + + @string %CSF_TCL_INCLUDE = %CSF_TCL_HOME "/include "; + + --<< TODO : If applicable , modify the root location where Java is installed. + @set %CSF_JavaHome = "/System/Library/Frameworks/JavaVM.framework/Versions/1.5.0/Home"; + -->> END TODO + + @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/Headers" ; + @set %CSF_JAVA_COMPILER = "javac"; + @set %CSF_JAVA_JNI = "javah"; + + @set %CSF_DOXIGEN = "/PRODUCTS/maintenance/Linux/doxygen-1.4.1/bin/doxygen"; + @set %CSF_GRAPHVIZ_HOME = "/PRODUCTS/maintenance/Linux/graphviz/bin"; + + @set %CSF_X11_INCLUDE = "-I/usr/X11R6/include "; + @set %CSF_OPENGL_INCLUDE = "-I/usr/X11R6/include "; + + @set %X11_LIB = "/usr/X11R6/lib"; + + @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu -lXi "; + + @string %CSF_OpenGlLibs = %CSF_XwLibs " -lGLU -lGL " ; + + @string %CSF_TclLibs = "-L" %CSF_TCL_HOME "/lib -ltcl "; + @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk -L" %X11_LIB " -lX11"; + @endif; + + -- + -- For FreeBSD platforms (not supported) + -- + @if ( %Station == "bsd" ) then + @if ( %DBMS == "OBJS" ) then + @set %CSF_OODBLibs = ""; + @endif; + + --<< TODO : If applicable , modify the location of the C++ compiler. + @set %CSF_CXX_COMPILER = "c++ "; + -->> END TODO + @set %STLPortHome = ""; + @if ( %STLPortHome != "") then + @string %STLPortInclude = "-I" %STLPortHome "/stlport "; + @string %STLPortLib = "-L" %STLPortHome "/lib -lstlport_gcc"; + @else + @set %STLPortInclude = "/usr/local/include/stlport"; + @string %STLPortLib = "-L/usr/local/lib -lstlport_gcc"; + @endif; + @set %CSF_CXX_SysOptions = "-O2 -fno-strict-aliasing -pipe -march=pentiumpro -fPIC -funsigned-char -Wall -fmessage-length=0"; + @string %CSF_CXX_Options = "-DLIN -DLININTEL -DNO_CXX_EXCEPTION " %STLPortInclude; + + --<< TODO : If applicable , modify the location of the C compiler. + @set %CSF_C_COMPILER = "cc "; + @string %CSF_C_INCLUDE += ""; + -->> END TODO + + @set %CSF_C_SysOptions = "-O2 -fno-strict-aliasing -pipe -march=pentiumpro -fPIC -funsigned-char -Wall"; + @set %CSF_C_Options = "-DLIN -DLININTEL "; + + --<< TODO : If applicable , modify the location of the Fortran compiler. + @set %CSF_F77_COMPILER = "gfortran42 "; + -->> END TODO + + @set %CSF_F77_SysOptions = "-O -fPIC "; + + @set %CSF_LINKER = "ld "; + @set %CSF_CXX_COMPILERLINKER = %CSF_CXX_COMPILER ; + @set %CSF_LINKER_DBMSOpt = ""; + @set %CSF_LINKER_SysShared = "-shared "; + @set %CSF_LINKER_SysExe = ""; + @set %CSF_LINKER_SysOpt = ""; + @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/local"; + -->> END TODO + + @string %CSF_TCL_INCLUDE = "/usr/local/include/tcl8.4 "; + + --<< TODO : If applicable , modify the root location where Java is installed. + @set %CSF_JavaHome = "/usr/local/diablo-jdk1.5.0"; + -->> END TODO + + @string %CSF_JAVA_INCLUDE = "-I" %CSF_JavaHome "/include -I" %CSF_JavaHome "/include/freebsd "; + @set %CSF_JAVA_COMPILER = "javac"; + @set %CSF_JAVA_JNI = "javah"; + + @set %CSF_DOXIGEN = "/usr/local/bin/doxygen"; + @set %CSF_GRAPHVIZ_HOME = "/usr/local/lib/graphviz"; + + @set %CSF_X11_INCLUDE = "-I/usr/X11R6/include "; + @set %CSF_OPENGL_INCLUDE = "-I/usr/X11R6/include "; + + @set %X11_LIB = "/usr/X11R6/lib"; + + @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu -lXi "; + + @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ; + + @string %CSF_TclLibs = "-L" %CSF_TCL_HOME "/lib -ltcl "; + @string %CSF_TclTkLibs = "-L" %CSF_TCL_HOME "/lib -ltk -L" %X11_LIB " -lX11"; + @endif; @endif; diff --git a/src/WOKBuilderDef/CSFDBSCHEMA.edl b/src/WOKBuilderDef/CSFDBSCHEMA.edl index 3fde876..64820ce 100755 --- a/src/WOKBuilderDef/CSFDBSCHEMA.edl +++ b/src/WOKBuilderDef/CSFDBSCHEMA.edl @@ -6,19 +6,20 @@ @ifnotdefined ( %CSFDBSCHEMA_EDL) then @set %CSFDBSCHEMA_EDL = ""; ---@set %CSFDBSCHEMA_Shared = "libCSFDBSchema.so"; @set %CSFDBSCHEMA_Shared = "libTKCSFDBSchema.so"; @if ( %Station == "hp" ) then - --@set %CSFDBSCHEMA_Shared = "libCSFDBSchema.sl"; @set %CSFDBSCHEMA_Shared = "libTKCSFDBSchema.sl"; @endif; @if ( %Station == "wnt" ) then - --@set %CSFDBSCHEMA_Shared = "CSFDBSchema.dll"; @set %CSFDBSCHEMA_Shared = "TKCSFDBSchema.dll"; @endif; +@if ( %Station == "mac" ) then + @set %CSFDBSCHEMA_Shared = "libTKCSFDBSchema.dylib"; +@endif; + @set %CSFDBSCHEMA_Name = "CSFDBSchema"; @endif; diff --git a/src/WOKBuilderDef/JAVA.edl b/src/WOKBuilderDef/JAVA.edl index babe675..7410016 100755 --- a/src/WOKBuilderDef/JAVA.edl +++ b/src/WOKBuilderDef/JAVA.edl @@ -44,6 +44,14 @@ @string %CXX_JAVA += " -I" %CSF_JavaHome "/include/hpux "; @endif; +@if ( %Station == "mac" ) then + @string %CXX_JAVA += " -I" %CSF_JavaHome "/include "; +@endif; + +@if ( %Station == "bsd" ) then + @string %CXX_JAVA += " -I" %CSF_JavaHome "/include/freebsd "; +@endif; + @if ( %Station == "aix" ) then @string %CXX_JAVA += "" ; @endif; diff --git a/src/WOKBuilderDef/LD.edl b/src/WOKBuilderDef/LD.edl index 5af5a76..a78d313 100755 --- a/src/WOKBuilderDef/LD.edl +++ b/src/WOKBuilderDef/LD.edl @@ -38,7 +38,7 @@ $ -L%LibDir \ @end; - @if( %Station != "hp" ) then + @if( %Station != "hp" && %Station != "mac" ) then @template LD_SharedFullPath ( %LibDir, %LibName ) is $ %LibDir/lib%LibName.so \ @end; @@ -50,6 +50,12 @@ @end; @endif; + @if( %Station == "mac" ) then + @template LD_SharedFullPath ( %LibDir, %LibName ) is + $ %LibDir/lib%LibName.dylib \ + @end; + @endif; + @template LD_ArchiveFullPath ( %LibDir, %LibName ) is $ %LibDir/lib%LibName.a \ @end; @@ -109,5 +115,19 @@ @end; @endif; +-- Definition du Link Darwin + @if ( %Station == "mac" ) then + @template LD_Footer ( %Station ) is + $ ; + @end; + @endif; + +-- Definition du Link FreeBSD + @if ( %Station == "bsd" ) then + @template LD_Footer ( %Station ) is + $ ; + @end; + @endif; + @endif; diff --git a/src/WOKBuilderDef/LDAR.edl b/src/WOKBuilderDef/LDAR.edl index b6f4c81..7f1ed55 100755 --- a/src/WOKBuilderDef/LDAR.edl +++ b/src/WOKBuilderDef/LDAR.edl @@ -20,7 +20,7 @@ $lib%LDAR_LibName.a\^ @if( %Station != "sun" ) then @set %RmCmd = "/usr/bin/rm"; - @if ( %Station == "hp" || %Station == "lin" ) then + @if ( %Station == "hp" || %Station == "lin" || %Station == "mac" || %Station == "bsd" ) then @set %RmCmd = "/bin/rm"; @endif; diff --git a/src/WOKBuilderDef/LDEXE.edl b/src/WOKBuilderDef/LDEXE.edl index 1538fe7..9c38267 100755 --- a/src/WOKBuilderDef/LDEXE.edl +++ b/src/WOKBuilderDef/LDEXE.edl @@ -88,5 +88,17 @@ @end; @endif; + @if( %Station == "mac" ) then + @template LDEXE_Header ( %Target , %STLPortLib ) is + $/usr/bin/g++ -o %Target %STLPortLib \ + @end; + @endif; + + @if( %Station == "bsd" ) then + @template LDEXE_Header ( %Target , %STLPortLib ) is + $c++ -o %Target %STLPortLib \ + @end; + @endif; + @endif; diff --git a/src/WOKBuilderDef/LDSHR.edl b/src/WOKBuilderDef/LDSHR.edl index eadecbe..7f66710 100755 --- a/src/WOKBuilderDef/LDSHR.edl +++ b/src/WOKBuilderDef/LDSHR.edl @@ -31,7 +31,7 @@ @set %LDSHR_DBMSOpt = ""; @endif; - @if ( %Station != "hp" ) then + @if ( %Station != "hp" && %Station != "mac" ) then @template LDSHR_FileName ( %LDSHR_LibName ) is $lib%LDSHR_LibName.so\^ @end; @@ -43,10 +43,20 @@ @end; @endif; + @if ( %Station == "mac" ) then + @template LDSHR_FileName ( %LDSHR_LibName ) is + $lib%LDSHR_LibName.dylib\^ + @end; + @endif; + @template LDSHR_ArchiveFullPath ( %LibDir, %LibName ) is $ -all %LibDir/lib%LibName.a -none \ @end; +----------------------------------- +-- Linux +----------------------------------- + @if ( %Station == "lin" ) then @set %LDSHR_Footer = "LDSHR_Footer"; @set %LDSHR_ArchiveFullPath = "LDSHR_ArchiveFullPath"; @@ -74,6 +84,9 @@ @end; @endif; +----------------------------------- +-- SUN +----------------------------------- @if( %Station == "sun" ) then @set %LDSHR_Footer = "LDSHR_Footer"; @@ -124,6 +137,10 @@ @end; @endif; +----------------------------------- +-- DEC +----------------------------------- + @if( %Station == "ao1") then @set %LDSHR_LibLimit = "1"; @@ -160,6 +177,10 @@ @end; @endif; +----------------------------------- +-- HP +----------------------------------- + @if( %Station == "hp" ) then @set %LDSHR_Footer = "LDSHR_Footer"; @set %LDSHR_ObjectRef = "LDSHR_ObjectRef"; @@ -193,5 +214,67 @@ @end; @endif; +----------------------------------- +-- MACOS +----------------------------------- + + @if ( %Station == "mac" ) then + @set %LDSHR_Footer = "LDSHR_Footer"; + @set %LDSHR_ArchiveFullPath = "LDSHR_ArchiveFullPath"; + + @template LDSHR_ArchiveFullPath ( %LibDir, %LibName ) is + $\^ + @end; + + @template LDSHR_Header ( %Target, %LDSHR_DBMSOpt, %CSF_LINKER_SysShared ) is + $/usr/bin/g++ %CSF_LINKER_SysShared %LDSHR_DBMSOpt -o %Target \ + @end; + + @template LDSHR_Footer () is + $ ; + $ set ld_status=$status; + @end; + + @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt,%CSF_LINKER_CheckOpt ) is + $/usr/bin/ld %CSF_LINKER_CheckOpt %LDSHR_DBMSOpt -o %Target \ + @end; + + @template LDSHR_CheckUndefFooter () is + $ ; + $ set status=$ld_status; + @end; + @endif; + +----------------------------------- +-- FreeBSD +----------------------------------- + + @if ( %Station == "bsd" ) then + @set %LDSHR_Footer = "LDSHR_Footer"; + @set %LDSHR_ArchiveFullPath = "LDSHR_ArchiveFullPath"; + + @template LDSHR_ArchiveFullPath ( %LibDir, %LibName ) is + $\^ + @end; + + @template LDSHR_Header ( %Target, %LDSHR_DBMSOpt, %CSF_LINKER_SysShared ) is + $c++ %CSF_LINKER_SysShared %LDSHR_DBMSOpt -o %Target \ + @end; + + @template LDSHR_Footer () is + $ ; + $ set ld_status=$status; + @end; + + @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt,%CSF_LINKER_CheckOpt ) is + $ld %CSF_LINKER_CheckOpt %LDSHR_DBMSOpt -o %Target \ + @end; + + @template LDSHR_CheckUndefFooter () is + $ ; + $ set status=$ld_status; + @end; + @endif; + @endif; diff --git a/src/WOKBuilderDef/LINKSHR.edl b/src/WOKBuilderDef/LINKSHR.edl index dedbc93..daef822 100755 --- a/src/WOKBuilderDef/LINKSHR.edl +++ b/src/WOKBuilderDef/LINKSHR.edl @@ -33,7 +33,7 @@ ---@set %LINKSHR_DBMSOpt = %CSF_LINKER_CheckOpt ; - @if ( %Station != "hp" ) then + @if ( %Station != "hp" && %Station != "mac" ) then @template LINKSHR_FileName ( %LINKSHR_LibName ) is $lib%LINKSHR_LibName.so\^ @end; @@ -45,6 +45,12 @@ @end; @endif; + @if ( %Station == "mac" ) then + @template LINKSHR_FileName ( %LINKSHR_LibName ) is + $lib%LINKSHR_LibName.dylib\^ + @end; + @endif; + @template LINKSHR_ArchiveFullPath ( %LibDir, %LibName ) is $ -all %LibDir/lib%LibName.a -none \ @end; @@ -357,8 +363,111 @@ -- $ set status=${ld_status} @end; + @endif; + +--------------------------------------------- +-- Darwin (MacOS X) +--------------------------------------------- + + @if ( %Station == "mac" ) then + @set %LINKSHR_Footer = "LINKSHR_Footer"; + @set %LINKSHR_ArchiveFullPath = "LINKSHR_ArchiveFullPath"; + + @template LINKSHR_ArchiveFullPath () is + $\^ + @end; + + @template LINKSHR_Header (%CSF_CXX_COMPILERLINKER, %Target, %LINKSHR_DBMSOpt, %CSF_LINKER_SysShared ) is + $%CSF_CXX_COMPILERLINKER %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -o %Target \ + @end; + + @template LINKSHR_Footer (%CSF_LINKER_SysLib) is + $ %CSF_LINKER_SysLib; + $ set ld_status=$status + $ if ( $?DYLD_LIBRARY_PATH ) then + $ set ld_library_path=$DYLD_LIBRARY_PATH + $ endif + @end; + + @template LINKSHR_CheckUndefHeader ( + %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH, %CSF_LINKER_CheckOpt, %CSF_LINKER_CheckOut, %CSF_LINKER + ) is + $if ( $?DYLD_LIBRARY_PATH ) then + $ setenv DYLD_LIBRARY_PATH %LD_LIBRARY_PATH:${DYLD_LIBRARY_PATH} + $else + $ setenv DYLD_LIBRARY_PATH %LD_LIBRARY_PATH + $endif + $echo "Check of undefined symbols with DYLD_LIBRARY_PATH : $DYLD_LIBRARY_PATH" + $%CSF_LINKER %CSF_LINKER_CheckOpt %CSF_LINKER_CheckOut \ + @end; + @template LINKSHR_CheckUndefFooter () is + $ ; + $ if ( $status ) then + $ echo "Check failed" + $ else + $ echo "Check successed" + $ endif + $ if ( $?ld_library_path ) then + $ setenv DYLD_LIBRARY_PATH $ld_library_path + $ else + $ unsetenv DYLD_LIBRARY_PATH + $ endif + $ set status=$ld_status + @end; @endif; +--------------------------------------------- +-- FreeBSD +--------------------------------------------- + + @if ( %Station == "bsd" ) then + @set %LINKSHR_Footer = "LINKSHR_Footer"; + @set %LINKSHR_ArchiveFullPath = "LINKSHR_ArchiveFullPath"; + + @template LINKSHR_ArchiveFullPath () is + $\^ + @end; + + @template LINKSHR_Header (%CSF_CXX_COMPILERLINKER, %Target, %LINKSHR_DBMSOpt, %CSF_LINKER_SysShared ) is + $%CSF_CXX_COMPILERLINKER %CSF_LINKER_SysShared %LINKSHR_DBMSOpt -o %Target \ + @end; + + @template LINKSHR_Footer (%CSF_LINKER_SysLib) is + $ %CSF_LINKER_SysLib; + $ set ld_status=$status + $ if ( $?LD_LIBRARY_PATH ) then + $ set ld_library_path=$LD_LIBRARY_PATH + $ endif + @end; + + @template LINKSHR_CheckUndefHeader ( + %Target, %LINKSHR_DBMSOpt, %LD_LIBRARY_PATH, %CSF_LINKER_CheckOpt, %CSF_LINKER_CheckOut, %CSF_LINKER + ) 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" + $%CSF_LINKER %CSF_LINKER_CheckOpt %CSF_LINKER_CheckOut \ + @end; + + @template LINKSHR_CheckUndefFooter () is + $ ; + $ if ( $status ) then + $ echo "Check failed" + $ else + $ echo "Check successed" + $ endif + $ if ( $?ld_library_path ) then + $ setenv LD_LIBRARY_PATH $ld_library_path + $ else + $ unsetenv LD_LIBRARY_PATH + $ endif + $ set status=$ld_status + @end; @endif; +@endif; + diff --git a/src/WOKBuilderDef/TCPP.edl b/src/WOKBuilderDef/TCPP.edl index 1a368bd..32760d9 100755 --- a/src/WOKBuilderDef/TCPP.edl +++ b/src/WOKBuilderDef/TCPP.edl @@ -6,22 +6,18 @@ @ifnotdefined ( %TCPP_EDL) then @set %TCPP_EDL = ""; -@if ( %Station != "wnt" ) then - -@if ( %LocalArch != "hp" ) then - --@set %TCPP_Shared = "libTCPPExt.so"; - @set %TCPP_Shared = "libTKTCPPExt.so"; -@endif; +@set %TCPP_Shared = "libTKTCPPExt.so"; @if ( %LocalArch == "hp" ) then - --@set %TCPP_Shared = "libTCPPExt.sl"; @set %TCPP_Shared = "libTKTCPPExt.sl"; @endif; -@else - --@set %TCPP_Shared = "TCPPExt.dll"; - @set %TCPP_Shared = "TKTCPPExt.dll"; +@if ( %LocalArch == "mac" ) then + @set %TCPP_Shared = "libTKTCPPExt.dylib"; +@endif; +@if ( %Station == "wnt" ) then + @set %TCPP_Shared = "TKTCPPExt.dll"; @endif; @set %TCPP_Name = "TCPP"; -- 2.39.5