From: cas Date: Fri, 9 Jun 2000 14:13:48 +0000 (+0000) Subject: No comments X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=dcd10eb3598658ae5bc10eff11454ad2645dfd28;p=occt-wok.git No comments --- diff --git a/src/WOKStepsDef/WOKSteps_engine.edl b/src/WOKStepsDef/WOKSteps_engine.edl index f25b04d..fb7ccd8 100755 --- a/src/WOKStepsDef/WOKSteps_engine.edl +++ b/src/WOKStepsDef/WOKSteps_engine.edl @@ -22,15 +22,9 @@ @set %WOKSteps_ExecGroup = " exec.dat exec.list exec.tks exec.link exec.ld "; --- @ifnotdefined ( %WOKSteps_LinkShr ) then - @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_exec_list = "*WOKStep_DirectLinkList(obj.comp,obj.idep)"; --- @set %WOKSteps_exec_tks = "*WOKStep_DirectTKReplace(exec.list)"; --- @set %WOKSteps_exec_link = "*WOKStep_LibLink(exec.tks)"; --- @endif; + @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_engine_LinksWith = " "; diff --git a/src/WOKStepsDef/WOKSteps_engine_wnt.edl b/src/WOKStepsDef/WOKSteps_engine_wnt.edl index 338a848..4b0f3a7 100755 --- a/src/WOKStepsDef/WOKSteps_engine_wnt.edl +++ b/src/WOKStepsDef/WOKSteps_engine_wnt.edl @@ -1,9 +1,9 @@ - - -@ifnotdefined ( %WOKSteps_engine_wnt_EDL) then -@set %WOKSteps_engine_wnt_EDL = ""; - - @set %WOKSteps_exec_link = "WOKStep_DLLink(exec.tks)"; - -@endif; - + + +@ifnotdefined ( %WOKSteps_engine_wnt_EDL) then +@set %WOKSteps_engine_wnt_EDL = ""; + + @set %WOKSteps_exec_link = "WOKStep_DLLink(exec.tks)"; + +@endif; + diff --git a/src/WOKStepsDef/WOKSteps_executable.edl b/src/WOKStepsDef/WOKSteps_executable.edl index fdf3f0e..37de149 100755 --- a/src/WOKStepsDef/WOKSteps_executable.edl +++ b/src/WOKStepsDef/WOKSteps_executable.edl @@ -19,19 +19,11 @@ @set %WOKSteps_ExecGroup = "exec.libs exec.tks exec.link"; --- @ifnotdefined ( %WOKSteps_LinkShr ) then - - @set %WOKSteps_exec_libs = "#WOKStep_TransitiveLinkList(src,src.list,exec.comp,exec.idep)"; - @set %WOKSteps_exec_tks = "#*WOKStep_TransitiveTKReplace(exec.libs)"; - --- @else --- --- @set %WOKSteps_exec_libs = "#WOKStep_DirectLinkList(src,src.list,exec.comp,exec.idep)"; --- @set %WOKSteps_exec_tks = "#WOKStep_DirectTKReplace(exec.libs)"; --- --- @endif; - - @set %WOKSteps_exec_link = "#WOKStep_ExecLink(exec.tks)"; + @set %WOKSteps_exec_libs = "#WOKStep_TransitiveLinkList(src,src.list,exec.comp,exec.idep)"; + @set %WOKSteps_exec_tks = "#*WOKStep_TransitiveTKReplace(exec.libs)"; + + + @set %WOKSteps_exec_link = "#WOKStep_ExecLink(exec.tks)"; @set %WOKSteps_delivery_cdl_list_steps = "src"; @set %WOKSteps_delivery_cdl_list_extensions = ".cdl"; diff --git a/src/WOKStepsDef/WOKSteps_interface.edl b/src/WOKStepsDef/WOKSteps_interface.edl index e109b93..0ffe788 100755 --- a/src/WOKStepsDef/WOKSteps_interface.edl +++ b/src/WOKStepsDef/WOKSteps_interface.edl @@ -22,15 +22,9 @@ @set %WOKSteps_ExecGroup = " exec.list exec.tks exec.link "; --- @ifnotdefined ( %WOKSteps_LinkShr ) then - @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_exec_list = "*WOKStep_DirectLinkList(obj.comp,obj.idep)"; --- @set %WOKSteps_exec_tks = "*WOKStep_DirectTKReplace(exec.list)"; --- @set %WOKSteps_exec_link = "*WOKStep_LibLink(exec.tks)"; --- @endif; + @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_interface_LinksWith = ""; diff --git a/src/WOKStepsDef/WOKSteps_nocdlpack.edl b/src/WOKStepsDef/WOKSteps_nocdlpack.edl index 00e857d..c472db8 100755 --- a/src/WOKStepsDef/WOKSteps_nocdlpack.edl +++ b/src/WOKStepsDef/WOKSteps_nocdlpack.edl @@ -21,28 +21,30 @@ @set %WOKSteps_DepGroup = "obj.idep"; @set %WOKSteps_obj_idep = "WOKStep_ImplementationDep(obj.comp,src)"; - @string %WOKSteps_LibGroup = " obj.lib "; + --@string %WOKSteps_LibGroup = " obj.lib "; @set %WOKSteps_obj_lib = "WOKStep_DynamicLibrary(obj.comp,src)"; - @set %WOKSteps_nocdlpack_LinksWith = " obj.lib "; + --@set %WOKSteps_nocdlpack_LinksWith = " obj.lib "; @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_jini_LinksWith = " obj.lib "; @set %WOKSteps_toolkit_LinksWith = " obj.lib "; - @set %WOKSteps_schema_LinksWith = " obj.lib "; + --@set %WOKSteps_schema_LinksWith = " obj.lib "; @set %WOKSteps_toolkit_ListWith = " obj.comp "; @set %WOKSteps_delivery_inc_list_steps = "src obj.inc"; @set %WOKSteps_delivery_inc_list_extensions = ".hxx .lxx .h .INC .inc"; - @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"; + @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 += " obj.implib"; + @string %WOKSteps_delivery_lib_shared_list_steps += ""; @else @set %WOKSteps_delivery_lib_shared_list_extensions = ".so .ImplDep"; @endif; diff --git a/src/WOKStepsDef/WOKSteps_nocdlpack_wnt.edl b/src/WOKStepsDef/WOKSteps_nocdlpack_wnt.edl index f77d7f4..2a39ab5 100755 --- a/src/WOKStepsDef/WOKSteps_nocdlpack_wnt.edl +++ b/src/WOKStepsDef/WOKSteps_nocdlpack_wnt.edl @@ -1,30 +1,20 @@ --- File: WOKSteps_nocdlpack_wnt.edl --- Author: Jean GAUTIER --- History: Tue Sep 2 17:32:29 1997 Jean GAUTIER Creation --- Copyright: Matra Datavision 1997 +@ifnotdefined ( %WOKSteps_nocdlpack_wnt_EDL ) then + @set %WOKSteps_nocdlpack_wnt_EDL = ""; -@ifnotdefined ( %WOKSteps_nocdlpack_wnt_EDL) then -@set %WOKSteps_nocdlpack_wnt_EDL = ""; +-- @string %WOKSteps_DepGroup += " obj.implib "; + @set %WOKSteps_obj_implib = "WOKStep_ImportLibrary(obj.comp)"; +-- @set %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.libs)"; + @set %WOKSteps_obj_lib = "WOKStep_DLLink(obj.tks,obj.implib,src)"; -@string %WOKSteps_DepGroup += " obj.implib "; -@set %WOKSteps_obj_implib = "WOKStep_ImportLibrary(obj.comp)"; - -@set %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.libs)"; - ---- on ajoute src pour les .res -@set %WOKSteps_obj_lib = "WOKStep_DLLink(obj.tks,obj.implib,src)"; - -@set %WOKSteps_toolkit_LinksWith = " obj.implib "; -@set %WOKSteps_package_LinksWith = " obj.implib "; -@set %WOKSteps_nocdlpack_LinksWith = " obj.implib "; -@set %WOKSteps_engine_LinksWith = " obj.implib "; -@set %WOKSteps_interface_LinksWith = " obj.implib "; -@set %WOKSteps_executable_LinksWith = " obj.implib "; - ---- on ajoute src pour les .res -@set %WOKSteps_toolkit_ListWith = " obj.comp obj.idep src "; + @set %WOKSteps_toolkit_LinksWith = " obj.implib "; + @set %WOKSteps_package_LinksWith = " obj.implib "; + @set %WOKSteps_nocdlpack_LinksWith = " obj.implib "; + @set %WOKSteps_engine_LinksWith = " obj.implib "; + @set %WOKSteps_interface_LinksWith = " obj.implib "; + @set %WOKSteps_executable_LinksWith = " obj.implib "; + @set %WOKSteps_toolkit_ListWith = " obj.comp obj.idep src "; @endif; diff --git a/src/WOKStepsDef/WOKSteps_package_wnt.edl b/src/WOKStepsDef/WOKSteps_package_wnt.edl index 53f1e93..6216046 100755 --- a/src/WOKStepsDef/WOKSteps_package_wnt.edl +++ b/src/WOKStepsDef/WOKSteps_package_wnt.edl @@ -1,30 +1,22 @@ --- File: WOKSteps_package_wnt.edl --- Author: Jean GAUTIER --- History: Tue Sep 2 17:43:04 1997 Jean GAUTIER Creation --- Copyright: Matra Datavision 1997 - -@ifnotdefined ( %WOKSteps_package_wnt_EDL) then -@set %WOKSteps_package_wnt_EDL = ""; - -@string %WOKSteps_DepGroup += " obj.implib "; -@set %WOKSteps_obj_implib = "WOKStep_ImportLibrary(obj.comp)"; - -@set %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.libs)"; -@set %WOKSteps_obj_lib = "WOKStep_DLLink(obj.tks,obj.implib)"; - -@set %WOKSteps_toolkit_LinksWith = " obj.implib "; -@set %WOKSteps_package_LinksWith = " obj.implib "; -@set %WOKSteps_nocdlpack_LinksWith = " obj.implib "; -@set %WOKSteps_engine_LinksWith = " obj.implib "; -@set %WOKSteps_interface_LinksWith = " obj.implib "; -@set %WOKSteps_executable_LinksWith = " obj.implib "; -@set %WOKSteps_schema_LinksWith = " obj.implib "; - ---- on ajoute src pour les .res -@set %WOKSteps_toolkit_ListWith = " obj.comp obj.idep src "; - - +@ifnotdefined ( %WOKSteps_package_wnt_EDL ) then + @set %WOKSteps_package_wnt_EDL = ""; + +-- @string %WOKSteps_DepGroup += " obj.implib "; + @set %WOKSteps_obj_implib = "WOKStep_ImportLibrary(obj.comp)"; + +-- @set %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.libs)"; + @set %WOKSteps_obj_lib = "WOKStep_DLLink(obj.tks,obj.implib)"; + + @set %WOKSteps_toolkit_LinksWith = " obj.implib "; + @set %WOKSteps_package_LinksWith = " obj.implib "; + @set %WOKSteps_nocdlpack_LinksWith = " obj.implib "; + @set %WOKSteps_engine_LinksWith = " obj.implib "; + @set %WOKSteps_interface_LinksWith = " obj.implib "; + @set %WOKSteps_executable_LinksWith = " obj.implib "; + @set %WOKSteps_schema_LinksWith = " obj.implib "; + @set %WOKSteps_jini_LinksWith = " obj.implib "; + @set %WOKSteps_toolkit_ListWith = " obj.comp obj.idep src "; @endif; diff --git a/src/WOKStepsDef/WOKSteps_schema_DFLT.edl b/src/WOKStepsDef/WOKSteps_schema_DFLT.edl index f0b0b78..97677e0 100755 --- a/src/WOKStepsDef/WOKSteps_schema_DFLT.edl +++ b/src/WOKStepsDef/WOKSteps_schema_DFLT.edl @@ -21,7 +21,8 @@ @string %WOKSteps_DepGroup += " obj.implib "; @set %WOKSteps_obj_implib = "WOKStep_ImportLibrary(obj.comp)"; - @set %WOKSteps_LibGroup = " obj.libs obj.tks obj.lib"; + --@set %WOKSteps_LibGroup = " obj.libs obj.tks obj.lib"; + @set %WOKSteps_LibGroup = " obj.libs obj.tks"; @set %WOKSteps_obj_libs = "*WOKStep_DirectLinkList(obj.comp,obj.idep)"; @set %WOKSteps_obj_tks = "WOKStep_DirectTKReplace(obj.libs)";