OCC16602 Fix rollback - compilation errors on WNT

diff --git a/src/WOKStepsDef/WOKStepsDFLT.edl b/src/WOKStepsDef/WOKStepsDFLT.edl
index 01d5d30a6d592eff709fc771eb95728ba888cc08..0a99215ec03babc2007f3342353f112d0cb49c4f 100755 (executable)
--- a/src/WOKStepsDef/WOKStepsDFLT.edl
+++ b/src/WOKStepsDef/WOKStepsDFLT.edl
@@ -6,18 +6,16 @@
 @ifnotdefined ( %WOKStepsDFLT_EDL) then
 @set %WOKStepsDFLT_EDL = "";
 
-@set %WOKStepsDFLT_LibPath = "libwokdfltsteps.so";
+@if ( %Station != "wnt" ) then
+@if ( %LocalArch != "hp" ) then
+  @set %WOKStepsDFLT_LibPath = "libwokdfltsteps.so";
+@endif;
 
 @if ( %LocalArch == "hp" ) then
   @set %WOKStepsDFLT_LibPath = "libwokdfltsteps.sl";
 @endif;
-
-@if ( %LocalArch == "mac" ) then
-  @set %WOKStepsDFLT_LibPath = "libwokdfltsteps.dylib";
-@endif;
-
-@if ( %LocalArch == "wnt" ) then
-  @set %WOKStepsDFLT_LibPath = "wokdfltsteps.dll";
+@else
+       @set %WOKStepsDFLT_LibPath = "wokdfltsteps.dll";
 @endif;
 
 @set %WOKStepsDFLT_DefinedSteps = " WOKDFLT_DFLTExtract ";

diff --git a/src/WOKStepsDef/WOKStepsDeliv.edl b/src/WOKStepsDef/WOKStepsDeliv.edl
index 9572513570a00f4d390d29ca72e76bf893ab35a7..0b16a787b81c3eb1f86b8e5b71cd526f1ccc759d 100755 (executable)
--- a/src/WOKStepsDef/WOKStepsDeliv.edl
+++ b/src/WOKStepsDef/WOKStepsDeliv.edl
@@ -6,19 +6,17 @@
 @ifnotdefined ( %WOKStepsDeliv_EDL) then
 @set %WOKStepsDeliv_EDL = "";
 
-  @set    %WOKStepsDeliv_LibPath      = "libwokdeliverysteps.so";
-
-  @if ( %LocalArch == "hp" ) then
-    @set  %WOKStepsDeliv_LibPath      = "libwokdeliverysteps.sl";
-  @endif;
-
-  @if ( %LocalArch == "mac" ) then
-    @set  %WOKStepsDeliv_LibPath      = "libwokdeliverysteps.dylib";
+@if ( %Station != "wnt" ) then
+  @if ( %LocalArch != "hp" ) then
+    @set    %WOKStepsDeliv_LibPath      = "libwokdeliverysteps.so";
   @endif;
 
-  @if ( %Station == "wnt" ) then
-    @set  %WOKStepsDeliv_LibPath      = "wokdeliverysteps.dll";
+  @if ( %LocalArch == "hp" ) then
+    @set    %WOKStepsDeliv_LibPath      = "libwokdeliverysteps.sl";
   @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 c5d91a285e172828b391ba803249f27826f61879..eaf8435a59c24e6a61090b35eb4e303ebe7bfde9 100755 (executable)
--- a/src/WOKStepsDef/WOKStepsOBJS.edl
+++ b/src/WOKStepsDef/WOKStepsOBJS.edl
@@ -6,18 +6,16 @@
 @ifnotdefined ( %WOKStepsOBJS_EDL) then
 @set %WOKStepsOBJS_EDL = "";
 
-@set %WOKStepsOBJS_LibPath = "libwokobjssteps.so";
+@if ( %Station != "wnt" ) then
+@if ( %LocalArch != "hp" ) then
+  @set %WOKStepsOBJS_LibPath = "libwokobjssteps.so";
+@endif;
 
 @if ( %LocalArch == "hp" ) then
   @set %WOKStepsOBJS_LibPath = "libwokobjssteps.sl";
 @endif;
-
-@if ( %LocalArch == "mac" ) then
-  @set %WOKStepsOBJS_LibPath = "libwokobjssteps.dylib";
-@endif;
-
-@if ( %LocalArch == "wnt" ) then
-  @set %WOKStepsOBJS_LibPath = "wokobjssteps.dll";
+@else
+       @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 dfa304ad222fa7e284cf7d0e0b053e1372e8f897..389d1d80927f5e95b3c76dc48eb8af127bb56d83 100755 (executable)
--- a/src/WOKStepsDef/WOKStepsOBJY.edl
+++ b/src/WOKStepsDef/WOKStepsOBJY.edl
@@ -6,18 +6,16 @@
 @ifnotdefined ( %WOKStepsOBJY_EDL) then
 @set %WOKStepsOBJY_EDL = "";
 
