Changeset 27840 for branches/simtest_nebulous_branches/ippTasks/chip.pro

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTasks/chip.pro (modified) (6 diffs)

branches/simtest_nebulous_branches/ippTasks/chip.pro

@@ -26 +26 @@
     active true
   end
+  task chip.revert
+    active true
+  end
 end
 
@@ -36 +39 @@
   end
   task chip.advanceexp
+    active false
+  end
+  task chip.revert
+    active false
+  end
+end
+
+macro chip.revert.on
+  task chip.revert
+    active true
+  end
+end
+
+macro chip.revert.off
+  task chip.revert
     active false
   end
@@ -109 +127 @@
 
   task.exec
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec $RUNEXEC
+
     book npages chipPendingImfile -var N
     if ($N == 0) break
     if ($NETWORK == 0) break
+    if ($BURNTOOLING == 1) break
     
     # look for new images in chipPendingImfile (pantaskState == INIT)
@@ -132 +154 @@
     book getword chipPendingImfile $pageName state -var RUN_STATE
 
-    if ("$RAW_MAGICKED" == "T")
-        $MAGICKED_ARG = "--magicked"
+    if ($RAW_MAGICKED > 0)
+        $MAGICKED_ARG = "--magicked $RAW_MAGICKED"
     else 
         $MAGICKED_ARG = ""
@@ -171 +193 @@
       echo command $run
     end
+    # if we are unable to run the 'exec', use a long retry time
+    periods -exec 0.05
     command $run
   end
@@ -253 +277 @@
   host         local
 
-  periods      -poll 5.0
-  periods      -exec 60.0
+  periods      -poll 60.0
+  periods      -exec 1800.0
   periods      -timeout 120.0
   npending     1