OCC16602 Fix rollback - compilation errors on WNT

diff --git a/src/WOKsite/DEFAULT.edl b/src/WOKsite/DEFAULT.edl
index c265a20116011233efac2005e5cb358b07e08f41..410a20f204804d23c0cb0e16bf0ec47e1a5a3e9c 100755 (executable)
--- a/src/WOKsite/DEFAULT.edl
+++ b/src/WOKsite/DEFAULT.edl
@@ -17,7 +17,7 @@ $BAG\^
 @end;
 
 @template DEFAULT_Stations ( %Entity ) is
-$sun sil lin hp aix wnt mac bsd\^
+$sun sil lin hp aix wnt\^
 @end;
 
 @template DEFAULT_DBMSystems ( %Entity ) is
@@ -64,14 +64,6 @@ $%Entity_Home\^
 $%Entity_Home\^
 @end;
 
-@template DEFAULT_DFLT_mac  ( %Entity_Home ) is
-$%Entity_Home\^
-@end;
-
-@template DEFAULT_DFLT_bsd  ( %Entity_Home ) is
-$%Entity_Home\^
-@end;
-
 @template DEFAULT_WOKVersion ( %WOK_VERSION ) is
 $%WOK_VERSION\^
 @end;

diff --git a/src/WOKsite/tclshrc_Wok b/src/WOKsite/tclshrc_Wok
index 998483937472c0d182682077565b3e4a4c8c80c1..aa22b96e4158a0b8f2783ff1d6d19fc8d37e522a 100755 (executable)
--- a/src/WOKsite/tclshrc_Wok
+++ b/src/WOKsite/tclshrc_Wok
@@ -43,18 +43,9 @@
 ;#
 global env tcl_platform
 
-if { "$tcl_platform(platform)" == "unix" } {
-    if { "$tcl_platform(os)" == "HP-UX" } {
-       set ldpathvar SHLIB_PATH
-    } elseif { "$tcl_platform(os)" == "Darwin" } {
-       set ldpathvar DYLD_LIBRARY_PATH
-    } else {
-       set ldpathvar LD_LIBRARY_PATH
-    }
-    if { ![info exists env($ldpathvar)] } {
-        puts stderr "You must set $ldpathvar to point where you have installed Wok"
-        exit
-    }
+if { "$tcl_platform(platform)" == "unix" && ![info exists env(LD_LIBRARY_PATH)] } {
+    puts stderr "You must set LD_LIBRARY_PATH to point where you have installed Wok"
+    exit
 }
 
 if { "$tcl_platform(platform)" == "windows" && ![info exists env(Path)] } {
@@ -67,10 +58,9 @@ if [info exists wm] {
 if { "$tcl_platform(platform)" == "unix" } {
     set sprtor ":"
     set fmtshr "lib%s.so"
-    set wrk [split $env($ldpathvar) $sprtor]
-    if { $tcl_platform(os) == "HP-UX"  } { set fmtshr "lib%s.sl" }
-    if { $tcl_platform(os) == "Darwin" } { set fmtshr "lib%s.dylib" }
-    set msgnotfound "Please check your variable $ldpathvar"
+    set wrk [split $env(LD_LIBRARY_PATH) $sprtor]
+    if { $tcl_platform(os) == "HP-UX" } { set fmtshr "lib%s.sl" }
+    set msgnotfound "Please check your variable LD_LIBRARY_PATH"
 } 
 if { "$tcl_platform(platform)" == "windows" } {
     set sprtor ";"

diff --git a/src/WOKsite/wok.csh b/src/WOKsite/wok.csh
index a3578079ab9434443010c3e74ca11b75f5bbb391..4d537201f53d2dd3b45a696eb9d2bdb0f0081d82 100755 (executable)
--- a/src/WOKsite/wok.csh
+++ b/src/WOKsite/wok.csh
@@ -68,17 +68,6 @@ switch ( `uname` )
        setenv TCLLIBPATH "${TCLLIB}/itcl ${TCLLIB} ${WOKHOME}/lib ${WOKHOME}/lib/${WOKSTATION}"
        setenv TRAP_FPE "UNDERFL=FLUSH_ZERO;OVERFL=DEFAULT;DIVZERO=DEFAULT;INT_OVERFL=DEFAULT"
        breaksw
-    case HP-UX:
-        setenv WOKSTATION "hp"
-       setenv SHLIB_PATH "${TCLLIB}:${WOKHOME}/lib/${WOKSTATION}:${SHLIB_PATH}:"
-        breaksw
-    case Darwin:
-        setenv WOKSTATION "mac"
-       setenv DYLD_LIBRARY_PATH "${TCLLIB}:${WOKHOME}/lib/${WOKSTATION}:${DYLD_LIBRARY_PATH}:"
-        breaksw
-    case FreeBSD:
-        setenv WOKSTATION "bsd"
-        breaksw
     default:
        echo "Error : unknown platform"
        breaksw

diff --git a/src/WOKsite/wokinit.csh b/src/WOKsite/wokinit.csh
index 15fe872c625a829be0be9a27005dd2043e57a9c7..86a5a5120a7bdfc9bca2561f3c44d58be137b2c7 100755 (executable)
--- a/src/WOKsite/wokinit.csh
+++ b/src/WOKsite/wokinit.csh
@@ -7,12 +7,6 @@ if ( $OS_NAME == "SunOS" ) then
    set OS_PLATFORM="sun"
 else if ( $OS_NAME == "Linux" ) then
    set OS_PLATFORM="lin"
-else if ( $OS_NAME == "HP-UX" ) then
-   set OS_PLATFORM="hp"
-else if ( $OS_NAME == "Darwin" ) then
-   set OS_PLATFORM="mac"
-else if ( $OS_NAME == "FreeBSD" ) then
-   set OS_PLATFORM="bsd"
 endif
 
 setenv WOKHOME ${CASROOT}/../wok