-@set %WOKStepsOBJY_LibPath = "libwokobjysteps.so";
+@if ( %Station != "wnt" ) then
+@if ( %LocalArch != "hp" ) then
+  @set %WOKStepsOBJY_LibPath = "libwokobjysteps.so";
+@endif;
 
 @if ( %LocalArch == "hp" ) then
   @set %WOKStepsOBJY_LibPath = "libwokobjysteps.sl";
 @endif;
-
-@if ( %LocalArch == "mac" ) then
-  @set %WOKStepsOBJY_LibPath = "libwokobjysteps.dylib";
-@endif;
-
-@if ( %LocalArch == "wnt" ) then
-  @set %WOKStepsOBJY_LibPath = "wokobjysteps.dll";
+@else
+       @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 bc85b170d723aec3346a9077b534390defb122ca..c861981cf01c8c3ff116a8809dcb02be507dbe37 100755 (executable)
--- a/src/WOKStepsDef/WOKStepsOrbix.edl
+++ b/src/WOKStepsDef/WOKStepsOrbix.edl
@@ -7,18 +7,20 @@
 @set %WOKStepsOrbix_EDL = "";
 
 
-@set %WOKStepsOrbix_LibPath = "libwokorbixsteps.so";
+@if ( %Station != "wnt" ) then
 
-@if ( %LocalArch == "hp" ) then
-  @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.sl";
-@endif;
+  @if ( %LocalArch != "hp" ) then
+    @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.so";
+  @endif;
 
-@if ( %LocalArch == "mac" ) then
-  @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.dylib";
-@endif;
+  @if ( %LocalArch == "hp" ) then
+    @set %WOKStepsOrbix_LibPath = "libwokorbixsteps.sl";
+  @endif;
+
+@else
 
-@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 6a084cf0766d45e0bd6b29c07078b81759b43613..c10176ec1eaa665b125ee34470092ec629760e92 100755 (executable)
--- a/src/WOKStepsDef/WOKStepsStep.edl
+++ b/src/WOKStepsDef/WOKStepsStep.edl
@@ -7,15 +7,14 @@
 @ifnotdefined ( %WOKStepsStep_EDL) then
 @set %WOKStepsStep_EDL = "";
 
-  @set    %WOKStepsStep_LibPath      = "libwoksteps.so";
+  @if ( %LocalArch != "hp" ) then
+    @set    %WOKStepsStep_LibPath      = "libwoksteps.so";
+  @endif;
 
   @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 fdd99d974f990c7a58d341b9e10778e9d75d1819..ed92d7ef00d1d38910e6898b986c0c884bb43df9 100755 (executable)
--- a/src/WOKStepsDef/WOKSteps_client.edl
+++ b/src/WOKStepsDef/WOKSteps_client.edl
@@ -37,16 +37,15 @@
   @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";
-  @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";
+  @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;
   @endif;
 
 @endif;

diff --git a/src/WOKStepsDef/WOKSteps_interface.edl b/src/WOKStepsDef/WOKSteps_interface.edl
index b36571c20f74cbc699e32351cb8fe55eb38adb38..0ffe78802b36db79b7ab89b217d42d4452ae754f 100755 (executable)
--- a/src/WOKStepsDef/WOKSteps_interface.edl
+++ b/src/WOKStepsDef/WOKSteps_interface.edl
@@ -31,15 +31,14 @@
 
   @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";
-  @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";
+  @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;
   @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 44757144377d6a573a39030583dd17125a8be33d..c472db801e51e96b09247fb990a96da758432346 100755 (executable)
--- 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";
-  @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";
+  @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;
 
 @endif;

diff --git a/src/WOKStepsDef/WOKSteps_package.edl b/src/WOKStepsDef/WOKSteps_package.edl
index 0e862695dca6b0f8330875974671679c94237329..dd7af7eb266e6afed7a6684f9c3092743d3ed07d 100755 (executable)
--- a/src/WOKStepsDef/WOKSteps_package.edl
+++ b/src/WOKStepsDef/WOKSteps_package.edl
@@ -47,16 +47,15 @@
 
   --@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";
-  @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";
+  @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;
 
 @endif;

diff --git a/src/WOKStepsDef/WOKSteps_schema.edl b/src/WOKStepsDef/WOKSteps_schema.edl
index 06702cc3c2b09b9473dbf13a2023151330a4f43d..2a1e60295c03d9240821868b44e828751f92f46b 100755 (executable)
--- a/src/WOKStepsDef/WOKSteps_schema.edl
+++ b/src/WOKStepsDef/WOKSteps_schema.edl
@@ -42,16 +42,15 @@
 
   --@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";
-  @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 ";
+  @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;
 
 @endif;

diff --git a/src/WOKStepsDef/WOKSteps_toolkit.edl b/src/WOKStepsDef/WOKSteps_toolkit.edl
index b9e3bf017402c2c9e57941e1befee2ec0a3ec35b..8881b19b124d2d686ccae2676c31d780118f18aa 100755 (executable)
--- a/src/WOKStepsDef/WOKSteps_toolkit.edl
+++ b/src/WOKStepsDef/WOKSteps_toolkit.edl
@@ -116,51 +116,16 @@
 
   @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 ";
@@ -192,16 +157,15 @@
   @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";
-  @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";
+  @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;
 
 @endif;