Changeset 13822 for trunk/FACT++

Timestamp:

05/23/12 09:45:40 (12 years ago)

Author:

tbretz

Message:

Preliminary final version ;)

Location:

trunk/FACT++

Files:

• recompile.sh (modified) (2 diffs)
• start.sh (modified) (3 diffs)

trunk/FACT++/recompile.sh

@@ -3 +3 @@
 touch compiling.lock
 
-dimctrl --cmd "DIS_DNS/KILL_SERVERS 100" --cmd "DIS_DNS/EXIT 100"
+if [ ! -x dimctrl ]; then
+   make $* dimctrl
+fi
+
+dimctrl --quit --cmd ".w 3000" --cmd "DIS_DNS/KILL_SERVERS" --cmd "DIS_DNS/EXIT 100"
 
 sleep 5
@@ -9 +13 @@
 make clean
 
-make -j2 && rm compiling.lock
+make $* && rm compiling.lock

trunk/FACT++/start.sh

@@ -1 @@
-#!/bin/bash
+#!/bin/bash --login
+
 
 CMD="$*"
+PRG="$1"
 
 while [ true ]; do
@@ -13 +15 @@
    echo COMMAND=$CMD
    echo
+
+   if [ ! -x $PRG ]; then
+      echo $1 not available... waiting 5s.
+      sleep 5
+      continue
+   fi
+
+   if [ -e compiling.lock ]; then
+      echo Compilation in progress... waiting 1s.
+      sleep 1
+      continue
+   fi
 
    $CMD
@@ -28 +42 @@
    fi
 
-   while [ -e compiling ]; do
-      sleep 1
-   done
-
 done