From: cascade <cascade@opencascade.com>
Date: Fri, 23 Jun 2006 21:48:50 +0000 (+0000)
Subject: OCC12619 The extraction on Windows fails. tcl resources
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=daf1fe089a2d46cea955045a32e126f4fc5686c8;p=occt-wok.git

OCC12619 The extraction on Windows fails. tcl resources
---

diff --git a/src/WOKsite/CreateFactory.tcl b/src/WOKsite/CreateFactory.tcl
index 50d4f69..f88cbfd 100755
--- a/src/WOKsite/CreateFactory.tcl
+++ b/src/WOKsite/CreateFactory.tcl
@@ -147,7 +147,7 @@ proc CreateFactory { HOME_ENTITIES FNAM WSNAM WBNAM IMPORT_DIR } {
 
 set CASHOME [file dirname $env(CASROOT)/.]
 
-CreateFactory $env(WOK_ROOTADMDIR) OS OCC51 ros $CASHOME
+CreateFactory [file normalize $env(WOK_ROOTADMDIR)] OS OCC51 ros [file normalize $CASHOME]
 puts "WOK initialization was done"
 exit
 
diff --git a/src/WOKsite/tclshrc_Wok b/src/WOKsite/tclshrc_Wok
index ae95b07..aa22b96 100755
--- a/src/WOKsite/tclshrc_Wok
+++ b/src/WOKsite/tclshrc_Wok
@@ -105,7 +105,7 @@ set woksite          [file join $env(WOKHOME) site]
 ;# Where the files ATLIST , DEFAULT.edl and SESSION.edl reside
 ;#
 if {![info exists env(WOK_ROOTADMDIR)] } { 
-    set env(WOK_ROOTADMDIR) $env(WOKHOME)/wok_entities
+    set env(WOK_ROOTADMDIR) [file normalize $env(WOKHOME)/wok_entities]
     if ![file exists $env(WOK_ROOTADMDIR)] {
 	if [file writable $env(WOKHOME)] {
 	    puts stderr "Creating directory $env(WOK_ROOTADMDIR) for wok entities..."
@@ -137,7 +137,7 @@ if {![info exists env(WOK_ROOTADMDIR)] } {
 ;#
 if ![file exists  [set woksession [file join $env(WOK_ROOTADMDIR) WOKSESSION.edl]]] {
     set str1 [wokUtils:FILES:FileToString [file join $woksite WOKSESSION.edl]]
-    regsub -all -- {TOSUBSTITUTE} "$str1" "$env(WOK_ROOTADMDIR)" result1
+    regsub -all -- {TOSUBSTITUTE} "$str1" "[file normalize $env(WOK_ROOTADMDIR)]" result1
     wokUtils:FILES:StringToFile $result1 $woksession
     if [file exists $woksession] {
 	puts stderr "File $woksession has been created. "
@@ -148,7 +148,7 @@ if ![file exists  [set woksession [file join $env(WOK_ROOTADMDIR) WOKSESSION.edl
 ;#
 if ![file exists [set default [file join $env(WOK_ROOTADMDIR) DEFAULT.edl]]] {
     set str2 [wokUtils:FILES:FileToString [file join $woksite DEFAULT.edl]]
-    regsub -all -- {/dp_xx} "$str2" "$env(WOK_ROOTADMDIR)" result2
+    regsub -all -- {/dp_xx} "$str2" "[file normalize $env(WOK_ROOTADMDIR)]" result2
     wokUtils:FILES:StringToFile $result2 $default
     if [file exists $default] {
 	puts stderr "File $default has been created. "