From 13152af779fda6691964e9626106b8b9fe44ff2b Mon Sep 17 00:00:00 2001 From: cascade Date: Fri, 10 Aug 2007 18:01:59 +0000 Subject: [PATCH] OCC16602 [OCC Forum] Integration of code porting to MacOSX by Torsten Sadowski --- src/WOKStepsDef/WOKStepsDFLT.edl | 14 +++--- src/WOKStepsDef/WOKStepsDeliv.edl | 18 ++++---- src/WOKStepsDef/WOKStepsOBJS.edl | 14 +++--- src/WOKStepsDef/WOKStepsOBJY.edl | 14 +++--- src/WOKStepsDef/WOKStepsOrbix.edl | 18 ++++---- src/WOKStepsDef/WOKStepsStep.edl | 7 +-- src/WOKStepsDef/WOKSteps_client.edl | 17 +++---- src/WOKStepsDef/WOKSteps_interface.edl | 15 ++++--- src/WOKStepsDef/WOKSteps_nocdlpack.edl | 16 +++---- src/WOKStepsDef/WOKSteps_package.edl | 15 ++++--- src/WOKStepsDef/WOKSteps_schema.edl | 17 +++---- src/WOKStepsDef/WOKSteps_toolkit.edl | 62 ++++++++++++++++++++------ 12 files changed, 137 insertions(+), 90 deletions(-) diff --git a/src/WOKStepsDef/WOKStepsDFLT.edl b/src/WOKStepsDef/WOKStepsDFLT.edl index 0a99215..01d5d30 100755 --- a/src/WOKStepsDef/WOKStepsDFLT.edl +++ b/src/WOKStepsDef/WOKStepsDFLT.edl @@ -6,16 +6,18 @@ @ifnotdefined ( %WOKStepsDFLT_EDL) then @set %WOKStepsDFLT_EDL = ""; -@if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - @set %WOKStepsDFLT_LibPath = "libwokdfltsteps.so"; -@endif; +@set %WOKStepsDFLT_LibPath = "libwokdfltsteps.so"; @if ( %LocalArch == "hp" ) then @set %WOKStepsDFLT_LibPath = "libwokdfltsteps.sl"; @endif; -@else - @set %WOKStepsDFLT_LibPath = "wokdfltsteps.dll"; + +@if ( %LocalArch == "mac" ) then + @set %WOKStepsDFLT_LibPath = "libwokdfltsteps.dylib"; +@endif; + +@if ( %LocalArch == "wnt" ) then + @set %WOKStepsDFLT_LibPath = "wokdfltsteps.dll"; @endif; @set %WOKStepsDFLT_DefinedSteps = " WOKDFLT_DFLTExtract "; diff --git a/src/WOKStepsDef/WOKStepsDeliv.edl b/src/WOKStepsDef/WOKStepsDeliv.edl index 0b16a78..9572513 100755 --- a/src/WOKStepsDef/WOKStepsDeliv.edl +++ b/src/WOKStepsDef/WOKStepsDeliv.edl @@ -6,17 +6,19 @@ @ifnotdefined ( %WOKStepsDeliv_EDL) then @set %WOKStepsDeliv_EDL = ""; -@if ( %Station != "wnt" ) then - @if ( %LocalArch != "hp" ) then - @set %WOKStepsDeliv_LibPath = "libwokdeliverysteps.so"; - @endif; + @set %WOKStepsDeliv_LibPath = "libwokdeliverysteps.so"; @if ( %LocalArch == "hp" ) then - @set %WOKStepsDeliv_LibPath = "libwokdeliverysteps.sl"; + @set %WOKStepsDeliv_LibPath = "libwokdeliverysteps.sl"; + @endif; + + @if ( %LocalArch == "mac" ) then + @set %WOKStepsDeliv_LibPath = "libwokdeliverysteps.dylib"; + @endif; + + @if ( %Station == "wnt" ) then + @set %WOKStepsDeliv_LibPath = "wokdeliverysteps.dll"; @endif; -@else - @set %WOKStepsDeliv_LibPath = "wokdeliverysteps.dll"; -@endif; @set %WOKStepsDeliv_DefinedSteps = " WOKDeliv_DeliverySource "; @string %WOKStepsDeliv_DefinedSteps += "WOKDeliv_DeliveryBase "; diff --git a/src/WOKStepsDef/WOKStepsOBJS.edl b/src/WOKStepsDef/WOKStepsOBJS.edl index eaf8435..c5d91a2 100755 --- a/src/WOKStepsDef/WOKStepsOBJS.edl +++ b/src/WOKStepsDef/WOKStepsOBJS.edl @@ -6,16 +6,18 @@ @ifnotdefined ( %WOKStepsOBJS_EDL) then @set %WOKStepsOBJS_EDL = ""; -@if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - @set %WOKStepsOBJS_LibPath = "libwokobjssteps.so"; -@endif; +@set %WOKStepsOBJS_LibPath = "libwokobjssteps.so"; @if ( %LocalArch == "hp" ) then @set %WOKStepsOBJS_LibPath = "libwokobjssteps.sl"; @endif; -@else - @set %WOKStepsOBJS_LibPath = "wokobjssteps.dll"; + +@if ( %LocalArch == "mac" ) then + @set %WOKStepsOBJS_LibPath = "libwokobjssteps.dylib"; +@endif; + +@if ( %LocalArch == "wnt" ) then + @set %WOKStepsOBJS_LibPath = "wokobjssteps.dll"; @endif; @set %WOKStepsOBJS_DefinedSteps = " WOKOBJS_SchExtract WOKOBJS_SchGen WOKOBJS_EngLinkList "; diff --git a/src/WOKStepsDef/WOKStepsOBJY.edl b/src/WOKStepsDef/WOKStepsOBJY.edl index 389d1d8..dfa304a 100755 --- a/src/WOKStepsDef/WOKStepsOBJY.edl +++ b/src/WOKStepsDef/WOKStepsOBJY.edl @@ -6,16 +6,18 @@ @ifnotdefined ( %WOKStepsOBJY_EDL) then @set %WOKStepsOBJY_EDL = ""; -@if ( %Station != "wnt" ) then -@if ( %LocalArch != "hp" ) then - @set %WOKStepsOBJY_LibPath = "libwokobjysteps.so"; -@endif; +@set %WOKStepsOBJY_LibPath = "libwokobjysteps.so"; @if ( %LocalArch == "hp" ) then @set %WOKStepsOBJY_LibPath = "libwokobjysteps.sl"; @endif; -@else - @set %WOKStepsOBJY_LibPath = "wokobjysteps.dll"; + +@if ( %LocalArch == "mac" ) then + @set %WOKStepsOBJY_LibPath = "libwokobjysteps.dylib"; +@endif; + +@if ( %LocalArch == "wnt" ) then + @set %WOKStepsOBJY_LibPath = "wokobjysteps.dll"; @endif; @set %WOKStepsOBJY_DefinedSteps = " WOKOBJY_SchDDLList WOKOBJY_DDLStep "; diff --git a/src/WOKStepsDef/WOKStepsOrbix.edl b/src/WOKStepsDef/WOKStepsOrbix.edl index c861981..bc85b17 100755 --- a/src/WOKStepsDef/WOKStepsOrbix.edl +++ b/src/WOKStepsDef/WOKStepsOrbix.edl @@ -7,20 +7,18 @@ @set %WOKStepsOrbix_EDL = ""; -@if ( %Station != "wnt" ) then +@set %WOKStepsOrbix_LibPath = "libwokorbixsteps.so"; - @if ( %LocalArch != "hp" ) then - @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.so"; - @endif; - - @if ( %LocalArch == "hp" ) then - @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.sl"; - @endif; +@if ( %LocalArch == "hp" ) then + @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.sl"; +@endif; -@else +@if ( %LocalArch == "mac" ) then + @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.dylib"; +@endif; +@if ( %LocalArch == "wnt" ) then @set %WOKStepsOrbix_LibPath = "wokorbixsteps.dll"; - @endif; @set %WOKStepsOrbix_DefinedSteps = " WOKOrbix_IDLSource WOKOrbix_IDLSourceExtract WOKOrbix_IDLCompile WOKOrbix_IDLFill "; diff --git a/src/WOKStepsDef/WOKStepsStep.edl b/src/WOKStepsDef/WOKStepsStep.edl index c10176e..6a084cf 100755 --- a/src/WOKStepsDef/WOKStepsStep.edl +++ b/src/WOKStepsDef/WOKStepsStep.edl @@ -7,14 +7,15 @@ @ifnotdefined ( %WOKStepsStep_EDL) then @set %WOKStepsStep_EDL = ""; - @if ( %LocalArch != "hp" ) then - @set %WOKStepsStep_LibPath = "libwoksteps.so"; - @endif; + @set %WOKStepsStep_LibPath = "libwoksteps.so"; @if ( %LocalArch == "hp" ) then @set %WOKStepsStep_LibPath = "libwoksteps.sl"; @endif; + @if ( %LocalArch == "mac" ) then + @set %WOKStepsStep_LibPath = "libwoksteps.dylib"; + @endif; @set %WOKStepsStep_DefinedSteps = " WOKStep_Source WOKStep_CDLUnitSource "; @string %WOKStepsStep_DefinedSteps += " WOKStep_ExecutableSource WOKStep_ResourceSource "; diff --git a/src/WOKStepsDef/WOKSteps_client.edl b/src/WOKStepsDef/WOKSteps_client.edl index ed92d7e..fdd99d9 100755 --- a/src/WOKStepsDef/WOKSteps_client.edl +++ b/src/WOKStepsDef/WOKSteps_client.edl @@ -37,15 +37,16 @@ @set %WOKSteps_delivery_inc_list_extensions = ".hxx"; @set %WOKSteps_delivery_lib_client_list_steps ="obj.idep obj.lib"; + @set %WOKSteps_delivery_lib_client_list_extensions = ".so .ImplDep"; @if (%Station == "hp") then - @set %WOKSteps_delivery_lib_client_list_extensions = ".sl .ImplDep"; - @else - @if (%Station == "wnt") then - @set %WOKSteps_delivery_lib_client_list_extensions = ".DLL .LIB .PDB .ImplDep"; - @string %WOKSteps_delivery_lib_client_list_steps +=" obj.implib"; - @else - @set %WOKSteps_delivery_lib_client_list_extensions = ".so .ImplDep"; - @endif; + @set %WOKSteps_delivery_lib_client_list_extensions = ".sl .ImplDep"; + @endif; + @if (%Station == "mac") then + @set %WOKSteps_delivery_lib_client_list_extensions = ".dylib .ImplDep"; + @endif; + @if (%Station == "wnt") then + @set %WOKSteps_delivery_lib_client_list_extensions = ".DLL .LIB .PDB .ImplDep"; + @string %WOKSteps_delivery_lib_client_list_steps +=" obj.implib"; @endif; @endif; diff --git a/src/WOKStepsDef/WOKSteps_interface.edl b/src/WOKStepsDef/WOKSteps_interface.edl index 0ffe788..b36571c 100755 --- a/src/WOKStepsDef/WOKSteps_interface.edl +++ b/src/WOKStepsDef/WOKSteps_interface.edl @@ -31,14 +31,15 @@ @set %WOKSteps_delivery_cdl_list_steps = "src"; @set %WOKSteps_delivery_cdl_list_extensions = ".cdl"; + @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .so .dat"; @if (%Station == "hp") then - @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .sl .dat"; - @else - @if (%Station == "wnt") then - @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .DLL .PDB .dat"; - @else - @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .so .dat"; - @endif; + @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .sl .dat"; + @endif; + @if (%Station == "mac") then + @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .dylib .dat"; + @endif; + @if (%Station == "wnt") then + @set %WOKSteps_delivery_lib_server_list_extensions = ".ImplDep .DLL .PDB .dat"; @endif; @set %WOKSteps_delivery_lib_server_list_steps = "xcpp.server exec.link"; diff --git a/src/WOKStepsDef/WOKSteps_nocdlpack.edl b/src/WOKStepsDef/WOKSteps_nocdlpack.edl index c472db8..4475714 100755 --- a/src/WOKStepsDef/WOKSteps_nocdlpack.edl +++ b/src/WOKStepsDef/WOKSteps_nocdlpack.edl @@ -38,16 +38,16 @@ --@set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep obj.lib"; @set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep"; + @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; @if (%Station == "hp") then @set %WOKSteps_delivery_lib_shared_list_extensions = ".sl .ImplDep"; - @else - @if (%Station == "wnt") then - @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .PDB .LIB .ImplDep"; - --@string %WOKSteps_delivery_lib_shared_list_steps += " obj.implib"; - @string %WOKSteps_delivery_lib_shared_list_steps += ""; - @else - @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; - @endif; + @endif; + @if (%Station == "mac") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".dylib .ImplDep"; + @endif; + @if (%Station == "wnt") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .PDB .LIB .ImplDep"; +-- @string %WOKSteps_delivery_lib_shared_list_steps += " obj.implib"; @endif; @endif; diff --git a/src/WOKStepsDef/WOKSteps_package.edl b/src/WOKStepsDef/WOKSteps_package.edl index dd7af7e..0e86269 100755 --- a/src/WOKStepsDef/WOKSteps_package.edl +++ b/src/WOKStepsDef/WOKSteps_package.edl @@ -47,15 +47,16 @@ --@set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep obj.lib"; @set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep"; + @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; @if (%Station == "hp") then @set %WOKSteps_delivery_lib_shared_list_extensions = ".sl .ImplDep"; - @else - @if (%Station == "wnt") then - @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .LIB .PDB .ImplDep"; - @string %WOKSteps_delivery_lib_shared_list_steps +=" obj.implib"; - @else - @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; - @endif; + @endif; + @if (%Station == "mac") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".dylib .ImplDep"; + @endif; + @if (%Station == "wnt") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .LIB .PDB .ImplDep"; + @string %WOKSteps_delivery_lib_shared_list_steps +=" obj.implib"; @endif; @endif; diff --git a/src/WOKStepsDef/WOKSteps_schema.edl b/src/WOKStepsDef/WOKSteps_schema.edl index 2a1e602..06702cc 100755 --- a/src/WOKStepsDef/WOKSteps_schema.edl +++ b/src/WOKStepsDef/WOKSteps_schema.edl @@ -42,15 +42,16 @@ --@set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep obj.lib"; @set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep"; + @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; @if (%Station == "hp") then - @set %WOKSteps_delivery_lib_shared_list_extensions = ".sl .ImplDep"; - @else - @if (%Station == "wnt") then - @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .LIB .PDB .ImplDep"; - @string %WOKSteps_delivery_lib_shared_list_steps += " obj.implib "; - @else - @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; - @endif; + @set %WOKSteps_delivery_lib_shared_list_extensions = ".sl .ImplDep"; + @endif; + @if (%Station == "mac") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".dylib .ImplDep"; + @endif; + @if (%Station == "wnt") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .LIB .PDB .ImplDep"; + @string %WOKSteps_delivery_lib_shared_list_steps += " obj.implib "; @endif; @endif; diff --git a/src/WOKStepsDef/WOKSteps_toolkit.edl b/src/WOKStepsDef/WOKSteps_toolkit.edl index 8881b19..b9e3bf0 100755 --- a/src/WOKStepsDef/WOKSteps_toolkit.edl +++ b/src/WOKStepsDef/WOKSteps_toolkit.edl @@ -116,16 +116,51 @@ @endif; + @if ( %Station == "mac" ) then + @string %WOKSteps_LibGroup += " lib.arx "; + @set %WOKSteps_lib_build = "WOKStep_DynamicLibrary(lib.list,lib.arx)"; + + @ifnotdefined ( %WOKSteps_LinkShr ) then + @string %WOKSteps_LibGroup += " lib.build "; + @set %WOKSteps_lib_build = "WOKStep_DynamicLibrary(lib.list,lib.arx)"; + @else + @string %WOKSteps_LibGroup += " lib.libs "; + @string %WOKSteps_LibGroup += " lib.tks "; + @string %WOKSteps_LibGroup += " lib.build "; + @set %WOKSteps_lib_libs = "WOKStep_DirectLinkList(obj.idep,lib.list,lib.arx)"; + @set %WOKSteps_lib_tks = "*WOKStep_DirectTKReplace(lib.libs)"; + @set %WOKSteps_lib_build = "WOKStep_LibLink(lib.tks)"; + @endif; + + @endif; + + @if ( %Station == "bsd" ) then + @string %WOKSteps_LibGroup += " lib.arx "; + @set %WOKSteps_lib_build = "WOKStep_DynamicLibrary(lib.list,lib.arx)"; + + @ifnotdefined ( %WOKSteps_LinkShr ) then + @string %WOKSteps_LibGroup += " lib.build "; + @set %WOKSteps_lib_build = "WOKStep_DynamicLibrary(lib.list,lib.arx)"; + @else + @string %WOKSteps_LibGroup += " lib.libs "; + @string %WOKSteps_LibGroup += " lib.tks "; + @string %WOKSteps_LibGroup += " lib.build "; + @set %WOKSteps_lib_libs = "WOKStep_DirectLinkList(obj.idep,lib.list,lib.arx)"; + @set %WOKSteps_lib_tks = "*WOKStep_DirectTKReplace(lib.libs)"; + @set %WOKSteps_lib_build = "WOKStep_LibLink(lib.tks)"; + @endif; + @endif; + @if ( %Station == "aix" ) then - @string %WOKSteps_LibGroup += " lib.limit "; - @string %WOKSteps_LibGroup += " lib.arch "; + @string %WOKSteps_LibGroup += " lib.limit "; + @string %WOKSteps_LibGroup += " lib.arch "; - @set %WOKSteps_lib_limit = "WOKStep_LibLimit(lib.list)"; - @set %WOKSteps_lib_arch = "WOKStep_ArchiveLibrary(lib.limit)"; + @set %WOKSteps_lib_limit = "WOKStep_LibLimit(lib.list)"; + @set %WOKSteps_lib_arch = "WOKStep_ArchiveLibrary(lib.limit)"; - @string %WOKSteps_LibGroup += " lib.arx "; - @set %WOKSteps_lib_build = "WOKStep_DynamicLibrary(lib.arch)"; + @string %WOKSteps_LibGroup += " lib.arx "; + @set %WOKSteps_lib_build = "WOKStep_DynamicLibrary(lib.arch)"; @ifnotdefined ( %WOKSteps_LinkShr ) then @string %WOKSteps_LibGroup += " lib.build "; @@ -157,15 +192,16 @@ @set %WOKSteps_IsOrdered = "Yes"; @set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep lib.build"; + @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; @if (%Station == "hp") then @set %WOKSteps_delivery_lib_shared_list_extensions = ".ImplDep .sl"; - @else - @if (%Station == "wnt") then - @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .LIB .PDB .ImplDep"; - @string %WOKSteps_delivery_lib_shared_list_steps += " obj.implib"; - @else - @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; - @endif; + @endif; + @if (%Station == "mac") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".ImplDep .dylib"; + @endif; + @if (%Station == "wnt") then + @set %WOKSteps_delivery_lib_shared_list_extensions = ".DLL .LIB .PDB .ImplDep"; + @string %WOKSteps_delivery_lib_shared_list_steps += " obj.implib"; @endif; @endif; -- 2.39.5