No comments

diff --git a/src/WOKStep/WOKStep_JavaCompile.tcl b/src/WOKStep/WOKStep_JavaCompile.tcl
index ce35bb347ba14d3263f558a10fea4fa4004dce39..4e620347a7f7b01127fcb516846ce488855376d5 100755 (executable)
--- a/src/WOKStep/WOKStep_JavaCompile.tcl
+++ b/src/WOKStep/WOKStep_JavaCompile.tcl
@@ -65,7 +65,7 @@ proc WOKStep_JavaCompile:Execute { theunit args } {
  global env
  global tcl_platform
     
- msgprint -i -c "WOKStep_JavaCompile:Execute" "Processing unit : $theunit"
+ msgprint -i -c "WOKStep_JavaCompile:Execute" "Processing JavaCompile unit   : $theunit"
  msgprint -i -c "WOKStep_JavaCompile:Execute"
     
  set fJava [info exists env(WOK_USE_JAVA_DIRECTORY)]
@@ -74,15 +74,13 @@ proc WOKStep_JavaCompile:Execute { theunit args } {
  set failed 0
  set incdir [WOKStep_JavaCompile:ComputeIncludeDir $theunit]
  wokparam -s%IncludeDir=$incdir
-
  if { $fJava } {
   set outdir [wokUtils:EASY:stobs2 [wokparam -e WOKEntity_javadir [wokinfo -w]]]
  } else {
-  set outdir [wokUtils:EASY:stobs2 [[wokparam -e WOKEntity_drvdir [wokinfo -w]]]
+  set outdir [wokUtils:EASY:stobs2 [wokparam -e WOKEntity_drvdir [wokinfo -w]]]
  }
 
  wokparam -s%OutDir=$outdir
-
  foreach ID $args {
 
   scan $ID "%\[^:\]:%\[^:\]:%\[^:\]"  unit type name

diff --git a/src/WOKStep/WOKStep_JavaHeader.tcl b/src/WOKStep/WOKStep_JavaHeader.tcl
index 2cac194e5804908c376b9797a4fbddf4da13b4a7..8f736a24725b053ec4d25aa48487691db493230d 100755 (executable)
--- a/src/WOKStep/WOKStep_JavaHeader.tcl
+++ b/src/WOKStep/WOKStep_JavaHeader.tcl
@@ -47,9 +47,9 @@ proc WOKStep_JavaHeader:ComputeIncludeDir { unit } {
   set awb [lindex $allwb [expr $i - 1]]
 
   if { $fJava != 0 } {
-   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
@@ -64,7 +64,7 @@ proc WOKStep_JavaHeader:Execute { theunit args } {
 
  global tcl_platform
 
- msgprint -i -c "WOKStep_JavaHeader:Execute" "Processing unit : $theunit"
+ msgprint -i -c "WOKStep_JavaHeader:Execute" "Processing JavaHeader unit : $theunit"
  msgprint -i -c "WOKStep_JavaHeader:Execute"
 
  set unitname [wokinfo -n $theunit]
@@ -72,10 +72,11 @@ proc WOKStep_JavaHeader:Execute { theunit args } {
  set incdir [WOKStep_JavaHeader:ComputeIncludeDir $theunit]
  wokparam -s%IncludeDir=$incdir
 
+
  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
@@ -88,11 +89,10 @@ proc WOKStep_JavaHeader:Execute { theunit args } {
   regsub -all "\\." $nameid "_" nameid
   set outfileid ${nameid}_${outfileid}.h
 
-  set outfile [UNC [wokinfo -p pubinclude:$outfileid $theunit]]
+  set outfile [wokinfo -p pubinclude:$outfileid $theunit]
   wokparam -s%OutFile=$outfile
 
   set thecommand [wokparam -e JAVA_Header]
-       
   msgprint -i -c "WOKStep_JavaCompile:Execute" "Building header $outfileid"
 
   if { [catch {eval exec [lindex $thecommand 0]} res] } {