From c925b92cc8df6cb2fb8120bfddd37851c30d2b01 Mon Sep 17 00:00:00 2001 From: cas Date: Tue, 11 Jul 2000 18:15:51 +0000 Subject: [PATCH] No comments --- src/WOKBuilderDef/CDLTranslate.edl | 9 ++- src/WOKBuilderDef/CMPLRS.edl | 12 ++- src/WOKBuilderDef/COMMAND.edl | 6 -- src/WOKBuilderDef/CPP.edl | 9 ++- src/WOKBuilderDef/CPPCLIENT.edl | 15 ++-- src/WOKBuilderDef/CPPENG.edl | 15 ++-- src/WOKBuilderDef/CPPINT.edl | 15 ++-- src/WOKBuilderDef/CPPJINI.edl | 16 ++-- src/WOKBuilderDef/CSF.edl | 57 ++++++++++++-- src/WOKBuilderDef/CSFDBSCHEMA.edl | 9 ++- src/WOKBuilderDef/JAVA.edl | 37 +++++---- src/WOKBuilderDef/LD.edl | 24 +++--- src/WOKBuilderDef/LDEXE.edl | 3 +- src/WOKBuilderDef/LDSHR.edl | 13 +++- src/WOKBuilderDef/LINKSHR.edl | 119 +++++++++++++++++++++++------ src/WOKBuilderDef/TCPP.edl | 9 ++- 16 files changed, 262 insertions(+), 106 deletions(-) diff --git a/src/WOKBuilderDef/CDLTranslate.edl b/src/WOKBuilderDef/CDLTranslate.edl index b9864fb..459597e 100755 --- a/src/WOKBuilderDef/CDLTranslate.edl +++ b/src/WOKBuilderDef/CDLTranslate.edl @@ -8,14 +8,17 @@ @if ( %Station != "wnt" ) then @if ( %LocalArch != "hp" ) then - @set %CDLTranslate_SHARED = "libCDLFront.so"; + --@set %CDLTranslate_SHARED = "libCDLFront.so"; + @set %CDLTranslate_SHARED = "libTKCDLFront.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CDLTranslate_SHARED = "libCDLFront.sl"; + --@set %CDLTranslate_SHARED = "libCDLFront.sl"; + @set %CDLTranslate_SHARED = "libTKCDLFront.sl"; @endif; @else - @set %CDLTranslate_SHARED = "CDLFront.dll"; + --@set %CDLTranslate_SHARED = "CDLFront.dll"; + @set %CDLTranslate_SHARED = "TKCDLFront.dll"; @endif; @set %CDLTranslate_NAME = "CDLTranslate"; diff --git a/src/WOKBuilderDef/CMPLRS.edl b/src/WOKBuilderDef/CMPLRS.edl index e18fff1..0d77a5b 100755 --- 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"; @@ -110,7 +110,7 @@ @endif; @if ( %DBMS == "DFLT" ) then - @set %CMPLRS_CXX_DBMSOpt = "-mt -vdelx -DCSFDB"; + @set %CMPLRS_CXX_DBMSOpt = "-vdelx -DCSFDB"; @endif; @set %CMPLRS_C_Command = "/opt/DEV5_1/SUNWspro/bin/cc -K PIC"; @@ -393,7 +393,7 @@ @set %CMPLRS_CXX_DBMSOpt = "-DCSFDB"; @endif; - @set %CMPLRS_C_Command = "cc +Z +DAportable +DS2.0"; + @set %CMPLRS_C_Command = "cc -Aa +Z +DAportable +DS2.0"; @set %CMPLRS_C_Options = "-DHPUX"; @template CMPLRS_C_OptLine ( @@ -433,7 +433,7 @@ %CMPLRS_CXX_Command, %CMPLRS_CXX_Options, %CMPLRS_CXX_ModeOpt, %CMPLRS_CXX_DBMSOpt, %IncDirectives, %Source, %BaseName, %OutputDir ) is - $cd %OutputDir + --$cd %OutputDir $%CMPLRS_CXX_Command %CMPLRS_CXX_Options %CMPLRS_CXX_DBMSOpt %CMPLRS_CXX_ModeOpt %IncDirectives \ $ -c %Source -o %OutputDir/%BaseName.o $set stat = $status @@ -485,7 +485,6 @@ @endif; @set %CMPLRS_C_Command = "D:/DevTools/VStudio/VC98/bin/cl -nologo -MD -W3 -GX -Ob1"; - --@set %CMPLRS_C_Command = "C:/Program Files/Microsoft Visual Studio/VC98/bin/cl -nologo -MD -W3 -GX -Ob1"; @set %CMPLRS_C_Options = "-DWNT -D_WINDOWS -DWIN32"; @set %CMPLRS_PDBPrefix = " -Fd"; @@ -513,7 +512,6 @@ @end; @set %CMPLRS_CXX_Command = "D:/DevTools/VStudio/VC98/bin/cl -nologo -MD -W3 -GX -Ob1"; - --@set %CMPLRS_CXX_Command = "C:/Program Files/Microsoft Visual Studio/VC98/bin/cl -nologo -MD -W3 -GX -Ob1 "; @set %CMPLRS_CXX_Options = "-DWNT -D_WINDOWS -DWIN32"; @string %CMPLRS_CXX_Options += " -ID:/jdk1.2.2/include"; @@ -661,5 +659,5 @@ @endif; @endif; -@endif; +--@endif; diff --git a/src/WOKBuilderDef/COMMAND.edl b/src/WOKBuilderDef/COMMAND.edl index aeb0d91..bd7883e 100755 --- a/src/WOKBuilderDef/COMMAND.edl +++ b/src/WOKBuilderDef/COMMAND.edl @@ -147,9 +147,7 @@ $ wokCP -p %Source %Dest @end; @template COMMAND_PreserveCopyAndChmod ( %Source, %Dest ) is ----JGA$ wokCHMOD -R u+w %Dest; $ wokCP -p %Source %Dest; ----JGA$ wokCHMOD a+rx %Dest @end; @template COMMAND_PreserveCopyAndChmodExecute ( %Source, %Dest ) is @@ -157,15 +155,11 @@ $ wokCP -p %Source %Dest; @end; @template COMMAND_CopyAndChmod ( %Source, %Dest ) is ----JGA$ wokCHMOD -R u+w %Dest; $ wokCP -p %Source %Dest; ----JGA$ wokCHMOD a+rx %Dest @end; @template COMMAND_CopyAndChmodRecursive ( %Source, %Dest ) is ----JGA$ wokCHMOD -R u+w %Dest; $ wokCP -pr %Source %Dest; ----JGA$ wokCHMOD -R a+rx %Dest; @end; @template COMMAND_Move ( %Source, %Dest ) is diff --git a/src/WOKBuilderDef/CPP.edl b/src/WOKBuilderDef/CPP.edl index 10f81c6..3e621ef 100755 --- a/src/WOKBuilderDef/CPP.edl +++ b/src/WOKBuilderDef/CPP.edl @@ -7,15 +7,18 @@ @set %CPP_EDL = ""; @if ( %LocalArch != "hp" ) then - @set %CPP_Shared = "libCPPExt.so"; + --@set %CPP_Shared = "libCPPExt.so"; + @set %CPP_Shared = "libTKCPPExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPP_Shared = "libCPPExt.sl"; + --@set %CPP_Shared = "libCPPExt.sl"; + @set %CPP_Shared = "libTKCPPExt.sl"; @endif; @if ( %LocalArch == "wnt" ) then - @set %CPP_Shared = "CPPExt.dll"; + --@set %CPP_Shared = "CPPExt.dll"; + @set %CPP_Shared = "TKCPPExt.dll"; @endif; @set %CPP_Name = "CPP"; diff --git a/src/WOKBuilderDef/CPPCLIENT.edl b/src/WOKBuilderDef/CPPCLIENT.edl index a585969..a966a2b 100755 --- a/src/WOKBuilderDef/CPPCLIENT.edl +++ b/src/WOKBuilderDef/CPPCLIENT.edl @@ -8,26 +8,31 @@ @if ( %Station != "wnt" ) then @if ( %LocalArch != "hp" ) then - @set %CPPCLIENT_SHARED = "libCPPClient.so"; + --@set %CPPCLIENT_SHARED = "libCPPClient.so"; + @set %CPPCLIENT_SHARED = "libTKCPPClient.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPPCLIENT_SHARED = "libCPPClient.sl"; + --@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"; @if ( %LocalArch != "hp" ) then - @set %CPPCLIENT_Shared = "libCPPClient.so"; + --@set %CPPCLIENT_Shared = "libCPPClient.so"; + @set %CPPCLIENT_Shared = "libTKCPPClient.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPPCLIENT_Shared = "libCPPClient.sl"; + --@set %CPPCLIENT_Shared = "libCPPClient.sl"; + @set %CPPCLIENT_Shared = "libTKCPPClient.sl"; @endif; @else - @set %CPPCLIENT_Shared = "CPPClient.dll"; + --@set %CPPCLIENT_Shared = "CPPClient.dll"; + @set %CPPCLIENT_Shared = "TKCPPClient.dll"; @endif; @set %CPPCLIENT_Name = "CPPClient"; diff --git a/src/WOKBuilderDef/CPPENG.edl b/src/WOKBuilderDef/CPPENG.edl index 9ccb439..63244c2 100755 --- a/src/WOKBuilderDef/CPPENG.edl +++ b/src/WOKBuilderDef/CPPENG.edl @@ -5,27 +5,32 @@ @if ( %Station != "wnt" ) then @if ( %LocalArch != "hp" ) then - @string %CPPENG_SHARED = "libCPPIntExt.so"; + --@string %CPPENG_SHARED = "libCPPIntExt.so"; + @string %CPPENG_SHARED = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @string %CPPENG_SHARED = "libCPPIntExt.sl"; + --@string %CPPENG_SHARED = "libCPPIntExt.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 = "libCPPIntExt.so"; + @string %CPPENG_Shared = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @string %CPPENG_Shared = "libCPPIntExt.sl"; + --@string %CPPENG_Shared = "libCPPIntExt.sl"; + @string %CPPENG_Shared = "libTKCPPIntExt.sl"; @endif; @else - @string %CPPENG_Shared = "CPPIntExt.dll"; + --@string %CPPENG_Shared = "CPPIntExt.dll"; + @string %CPPENG_Shared = "TKCPPIntExt.dll"; @endif; diff --git a/src/WOKBuilderDef/CPPINT.edl b/src/WOKBuilderDef/CPPINT.edl index 2c56dcb..f632e36 100755 --- a/src/WOKBuilderDef/CPPINT.edl +++ b/src/WOKBuilderDef/CPPINT.edl @@ -6,27 +6,32 @@ @if ( %Station != "wnt" ) then @if ( %LocalArch != "hp" ) then - @set %CPPINT_SHARED = "libCPPIntExt.so"; + --@set %CPPINT_SHARED = "libCPPIntExt.so"; + @set %CPPINT_SHARED = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPPINT_SHARED = "libCPPIntExt.sl"; + --@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 = "libCPPIntExt.so"; + @set %CPPINT_Shared = "libTKCPPIntExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPPINT_Shared = "libCPPIntExt.sl"; + --@set %CPPINT_Shared = "libCPPIntExt.sl"; + @set %CPPINT_Shared = "libTKCPPIntExt.sl"; @endif; @else - @set %CPPINT_Shared = "CPPIntExt.dll"; + --@set %CPPINT_Shared = "CPPIntExt.dll"; + @set %CPPINT_Shared = "TKCPPIntExt.dll"; @endif; diff --git a/src/WOKBuilderDef/CPPJINI.edl b/src/WOKBuilderDef/CPPJINI.edl index 13a6f77..3fc0c2e 100755 --- a/src/WOKBuilderDef/CPPJINI.edl +++ b/src/WOKBuilderDef/CPPJINI.edl @@ -8,26 +8,30 @@ @if ( %Station != "wnt" ) then @if ( %LocalArch != "hp" ) then - @set %CPPJINI_SHARED = "libCPPJini.so"; + --@set %CPPJINI_SHARED = "libCPPJini.so"; + @set %CPPJINI_SHARED = "libTKCPPJini.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPPJINI_SHARED = "libCPPJini.sl"; + --@set %CPPJINI_SHARED = "libCPPJini.sl"; + @set %CPPJINI_SHARED = "libTKCPPJini.sl"; @endif; ---@set %CPPCLIENT_TMPLDIRS = "/home/wb/kl/nw/prod/CPPClient/src"; @set %CPPJINI_NAME = "CPPJini"; @if ( %LocalArch != "hp" ) then - @set %CPPJINI_Shared = "libCPPJini.so"; + --@set %CPPJINI_Shared = "libCPPJini.so"; + @set %CPPJINI_Shared = "libTKCPPJini.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %CPPJINI_Shared = "libCPPJini.sl"; + --@set %CPPJINI_Shared = "libCPPJini.sl"; + @set %CPPJINI_Shared = "libTKCPPJini.sl"; @endif; @else - @set %CPPJINI_Shared = "CPPJini.dll"; + --@set %CPPJINI_Shared = "CPPJini.dll"; + @set %CPPJINI_Shared = "TKCPPJini.dll"; @endif; @set %CPPJINI_Name = "CPPJini"; diff --git a/src/WOKBuilderDef/CSF.edl b/src/WOKBuilderDef/CSF.edl index 43c6b16..444a478 100755 --- a/src/WOKBuilderDef/CSF.edl +++ b/src/WOKBuilderDef/CSF.edl @@ -6,6 +6,13 @@ @ifnotdefined ( %CSF_EDL) then @set %CSF_EDL = ""; + @set %CSF_TCL_INCLUDE = ""; + + @set %CSF_X11_INCLUDE = ""; + @set %CSF_XMU_INCLUDE = ""; + @set %CSF_MOTIF_INCLUDE = ""; + @set %CSF_OPENGL_INCLUDE = ""; + @set %CSF_SOCKETLibs = ""; @set %CSF_RISCRETURNObject = "" ; @set %CSF_FPELibs = "" ; @@ -16,7 +23,10 @@ @set %CSF_glu32 = "" ; @set %CSF_opengl32 = "" ; @set %CSF_wsock32 = "" ; + @set %CSF_dpsLibs = "" ; + @set %CSF_XwLibs = "" ; + @set %CSF_OpenGlLibs = "" ; @set %CSF_TclLibs = "" ; @set %CSF_TclTkLibs = "" ; @@ -52,9 +62,13 @@ @set %XGL_LIB = "/opt/SUNWits/Graphics-sw/xgl-3.0/lib"; @set %MOTIF_LIB = "/usr/dt/lib"; + @set %CSF_TCL_INCLUDE = "/usr/tcltk/include "; + @set %X11_LIB = "/usr/openwin/lib"; + + @string %CSF_dpsLibs = "-L" %X11_LIB " -ldps" ; @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu"; - @set %CSF_dpsLibs = "-ldps" ; + @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ; @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"; @@ -65,6 +79,8 @@ @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop"; @endif; + @set %CSF_TCL_INCLUDE = "/usr/tcltk/include "; + @set %X11_LIB = "/usr/shlib"; @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu"; @set %CSF_dpsLibs = "-ldps" ; @@ -79,11 +95,16 @@ @set %CSF_FPELibs = "-L/usr/lib32 -lfpe" ; + @set %CSF_TCL_INCLUDE = "/usr/tcltk/include "; + @set %X11_LIB = "/usr/lib32"; + + @set %CSF_dpsLibs = "-L/usr/lib32 -ldps" ; @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -lXmu"; - @set %CSF_dpsLibs = "-ldps" ; + @string %CSF_OpenGlLibs = "-L" %X11_LIB " -lGLU -lGL " ; - @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; + @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"; @endif; @if ( %Station == "hp" ) then @@ -91,12 +112,30 @@ @set %CSF_OODBLibs = " -L/PRODUCTS/OS4.0.2/lib/ -los -losthr -loscol -losmop"; @endif; - @set %XMU_LIB = "/usr/contrib/X11R6/lib"; + @set %CSF_TCL_INCLUDE = "/adv_53/hp/jr/tcltk/include "; + + @set %CSF_X11_INCLUDE = "/usr/include/X11R6"; + @set %CSF_XMU_INCLUDE = "/usr/contrib/X11R6/include"; + @set %CSF_MOTIF_INCLUDE = "/usr/include/Motif1.2"; + @set %CSF_OPENGL_INCLUDE = "/opt/graphics/OpenGL/include"; + + @set %CSF_SOCKETLibs = "" ; @set %X11_LIB = "/usr/lib/X11R6"; - @string %CSF_XwLibs = "-L" %X11_LIB " -L" %XMU_LIB " -lX11 -lXext -lXmu"; - @set %CSF_TclLibs = "-L/usr/tcltk/lib -rpath /usr/tcltk/lib -ltcl7.5i"; + @set %XMU_LIB = "/PRODUCTS/Xmu-R6"; + + @set %OPENGL_LIB = "/opt/graphics/OpenGL/lib"; + + --@string %CSF_XwLibs = "-L" %X11_LIB " -L" %XMU_LIB " -lX11 -lXext -lXmu"; + @string %CSF_XwLibs = "-L" %X11_LIB " -lX11 -lXext -L" %XMU_LIB " -lXmu"; + + @string %CSF_OpenGlLibs = "-L" %OPENGL_LIB " -lGLU -lGL "; + + --@set %CSF_TclLibs = "-L/usr/tcltk/lib/itcl -ltcl7.5i"; + @set %CSF_TclLibs = "-L/adv_53/hp/jr/tcltk/lib -ltcl"; + --@set %CSF_TclTkLibs = "-L/usr/tcltk/lib/itcl -ltk4.1i"; + @set %CSF_TclTkLibs = "-L/adv_53/hp/jr/tcltk/lib -ltk"; @endif; @if (%Station == "wnt") then @@ -108,6 +147,8 @@ @set %CSF_opengl32 = "opengl32.lib" ; @set %CSF_wsock32 = "wsock32.lib" ; + @set %CSF_TCL_INCLUDE = "D:/DevTools/TclTk/include "; + @set %X11_LIB = ""; @string %CSF_XwLibs = ""; @@ -123,11 +164,13 @@ @set %CSF_SOCKETLibs = " -ldl" ; + @set %CSF_TCL_INCLUDE = "/usr/include "; + @set %X11_LIB = "/usr/X11R6/lib"; @set %CSF_XwLibs = "-L/usr/X11R6/lib -lX11 -lXext -lXmu -lMesaGL -lMesaGLU -lglut -lXi"; @set %CSF_TclLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltcl8.0"; - @set %CSF_TclTkLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltk8.0 -L/usr/X11R6/lib -lX11 -lXext -lXmu -lMesaGL -lMesaGLU -lglut -lXi"; + @set %CSF_TclTkLibs = "-L/usr/lib -Xlinker -rpath -Xlinker /usr/lib -ltk8.0 -L/usr/X11R6/lib -lX11"; @endif; diff --git a/src/WOKBuilderDef/CSFDBSCHEMA.edl b/src/WOKBuilderDef/CSFDBSCHEMA.edl index 3d00c29..3fde876 100755 --- a/src/WOKBuilderDef/CSFDBSCHEMA.edl +++ b/src/WOKBuilderDef/CSFDBSCHEMA.edl @@ -6,14 +6,17 @@ @ifnotdefined ( %CSFDBSCHEMA_EDL) then @set %CSFDBSCHEMA_EDL = ""; -@set %CSFDBSCHEMA_Shared = "libCSFDBSchema.so"; +--@set %CSFDBSCHEMA_Shared = "libCSFDBSchema.so"; +@set %CSFDBSCHEMA_Shared = "libTKCSFDBSchema.so"; @if ( %Station == "hp" ) then - @set %CSFDBSCHEMA_Shared = "libCSFDBSchema.sl"; + --@set %CSFDBSCHEMA_Shared = "libCSFDBSchema.sl"; + @set %CSFDBSCHEMA_Shared = "libTKCSFDBSchema.sl"; @endif; @if ( %Station == "wnt" ) then - @set %CSFDBSCHEMA_Shared = "CSFDBSchema.dll"; + --@set %CSFDBSCHEMA_Shared = "CSFDBSchema.dll"; + @set %CSFDBSCHEMA_Shared = "TKCSFDBSchema.dll"; @endif; @set %CSFDBSCHEMA_Name = "CSFDBSchema"; diff --git a/src/WOKBuilderDef/JAVA.edl b/src/WOKBuilderDef/JAVA.edl index cc3cd10..d9cca42 100755 --- a/src/WOKBuilderDef/JAVA.edl +++ b/src/WOKBuilderDef/JAVA.edl @@ -1,20 +1,29 @@ -@ifnotdefined(%JAVA_EDL) then +@ifnotdefined ( %JAVA_EDL ) then + @set %JAVA_EDL = ""; -@set %JAVA_EDL = ""; + @if ( %Station == "sun" ) then + @set %JAVA_Home = "/PRODUCTS/java/jdk1.2"; + @else + @if ( %Station == "wnt" ) then + @set %JAVA_Home = "D:/jdk1.2.2"; + @endif; + @endif; -@set %JAVA_Home = "/PRODUCTS/java/jdk1.2"; -@string %JAVA_Command = %JAVA_Home "/bin/javac"; -@string %JAVA_HeaderCommand = %JAVA_Home "/bin/javah"; -@set %JAVA_Options = ""; -@set %JAVA_HeaderOptions = ""; + @string %JAVA_Command = %JAVA_Home "/bin/javac"; + @string %JAVA_HeaderCommand = %JAVA_Home "/bin/javah"; -@template JAVA_Compiler(%JAVA_Command,%JAVA_Options,%IncludeDir,%Source,%OutDir) is -$%JAVA_Command %JAVA_Options -classpath %IncludeDir -d %OutDir %Source -@end; - -@template JAVA_Header(%JAVA_HeaderCommand,%JAVA_HeaderOptions,%IncludeDir,%Class,%OutFile) is -$%JAVA_HeaderCommand %JAVA_HeaderOptions -classpath %IncludeDir -o %OutFile %Class -@end; + @set %JAVA_Options = ""; + @set %JAVA_HeaderOptions = ""; + @template JAVA_Compiler ( + %JAVA_Command, %JAVA_Options, %IncludeDir, %Source, %OutDir + ) is + $%JAVA_Command %JAVA_Options -classpath %IncludeDir -d %OutDir %Source\^ + @end; + @template JAVA_Header ( + %JAVA_HeaderCommand, %JAVA_HeaderOptions, %IncludeDir, %Class, %OutFile + ) is + $%JAVA_HeaderCommand %JAVA_HeaderOptions -classpath %IncludeDir -o %OutFile %Class\^ + @end; @endif; diff --git a/src/WOKBuilderDef/LD.edl b/src/WOKBuilderDef/LD.edl index 841015e..9f1ffd2 100755 --- a/src/WOKBuilderDef/LD.edl +++ b/src/WOKBuilderDef/LD.edl @@ -66,9 +66,10 @@ $ %ExternRef \ @if( %Station == "sun" ) then - @template LD_Footer ( ) is - $ -lC -lc ; - @end; + @template LD_Footer ( ) is + $ -lC -lc ; + $ ; + @end; @endif; @@ -92,10 +93,12 @@ $ %ExternRef \ @if( %Station == "sil" ) then @template LD_Footer ( %Station ) is - $-lm ; - $set stat = $status - $/usr/bin/rm -f so_locations - $set status = $stat + $-lm ; + $ set ld_status=$status; + $ /usr/bin/rm -f so_locations + $ if ( $?LD_LIBRARY_PATH ) then + $ set ld_library_path=$LD_LIBRARY_PATH + $ endif @end; @endif; @@ -106,6 +109,7 @@ $ %ExternRef \ @template LD_Footer ( %Station ) is $-L/lib -lm ; + $ ; @end; @endif; @@ -113,9 +117,9 @@ $ %ExternRef \ -- Definition du Linux @if ( %Station == "lin" ) then - @template LD_Footer ( %Station ) is - $ ; - @end; + @template LD_Footer ( %Station ) is + $ ; + @end; @endif; @endif; diff --git a/src/WOKBuilderDef/LDEXE.edl b/src/WOKBuilderDef/LDEXE.edl index 515bbe2..c124c15 100755 --- a/src/WOKBuilderDef/LDEXE.edl +++ b/src/WOKBuilderDef/LDEXE.edl @@ -52,7 +52,8 @@ $ /usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -call_shared -o %Target \ @if ( %Station == "hp" ) then @template LDEXE_Header ( %Target ) is - $/opt/aCC/bin/aCC -Wl,+FPZO -Wl,-E -o %Target \ + $/opt/aCC/bin/aCC -Wl,+FPZO -Wl,-E -Wl,+s -o %Target \ + $/opt/langtools/lib/end.o \ @end; @endif; diff --git a/src/WOKBuilderDef/LDSHR.edl b/src/WOKBuilderDef/LDSHR.edl index 944c094..a6d2c33 100755 --- a/src/WOKBuilderDef/LDSHR.edl +++ b/src/WOKBuilderDef/LDSHR.edl @@ -96,15 +96,22 @@ @set %LDSHR_ObjectRef = "LDSHR_ObjectRef"; @template LDSHR_Header ( %LDSHR_DBMSOpt, %LD_ObjList, %Target, %LogicalName ) is - $\mv %LD_ObjList %LD_ObjList.o - $/opt/aCC/bin/aCC %LDSHR_DBMSOpt -b -o %Target \ + $\cp %LD_ObjList %LD_ObjList.o + $/opt/aCC/bin/aCC %LDSHR_DBMSOpt -b -Wl,+s -Wl,+h%LogicalName -o %Target \ $-Wl,-c%LD_ObjList.o \ @end; @template LDSHR_Footer (%LD_ObjList) is $; $set lnk_status = $status - $\mv %LD_ObjList.o %LD_ObjList; + @end; + + @template LDSHR_CheckUndefHeader ( %Target, %LDSHR_DBMSOpt ) is + $/opt/aCC/bin/aCC -o /dev/null \ + @end; + + @template LDSHR_CheckUndefFooter () is + $ ; $set status = $lnk_status @end; diff --git a/src/WOKBuilderDef/LINKSHR.edl b/src/WOKBuilderDef/LINKSHR.edl index 9d4ae5d..5e95a51 100755 --- a/src/WOKBuilderDef/LINKSHR.edl +++ b/src/WOKBuilderDef/LINKSHR.edl @@ -3,9 +3,8 @@ -- History: Fri Feb 16 17:04:32 1996 Jean GAUTIER Creation -- Copyright: Matra Datavision 1996 ---@ifnotdefined ( %LINKSHR_EDL ) then +@ifnotdefined ( %LINKSHR_EDL ) then @set %LINKSHR_EDL = ""; - @cout "LinuxWOK_LINKSHR_EDL"; @ifnotdefined ( %LDSHR_EDL ) then @uses "LDSHR.edl"; @@ -56,7 +55,7 @@ @template LINKSHR_Footer () is $ -lC -lc ; - $ set ld_status=$status; + $ set ld_status=$status $ if ( $?LD_LIBRARY_PATH ) then $ set ld_library_path=$LD_LIBRARY_PATH $ endif @@ -70,17 +69,23 @@ $else $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH $endif - $/opt/DEV5_1/SUNWspro/bin/CC -xchip=ultra -xarch=v8 %LINKSHR_DBMSOpt -o /dev/null \ + $echo "Check of undefined symbols with LD_LIBRARY_PATH : $LD_LIBRARY_PATH" + $/usr/ccs/bin/ld -o /dev/null \ @end; @template LINKSHR_CheckUndefFooter () is $ ; - $ set status=$ld_status + $ 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; @@ -100,17 +105,44 @@ @end; @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList ) is - $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink -shared %LINKSHR_DBMSOpt -o %Target -soname %LogicalName \ + --$/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink -shared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \ + $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink -shared %LINKSHR_DBMSOpt -no_unresolved -o %Target -soname %LogicalName \ $ -all -objectlist %LD_ObjList -none \ @end; - @template LINKSHR_CheckUndefHeader ( %LINKSHR_DBMSOpt, %Target, %LogicalName, %LD_ObjList ) is - $/usr/bin/CC -n32 -mips3 -Wl,-mmap -multigot -no_prelink %LINKSHR_DBMSOpt -o /dev/null \ - $ -all -objectlist %LD_ObjList -none \ + @template LINKSHR_Footer ( %Station ) is + $-lm ; + $ set ld_status=$status + --$ /usr/bin/rm -f so_locations + --$ if ( $?LD_LIBRARY_PATH ) then + --$ set ld_library_path=$LD_LIBRARY_PATH + --$ endif + @end; + + @template LINKSHR_CheckUndefHeader ( %LD_LIBRARY_PATH ) 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 ..." + $/usr/bin/ld -n32 -mips3 -mmap -multigot -no_unresolved -o /dev/null \ @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; @@ -119,16 +151,47 @@ @set %LINKSHR_ObjectRef = "LINKSHR_ObjectRef"; @template LINKSHR_Header ( %LINKSHR_DBMSOpt, %Target, %LD_ObjList, %LogicalName ) is - $\mv %LD_ObjList %LD_ObjList.o - $/opt/aCC/bin/aCC %LINKSHR_DBMSOpt -b -o %Target \ + $\cp %LD_ObjList %LD_ObjList.o + --$/opt/aCC/bin/aCC %LINKSHR_DBMSOpt -b +Z -Wl,+s -Wl,+h%LogicalName -Wl,+vshlibunsats -v -o %Target \ + $/opt/aCC/bin/aCC %LINKSHR_DBMSOpt -b +Z -Wl,+s -Wl,+h%LogicalName -Wl,+vshlibunsats -o %Target \ + --$/opt/aCC/bin/aCC %LINKSHR_DBMSOpt -b -o %Target \ $-Wl,-c%LD_ObjList.o \ @end; - @template LINKSHR_Footer (%LD_ObjList) is + @template LINKSHR_Footer ( %Station ) is + $-L/usr/lib/aCC -ldld -L/usr/lib -lM -lstd -lCsup -lstream -lcl -lc -lm \ $; - $set lnk_status = $status - $\mv %LD_ObjList.o %LD_ObjList; - $set status = $lnk_status + $ set ld_status=${status} + --$ if ( $?SHLIB_PATH ) then + --$ set ld_library_path="${SHLIB_PATH}" + --$ endif + @end; + + @template LINKSHR_CheckUndefHeader ( %LD_LIBRARY_PATH ) is + --$if ( $?SHLIB_PATH ) then + --$ setenv SHLIB_PATH "%LD_LIBRARY_PATH:${SHLIB_PATH}" + --$else + --$ setenv SHLIB_PATH "%LD_LIBRARY_PATH" + --$endif + $echo "Check of undefined symbols with SHLIB_PATH : ${SHLIB_PATH}" + $echo "Does not run on HP : -Wl,+vshlibunsats gives always __shlinit undefined and does not give an error status ..." + $/opt/aCC/bin/aCC -b -Wl,+s -Wl,+vshlibunsats -o /dev/null \ + @end; + + @template LINKSHR_CheckUndefFooter () is + $ ; + --$ if ( ${status} ) then + --$ echo "Check failed" + --$ else + --$ echo "Check successed" + --$ endif + --$ if ( $?ld_library_path ) then + --$ setenv SHLIB_PATH "${ld_library_path}" + --$ else + --$ unsetenv SHLIB_PATH + --$ endif + $ set status=$ld_status + $ @end; @template LINKSHR_ObjectRef () is @@ -150,7 +213,7 @@ @template LINKSHR_Footer () is $ -lc; - $ set ld_status=$status; + $ set ld_status=$status $ if ( $?LD_LIBRARY_PATH ) then $ set ld_library_path=$LD_LIBRARY_PATH $ endif @@ -164,18 +227,24 @@ $else $ setenv LD_LIBRARY_PATH %LD_LIBRARY_PATH $endif - $/usr/bin/ld -nostartfiles %LINKSHR_DBMSOpt -o /dev/null \ + $echo "Check of undefined symbols with LD_LIBRARY_PATH : $LD_LIBRARY_PATH" + $/usr/bin/ld -nostartfiles -o /dev/null \ @end; @template LINKSHR_CheckUndefFooter () is - $ ; - $ set status=$ld_status; - $ if ( $?ld_library_path ) then - $ setenv LD_LIBRARY_PATH $ld_library_path - $ else - $ unsetenv LD_LIBRARY_PATH - $ endif + $ ; + $ 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; +@endif; diff --git a/src/WOKBuilderDef/TCPP.edl b/src/WOKBuilderDef/TCPP.edl index 495130a..1a368bd 100755 --- a/src/WOKBuilderDef/TCPP.edl +++ b/src/WOKBuilderDef/TCPP.edl @@ -9,15 +9,18 @@ @if ( %Station != "wnt" ) then @if ( %LocalArch != "hp" ) then - @set %TCPP_Shared = "libTCPPExt.so"; + --@set %TCPP_Shared = "libTCPPExt.so"; + @set %TCPP_Shared = "libTKTCPPExt.so"; @endif; @if ( %LocalArch == "hp" ) then - @set %TCPP_Shared = "libTCPPExt.sl"; + --@set %TCPP_Shared = "libTCPPExt.sl"; + @set %TCPP_Shared = "libTKTCPPExt.sl"; @endif; @else - @set %TCPP_Shared = "TCPPExt.dll"; + --@set %TCPP_Shared = "TCPPExt.dll"; + @set %TCPP_Shared = "TKTCPPExt.dll"; @endif; -- 2.39.5