No comments

diff --git a/src/WOKStepsDef/FILES b/src/WOKStepsDef/FILES
index cdcb056f18b7f87427fbd47ac94a7168d99e70b6..ded2ae3233789c2b0ee85cb723d1e64e48a4d6d4 100755 (executable)
--- 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 29fd566beb8c6aca8f3d35f7acbc167cea3a3866..c10176ec1eaa665b125ee34470092ec629760e92 100755 (executable)
--- 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 8e2e5f5e1530d143877bb2e11ea3ae57d3d1e902..ed92d7ef00d1d38910e6898b986c0c884bb43df9 100755 (executable)
--- 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 f5ab5879cdd2b8877b11ab81449bb547c1e47cf8..00e857df7c3ca172ae1474af6be905d2c6e01f4f 100755 (executable)
--- 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 3f16b58c7e1daa20a1e546d70a5cf794d4f81652..2724888ddd11cb8f0c40e0315cdd5ffb6be42a1a 100755 (executable)
--- 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 b18454a781225c7bd503265d3dbae47bf0968807..ad64c91ee3cf6d69232d5fbe0164740cb9a6ef6c 100755 (executable)
--- 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 fbf88bfc809d7fc6635b6c4421128489ba6833b3..496c7cbc382c5652fb604dcfb99ca7c13c10d473 100755 (executable)
--- 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";