Changeset 78

Timestamp:

Mar 29, 2007 5:17:18 AM (18 years ago)

Author:

raasch

Message:

new option -G for mrun to transfer global revision number to batch jobs

File:

• palm/trunk/SCRIPTS/mrun (modified) (6 diffs)

palm/trunk/SCRIPTS/mrun

@@ -112 +112 @@
      #                     output
      # 16/03/07 - Siggi  - adjustments for lctit
+     # 29/03/07 - Siggi  - global revision transfered to batch job by new
+     #                     option -G
 
 
@@ -150 +152 @@
  fname=test
  fromhost=""
+ global_revision=""
  host=""
  host_file=""
@@ -370 +373 @@
        (D)   cpp_opts="$cpp_opts $OPTARG"; mc="$mc -D$OPTARG";;
        (f)   filetransfer_protocol=$OPTARG; mc="$mc -f$OPTARG";;
+       (G)   global_revision=$OPTARG; mc="$mc -G'$OPTARG'";;
        (F)   job_on_file="-D"; mc="$mc -F";;
        (h)   host=$OPTARG; mc="$mc -h$OPTARG";;
@@ -878 +882 @@
 
 
+    # GLOBALE REVISIONSNUMMER ERMITTELN (FORTSETZUNGSLAEUFEN WIRD DIESE
+    # DURCH OPTION -G MITGETEILT)
+ if [[ "$global_revision" = "" ]]
+ then
+    global_revision=`svnversion $source_path  2>/dev/null`
+    global_revision="Rev: $global_revision"
+ fi
+
 
     # NOCHMAL PRUEFEN, OB AUF REMOTE-MASCHINE GERECHNET WERDEN SOLL
@@ -2688 +2700 @@
        # NAMELIST-DATEI MIT WERTEN VON ENVIRONMENT-VARIABLEN ERZEUGEN (ZU
        # LESEN VON PALM)
-       # DAZU VORHER DIE "GLOBAL REVISION" VON SUBVERSION ERMITTELN, FALLS
-       # DIE SOURCEN UNTER SUBVERSION-KONTROLLE STEHEN
-    global_revision=`svnversion $source_path`
-    global_revision="Rev: $global_revision"
-
     cat  >  ENVPAR  <<  %%END%%
  &envpar  run_identifier = '$fname', host = '$localhost',
@@ -3749 +3756 @@
     mrun_com="$mrun_script_name -a $afname -c $config_file -d $fname -f $filetransfer_protocol -h $host -H $fromhost -m $memory -t $cpumax -q $queue -R $return_addres -U $return_username -u $remote_username"
     [[ "$cpp_opts" != "" ]]       &&  mrun_com=${mrun_com}" -D \"$cpp_opts\""
+    [[ "$global_revision" != "" ]]  &&  mrun_com=${mrun_com}" -G $global_revision"
     [[ $do_compile = true ]]      &&  mrun_com=${mrun_com}" -s \"$source_list\""
     [[ "$input_list" != "" ]]     &&  mrun_com=${mrun_com}" -i \"$input_list\""