From ffec9646c47325670056030604d46e25e884c870 Mon Sep 17 00:00:00 2001 From: cas Date: Fri, 5 Nov 1999 18:28:10 +0000 Subject: [PATCH] No comments --- src/WOKStepsDef/FILES | 1 + src/WOKStepsDef/WOKStepsStep.edl | 1 + src/WOKStepsDef/WOKSteps_client.edl | 1 + src/WOKStepsDef/WOKSteps_nocdlpack.edl | 1 + src/WOKStepsDef/WOKSteps_package.edl | 1 + src/WOKStepsDef/WOKSteps_schema.edl | 1 + src/WOKStepsDef/WOKSteps_toolkit.edl | 19 +------------------ 7 files changed, 7 insertions(+), 18 deletions(-) diff --git a/src/WOKStepsDef/FILES b/src/WOKStepsDef/FILES index cdcb056..ded2ae3 100755 --- a/src/WOKStepsDef/FILES +++ b/src/WOKStepsDef/FILES @@ -32,4 +32,5 @@ srcinc:::WOKSteps_schema_OBJY.edl srcinc:::WOKSteps_server.edl srcinc:::WOKSteps_toolkit.edl srcinc:::WOKSteps_toolkit_wnt.edl +srcinc:::WOKSteps_jini.edl srcinc:::FRONTAL.edl diff --git a/src/WOKStepsDef/WOKStepsStep.edl b/src/WOKStepsDef/WOKStepsStep.edl index 29fd566..c10176e 100755 --- a/src/WOKStepsDef/WOKStepsStep.edl +++ b/src/WOKStepsDef/WOKStepsStep.edl @@ -23,6 +23,7 @@ @string %WOKStepsStep_DefinedSteps += " WOKStep_Include WOKStep_HeaderExtract "; @string %WOKStepsStep_DefinedSteps += " WOKStep_ServerExtract WOKStep_EngineExtract "; @string %WOKStepsStep_DefinedSteps += " WOKStep_ClientExtract WOKStep_SourceExtract "; + @string %WOKStepsStep_DefinedSteps += " WOKStep_JiniExtract "; @string %WOKStepsStep_DefinedSteps += " WOKStep_CodeGenerate WOKStep_TemplateExtract "; @string %WOKStepsStep_DefinedSteps += " WOKStep_ExtractExecList "; @string %WOKStepsStep_DefinedSteps += " WOKStep_Compile "; diff --git a/src/WOKStepsDef/WOKSteps_client.edl b/src/WOKStepsDef/WOKSteps_client.edl index 8e2e5f5..ed92d7e 100755 --- a/src/WOKStepsDef/WOKSteps_client.edl +++ b/src/WOKStepsDef/WOKSteps_client.edl @@ -27,6 +27,7 @@ @set %WOKSteps_toolkit_LinksWith = " obj.lib "; @set %WOKSteps_engine_LinksWith = " obj.lib "; @set %WOKSteps_interface_LinksWith = " obj.lib "; + @set %WOKSteps_jini_LinksWith = " obj.lib "; @set %WOKSteps_toolkit_ListsWith = " obj.comp "; diff --git a/src/WOKStepsDef/WOKSteps_nocdlpack.edl b/src/WOKStepsDef/WOKSteps_nocdlpack.edl index f5ab587..00e857d 100755 --- a/src/WOKStepsDef/WOKSteps_nocdlpack.edl +++ b/src/WOKStepsDef/WOKSteps_nocdlpack.edl @@ -28,6 +28,7 @@ @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_toolkit_LinksWith = " obj.lib "; @set %WOKSteps_schema_LinksWith = " obj.lib "; diff --git a/src/WOKStepsDef/WOKSteps_package.edl b/src/WOKStepsDef/WOKSteps_package.edl index 3f16b58..2724888 100755 --- a/src/WOKStepsDef/WOKSteps_package.edl +++ b/src/WOKStepsDef/WOKSteps_package.edl @@ -33,6 +33,7 @@ @set %WOKSteps_package_LinksWith = " obj.lib "; @set %WOKSteps_engine_LinksWith = " obj.lib "; @set %WOKSteps_interface_LinksWith = " obj.lib "; + @set %WOKSteps_jini_LinksWith = " obj.lib "; @set %WOKSteps_toolkit_LinksWith = " obj.lib "; @set %WOKSteps_schema_LinksWith = " obj.lib "; diff --git a/src/WOKStepsDef/WOKSteps_schema.edl b/src/WOKStepsDef/WOKSteps_schema.edl index b18454a..ad64c91 100755 --- a/src/WOKStepsDef/WOKSteps_schema.edl +++ b/src/WOKStepsDef/WOKSteps_schema.edl @@ -34,6 +34,7 @@ @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_toolkit_LinksWith = " obj.lib "; diff --git a/src/WOKStepsDef/WOKSteps_toolkit.edl b/src/WOKStepsDef/WOKSteps_toolkit.edl index fbf88bf..496c7cb 100755 --- a/src/WOKStepsDef/WOKSteps_toolkit.edl +++ b/src/WOKStepsDef/WOKSteps_toolkit.edl @@ -99,24 +99,6 @@ @endif; @endif; - @if ( %Station == "lin" ) 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; - @set %WOKSteps_lib_limit = "WOKStep_LibLimit(lib.list)"; @set %WOKSteps_lib_arch = "WOKStep_ArchiveLibrary(lib.limit)"; @set %WOKSteps_lib_uncomp = "WOKStep_LibUnCompress(lib.list)"; @@ -126,6 +108,7 @@ @set %WOKSteps_executable_LinksWith = " lib.build "; @set %WOKSteps_engine_LinksWith = " lib.build "; @set %WOKSteps_interface_LinksWith = " lib.build "; + @set %WOKSteps_jini_LinksWith = " lib.build "; @set %WOKSteps_IsOrdered = "Yes"; -- 2.39.5