From 4ff584188e21bb53431af8eadc0e86f61cbb7497 Mon Sep 17 00:00:00 2001
From: cas <cas@opencascade.com>
Date: Tue, 10 Jul 2001 15:27:28 +0000
Subject: [PATCH] No comments

---
 src/WOKStep/WOKStep_JavaCompile.tcl | 14 +++++---------
 src/WOKStep/WOKStep_TclLibIdep.tcl  |  9 ++++-----
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/WOKStep/WOKStep_JavaCompile.tcl b/src/WOKStep/WOKStep_JavaCompile.tcl
index a79ff52..ce35bb3 100755
--- a/src/WOKStep/WOKStep_JavaCompile.tcl
+++ b/src/WOKStep/WOKStep_JavaCompile.tcl
@@ -42,15 +42,12 @@ proc WOKStep_JavaCompile:ComputeIncludeDir { unit } {
  set result ""
     
  set themax [llength $allwb]
-    
  for { set i $themax } { [expr $i != 0] } { incr i -1 } {
-
   set awb [lindex $allwb [expr $i - 1]]
-
   if { $fJava } {
-   set addinc [UNC [wokparam -e WOKEntity_javadir ${awb}]]
+   set addinc [wokparam -e WOKEntity_javadir ${awb}]
   } else {
-   set addinc [UNC [wokparam -e WOKEntity_drvdir ${awb}]]
+   set addinc [wokparam -e WOKEntity_drvdir ${awb}]
   }
 
   set result ${addinc}$ps$result
@@ -79,9 +76,9 @@ proc WOKStep_JavaCompile:Execute { theunit args } {
  wokparam -s%IncludeDir=$incdir
 
  if { $fJava } {
-  set outdir [UNC [wokparam -e WOKEntity_javadir [wokinfo -w]]]
+  set outdir [wokUtils:EASY:stobs2 [wokparam -e WOKEntity_javadir [wokinfo -w]]]
  } else {
-  set outdir [UNC [wokparam -e WOKEntity_drvdir [wokinfo -w]]]
+  set outdir [wokUtils:EASY:stobs2 [[wokparam -e WOKEntity_drvdir [wokinfo -w]]]
  }
 
  wokparam -s%OutDir=$outdir
@@ -89,7 +86,7 @@ proc WOKStep_JavaCompile:Execute { theunit args } {
  foreach ID $args {
 
   scan $ID "%\[^:\]:%\[^:\]:%\[^:\]"  unit type name
-  set infile [UNC [woklocate -p $ID]]
+  set infile [wokUtils:EASY:stobs2 [woklocate -p $ID]]
 
   if { $tcl_platform(platform) == "windows" } {
    regsub -all "/" $infile "\\\\\\" infile
@@ -103,7 +100,6 @@ proc WOKStep_JavaCompile:Execute { theunit args } {
   msgprint -i -c "WOKStep_JavaCompile:Execute" "Compiling $name"
 
   if { [catch {eval exec [lindex $thecommand 0]} res] } {
-
    msgprint -e -c "WOKStep_JavaCompile:Execute" $res
    set failed 1
 
diff --git a/src/WOKStep/WOKStep_TclLibIdep.tcl b/src/WOKStep/WOKStep_TclLibIdep.tcl
index 14090ae..9f65143 100755
--- a/src/WOKStep/WOKStep_TclLibIdep.tcl
+++ b/src/WOKStep/WOKStep_TclLibIdep.tcl
@@ -23,7 +23,6 @@ proc WOKStep_TclLibIdep:HandleInputFile { ID } {
 proc WOKStep_TclLibIdep:Execute { unit args } {
 
     msgprint -i -c "WOKStep_TclLibIdep:Execute" "Build ImplDep"
-
     set unitname [wokinfo -n $unit]
 
     set file [lindex $args 0]
@@ -34,7 +33,7 @@ proc WOKStep_TclLibIdep:Execute { unit args } {
 	msgprint -e -c "WOKStep_TclLibIdep:Execute" "Could not locate PACKAGES for unit $unit"
 	return 1;
     } else {
-	for_file anud $packfile {
+	foreach  anud [wokUtils:FILES:FileToList $packfile] {
 	    set curud [string trim $anud]
 	    if {$curud != ""} {	
 		set alluds($curud) 1
@@ -42,7 +41,7 @@ proc WOKStep_TclLibIdep:Execute { unit args } {
 		if {[string length $impin] == 0} {
 		    msgprint -i "No ImplDep file for unit $curud"
 		} else {
-		    for_file adep $impin {
+		     foreach adep [wokUtils:FILES:FileToList $impin] {
 			set curud [string trim $adep]
 			set alluds($curud) 1
 		    }
@@ -50,7 +49,7 @@ proc WOKStep_TclLibIdep:Execute { unit args } {
 	    }
 	}
 # remove PACKAGES content from ImplDep
-	for_file anud $packfile {
+	foreach anud [wokUtils:FILES:FileToList $packfile] {
 	    set curud [string trim $anud]
 	    if {$curud != ""} {	
 		unset alluds($curud)
@@ -58,7 +57,7 @@ proc WOKStep_TclLibIdep:Execute { unit args } {
 	}
 	set impfile [wokinfo -p stadmfile:${unitname}.ImplDep $unit]
 	set impid [open $impfile "w"]
-	for_array_keys anud alluds {
+	foreach anud [array names alluds *] {
 	    puts $impid $anud
         }
 	close $impid
-- 
2.39.5