From: cascade Date: Wed, 15 Aug 2007 13:11:45 +0000 (+0000) Subject: OCC16602 Fix rollback - compilation errors on WNT X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=79086544926f7da7d799c224af4879e8f5daed49;p=occt-wok.git OCC16602 Fix rollback - compilation errors on WNT --- diff --git a/src/WOKBuilderDef/CDLTranslate.edl b/src/WOKBuilderDef/CDLTranslate.edl index de07f8d..459597e 100755 --- a/src/WOKBuilderDef/CDLTranslate.edl +++ b/src/WOKBuilderDef/CDLTranslate.edl @@ -6,17 +6,18 @@ @ifnotdefined ( %CDLTranslate_EDL) then @set %CDLTranslate_EDL = ""; -@set %CDLTranslate_SHARED = "libTKCDLFront.so"; +@if ( %Station != "wnt" ) then +@if ( %LocalArch != "hp" ) then + --@set %CDLTranslate_SHARED = "libCDLFront.so"; + @set %CDLTranslate_SHARED = "libTKCDLFront.so"; +@endif; @if ( %LocalArch == "hp" ) then + --@set %CDLTranslate_SHARED = "libCDLFront.sl"; @set %CDLTranslate_SHARED = "libTKCDLFront.sl"; @endif; - -@if ( %LocalArch == "mac" ) then - @set %CDLTranslate_SHARED = "libTKCDLFront.dylib"; -@endif; - -@if ( %LocalArch == "wnt" ) then +@else + --@set %CDLTranslate_SHARED = "CDLFront.dll"; @set %CDLTranslate_SHARED = "TKCDLFront.dll"; @endif; diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl index 01c63cb..2a32830 100755 --- a/src/WOKBuilderDef/CMPLRS.edl +++ b/src/WOKBuilderDef/CMPLRS.edl @@ -655,7 +655,6 @@ @end; @endif; - -- # # # # ####### -- -- # # # ## # # -- -- # # # # # # # -- @@ -1183,313 +1182,3 @@ @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 cfe2e69..79b9df9 100755 --- a/src/WOKBuilderDef/CODEGEN.edl +++ b/src/WOKBuilderDef/CODEGEN.edl @@ -16,14 +16,10 @@ @if ( %Station != "wnt" ) then - @if ( %Station == "lin" ) then - @set %CODEGEN_FlexBisHome = "/usr"; + @if ( %Station != "lin" ) then + @set %CODEGEN_FlexBisHome = "/PRODUCTS/flexbis-253-125"; @else - @if ( %Station == "mac" ) then - @set %CODEGEN_FlexBisHome = "/sw"; - @else - @set %CODEGEN_FlexBisHome = "/PRODUCTS/flexbis-253-125"; - @endif; + @set %CODEGEN_FlexBisHome = "/usr"; @endif; @template CODEGEN_LEX_Production ( %BaseName ) is diff --git a/src/WOKBuilderDef/COMMAND.edl b/src/WOKBuilderDef/COMMAND.edl index 840cd00..bce012f 100755 --- a/src/WOKBuilderDef/COMMAND.edl +++ b/src/WOKBuilderDef/COMMAND.edl @@ -7,14 +7,15 @@ @set %COMMAND_EDL = ""; @if ( %Station != "wnt" ) then - -@if ( %Station != "hp" && %Station != "lin" && %Station != "mac" ) then +@if ( %Station != "hp" && %Station != "lin") 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"; -@else +@endif; + +@if ( %Station == "hp" || %Station == "lin") then @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 ffab679..3e621ef 100755 --- a/src/WOKBuilderDef/CPP.edl +++ b/src/WOKBuilderDef/CPP.edl @@ -6,20 +6,21 @@ @ifnotdefined ( %CPP_EDL) then @set %CPP_EDL = ""; -@set %CPP_Shared = "libTKCPPExt.so"; +@if ( %LocalArch != "hp" ) then + --@set %CPP_Shared = "libCPPExt.so"; + @set %CPP_Shared = "libTKCPPExt.so"; +@endif; @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 a55f6c7..a966a2b 100755 --- a/src/WOKBuilderDef/CPPCLIENT.edl +++ b/src/WOKBuilderDef/CPPCLIENT.edl @@ -7,25 +7,29 @@ @set %CPPCLIENT_EDL = ""; @if ( %Station != "wnt" ) then - -@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then +@if ( %LocalArch != "hp" ) then + --@set %CPPCLIENT_SHARED = "libCPPClient.so"; @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; - -@if ( %LocalArch == "mac" ) then - @set %CPPCLIENT_SHARED = "libTKCPPClient.dylib"; - @set %CPPCLIENT_Shared = "libTKCPPClient.dylib"; @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"; +@endif; + +@if ( %LocalArch == "hp" ) then + --@set %CPPCLIENT_Shared = "libCPPClient.sl"; + @set %CPPCLIENT_Shared = "libTKCPPClient.sl"; +@endif; + @else --@set %CPPCLIENT_Shared = "CPPClient.dll"; @set %CPPCLIENT_Shared = "TKCPPClient.dll"; diff --git a/src/WOKBuilderDef/CPPENG.edl b/src/WOKBuilderDef/CPPENG.edl index 5f64b0a..63244c2 100755 --- a/src/WOKBuilderDef/CPPENG.edl +++ b/src/WOKBuilderDef/CPPENG.edl @@ -4,27 +4,34 @@ -- Copyright: Matra Datavision 1996 @if ( %Station != "wnt" ) then - -@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then +@if ( %LocalArch != "hp" ) then + --@string %CPPENG_SHARED = "libCPPIntExt.so"; @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; - -@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"; +@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"; +@endif; + + @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 c7d1930..f632e36 100755 --- a/src/WOKBuilderDef/CPPINT.edl +++ b/src/WOKBuilderDef/CPPINT.edl @@ -5,28 +5,34 @@ @if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then - @set %CPPINT_SHARED = "libTKCPPIntExt.so"; - @set %CPPINT_Shared = "libTKCPPIntExt.so"; +@if ( %LocalArch != "hp" ) then + --@set %CPPINT_SHARED = "libCPPIntExt.so"; + @set %CPPINT_SHARED = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @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"; + --@set %CPPINT_SHARED = "libCPPIntExt.sl"; + @set %CPPINT_SHARED = "libTKCPPIntExt.sl"; @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 d048742..3fc0c2e 100755 --- a/src/WOKBuilderDef/CPPJINI.edl +++ b/src/WOKBuilderDef/CPPJINI.edl @@ -7,25 +7,30 @@ @set %CPPJINI_EDL = ""; @if ( %Station != "wnt" ) then - -@if ( %LocalArch != "hp" && %LocalArch != "mac" ) then +@if ( %LocalArch != "hp" ) then + --@set %CPPJINI_SHARED = "libCPPJini.so"; @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; -@if ( %LocalArch == "mac" ) then - @set %CPPJINI_SHARED = "libTKCPPJini.dylib"; - @set %CPPJINI_Shared = "libTKCPPJini.dylib"; +@set %CPPJINI_NAME = "CPPJini"; + +@if ( %LocalArch != "hp" ) then + --@set %CPPJINI_Shared = "libCPPJini.so"; + @set %CPPJINI_Shared = "libTKCPPJini.so"; @endif; -@set %CPPJINI_NAME = "CPPJini"; +@if ( %LocalArch == "hp" ) then + --@set %CPPJINI_Shared = "libCPPJini.sl"; + @set %CPPJINI_Shared = "libTKCPPJini.sl"; +@endif; @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 9b25c74..1e708af 100755 --- a/src/WOKBuilderDef/CSF.edl +++ b/src/WOKBuilderDef/CSF.edl @@ -613,164 +613,5 @@ @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 64820ce..3fde876 100755 --- a/src/WOKBuilderDef/CSFDBSCHEMA.edl +++ b/src/WOKBuilderDef/CSFDBSCHEMA.edl @@ -6,20 +6,19 @@ @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 7410016..babe675 100755 --- a/src/WOKBuilderDef/JAVA.edl +++ b/src/WOKBuilderDef/JAVA.edl @@ -44,14 +44,6 @@ @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 a78d313..5af5a76 100755 --- a/src/WOKBuilderDef/LD.edl +++ b/src/WOKBuilderDef/LD.edl @@ -38,7 +38,7 @@ $ -L%LibDir \ @end; - @if( %Station != "hp" && %Station != "mac" ) then + @if( %Station != "hp" ) then @template LD_SharedFullPath ( %LibDir, %LibName ) is $ %LibDir/lib%LibName.so \ @end; @@ -50,12 +50,6 @@ @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; @@ -115,19 +109,5 @@ @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 7f1ed55..b6f4c81 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" || %Station == "mac" || %Station == "bsd" ) then + @if ( %Station == "hp" || %Station == "lin" ) then @set %RmCmd = "/bin/rm"; @endif; diff --git a/src/WOKBuilderDef/LDEXE.edl b/src/WOKBuilderDef/LDEXE.edl index 9c38267..1538fe7 100755 --- a/src/WOKBuilderDef/LDEXE.edl +++ b/src/WOKBuilderDef/LDEXE.edl @@ -88,17 +88,5 @@ @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 7f66710..eadecbe 100755 --- a/src/WOKBuilderDef/LDSHR.edl +++ b/src/WOKBuilderDef/LDSHR.edl @@ -31,7 +31,7 @@ @set %LDSHR_DBMSOpt = ""; @endif; - @if ( %Station != "hp" && %Station != "mac" ) then + @if ( %Station != "hp" ) then @template LDSHR_FileName ( %LDSHR_LibName ) is $lib%LDSHR_LibName.so\^ @end; @@ -43,20 +43,10 @@ @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"; @@ -84,9 +74,6 @@ @end; @endif; ------------------------------------ --- SUN ------------------------------------ @if( %Station == "sun" ) then @set %LDSHR_Footer = "LDSHR_Footer"; @@ -137,10 +124,6 @@ @end; @endif; ------------------------------------ --- DEC ------------------------------------ - @if( %Station == "ao1") then @set %LDSHR_LibLimit = "1"; @@ -177,10 +160,6 @@ @end; @endif; ------------------------------------ --- HP ------------------------------------ - @if( %Station == "hp" ) then @set %LDSHR_Footer = "LDSHR_Footer"; @set %LDSHR_ObjectRef = "LDSHR_ObjectRef"; @@ -214,67 +193,5 @@ @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 daef822..dedbc93 100755 --- a/src/WOKBuilderDef/LINKSHR.edl +++ b/src/WOKBuilderDef/LINKSHR.edl @@ -33,7 +33,7 @@ ---@set %LINKSHR_DBMSOpt = %CSF_LINKER_CheckOpt ; - @if ( %Station != "hp" && %Station != "mac" ) then + @if ( %Station != "hp" ) then @template LINKSHR_FileName ( %LINKSHR_LibName ) is $lib%LINKSHR_LibName.so\^ @end; @@ -45,12 +45,6 @@ @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; @@ -363,111 +357,8 @@ -- $ 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 32760d9..1a368bd 100755 --- a/src/WOKBuilderDef/TCPP.edl +++ b/src/WOKBuilderDef/TCPP.edl @@ -6,18 +6,22 @@ @ifnotdefined ( %TCPP_EDL) then @set %TCPP_EDL = ""; -@set %TCPP_Shared = "libTKTCPPExt.so"; +@if ( %Station != "wnt" ) then -@if ( %LocalArch == "hp" ) then - @set %TCPP_Shared = "libTKTCPPExt.sl"; +@if ( %LocalArch != "hp" ) then + --@set %TCPP_Shared = "libTCPPExt.so"; + @set %TCPP_Shared = "libTKTCPPExt.so"; @endif; -@if ( %LocalArch == "mac" ) then - @set %TCPP_Shared = "libTKTCPPExt.dylib"; +@if ( %LocalArch == "hp" ) then + --@set %TCPP_Shared = "libTCPPExt.sl"; + @set %TCPP_Shared = "libTKTCPPExt.sl"; @endif; -@if ( %Station == "wnt" ) then +@else + --@set %TCPP_Shared = "TCPPExt.dll"; @set %TCPP_Shared = "TKTCPPExt.dll"; + @endif; @set %TCPP_Name = "TCPP";