From a457f9a00921bb8f96cece9bac8fc16918c21c14 Mon Sep 17 00:00:00 2001 From: cas Date: Tue, 11 Jul 2000 18:15:51 +0000 Subject: [PATCH] No comments --- src/WOKStepsDef/WOKSteps_jini.edl | 25 +++++++++++++++---------- src/WOKStepsDef/WOKSteps_schema.edl | 25 ++++++++++++------------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/src/WOKStepsDef/WOKSteps_jini.edl b/src/WOKStepsDef/WOKSteps_jini.edl index 04fde6f..92e06e4 100755 --- a/src/WOKStepsDef/WOKSteps_jini.edl +++ b/src/WOKStepsDef/WOKSteps_jini.edl @@ -1,5 +1,3 @@ - - @ifnotdefined (%WOKSteps_jini_EDL) then @set %WOKSteps_jini_EDL = ""; @@ -22,13 +20,20 @@ @set %WOKSteps_DepGroup = "obj.idep"; @set %WOKSteps_obj_idep = "WOKStep_ImplementationDep(obj.comp)"; - @set %WOKSteps_ExecGroup = " exec.list exec.tks exec.link "; - - @set %WOKSteps_exec_list = "*WOKStep_TransitiveLinkList(obj.comp,obj.idep)"; - @set %WOKSteps_exec_tks = "*WOKStep_TransitiveTKReplace(exec.list)"; - @set %WOKSteps_exec_link = "*WOKStep_LibLink(exec.tks)"; - - @set %WOKSteps_jini_LinksWith = ""; + @if ( %Station != "wnt" ) then + @set %WOKSteps_ExecGroup = " exec.list exec.tks exec.link "; + @set %WOKSteps_exec_list = "*WOKStep_TransitiveLinkList(obj.comp,obj.idep)"; + @set %WOKSteps_exec_tks = "*WOKStep_TransitiveTKReplace(exec.list)"; + @set %WOKSteps_exec_link = "*WOKStep_LibLink(exec.tks)"; + @else + @set %WOKSteps_ExecGroup = " exec.jlib exec.list exec.tks exec.link "; + @set %WOKSteps_exec_jlib = "WOKStep_JLibAdd(obj.idep)"; + @set %WOKSteps_exec_list = "*WOKStep_DirectLinkList(obj.comp,obj.idep)"; + @set %WOKSteps_exec_tks = "*WOKStep_DirectTKReplace(exec.list)"; + @set %WOKSteps_exec_link = "*WOKStep_DLLink(exec.jlib,exec.tks)"; + @endif; + + @set %WOKSteps_jini_LinksWith = ""; + @set %WOKSteps_toolkit_ListWith = " obj.comp obj.idep "; @endif; - diff --git a/src/WOKStepsDef/WOKSteps_schema.edl b/src/WOKStepsDef/WOKSteps_schema.edl index ad64c91..2daf730 100755 --- a/src/WOKStepsDef/WOKSteps_schema.edl +++ b/src/WOKStepsDef/WOKSteps_schema.edl @@ -19,31 +19,30 @@ @set %WOKSteps_DepGroup = " obj.idep "; @set %WOKSteps_obj_idep = "WOKStep_ImplementationDep(obj.comp)"; --- @ifnotdefined ( %WOKSteps_LinkShr ) then - @string %WOKSteps_LibGroup = " obj.lib "; + --@string %WOKSteps_LibGroup = " obj.lib "; + @string %WOKSteps_LibGroup = ""; @set %WOKSteps_obj_lib = "WOKStep_DynamicLibrary(obj.comp,src)"; --- @else --- @string %WOKSteps_LibGroup = " obj.libs obj.tks obj.lib "; --- --- @set %WOKSteps_obj_libs = "WOKStep_DirectLinkList(obj.comp,obj.idep)"; --- @set %WOKSteps_obj_tks = "WOKStep_DirectTKReplace(obj.list)"; --- @set %WOKSteps_obj_lib = "WOKStep_LibLink(obj.tks)"; --- @endif; @set %WOKSteps_executable_LinksWith = " obj.lib "; - @set %WOKSteps_engine_LinksWith = " obj.lib "; - @set %WOKSteps_interface_LinksWith = " obj.lib "; - @set %WOKSteps_jini_LinksWith = " obj.lib "; + --@set %WOKSteps_engine_LinksWith = " obj.lib "; + @set %WOKSteps_engine_LinksWith = ""; + --@set %WOKSteps_interface_LinksWith = " obj.lib "; + @set %WOKSteps_interface_LinksWith = ""; + --@set %WOKSteps_jini_LinksWith = " obj.lib "; + @set %WOKSteps_jini_LinksWith = ""; @set %WOKSteps_toolkit_LinksWith = " obj.lib "; + @set %WOKSteps_toolkit_ListWith = " obj.comp "; + @set %WOKSteps_delivery_cdl_list_steps = "src"; @set %WOKSteps_delivery_cdl_list_extensions = ".cdl"; @set %WOKSteps_delivery_inc_list_steps = "xcpp.sch"; @set %WOKSteps_delivery_inc_list_types = "pubinclude"; - @set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep obj.lib"; + --@set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep obj.lib"; + @set %WOKSteps_delivery_lib_shared_list_steps ="obj.idep"; @if (%Station == "hp") then @set %WOKSteps_delivery_lib_shared_list_extensions = ".sl .ImplDep"; @else -- 2.39.5