MG: scripts updated.

mg/build_and_run.csh

@@ -0,0 +1,17 @@
+#!/bin/csh
+
+set dwa=~/devel/mg/dwa_02_23/ic/lv/aoi-dbg/
+
+if ( { rsh amy-bld-07 "cd $dwa && cglu && cd locallv && gmake calibre" } ) then
+else
+	exit
+endif
+if ( { calibre -drc -hier -turbo $1 } ) then
+else
+	exit
+endif
+if ( { merge.csh } ) then
+else
+	exit
+endif
+

mg/create_iwa.csh

@@ -18,7 +18,7 @@ endif
 #
 #   Check out sources.
 #
-echo cvs checkout -r calibre_2014_3 ic/lv/src ic/ic_superproj/src
+cvs checkout ic/lv/src ic/ic_superproj/src
 
 ######################
 cd $IWA/ic/lv

mg/cshrc

@@ -1,4 +1,11 @@
 #
+#	Set DISPLAY if not set.
+#
+if ( $?DISPLAY == 0 ) then
+	setenv DISPLAY amy-nbaghram-lnx:1.0
+	echo "Display is set to $DISPLAY"
+endif
+#
 #	MG global
 #
 setenv VCO `/usr/mgc/bin/mgcvco`
@@ -58,6 +65,12 @@ else if ( -x /sj/cal_nightly/latest_ube ) then
 endif
 
 setenv CALIBRE_PRINT_STACK_TRACE 4242
+#setenv CALIBRE_DUMP_CORE_ON_ABORT 1
+#setenv CALIBRE_DFM_FILL_WRAP_DUMP_COLLECTIONS 1
+#setenv CALIBRE_MTFLEX_LOCAL_HOST_DIR $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
+#setenv CALIBRE_MTFLEX_LOCAL_HOST_DIR $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
+#setenv TMP $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
+#setenv TEMP $HOME/devel/mg/test/dfm_fill_wrap_vertical_shape
 
 #
 #	MG test environment (These are needed for terra)
@@ -66,10 +79,15 @@ setenv CALIBRE_PRINT_STACK_TRACE 4242
 #export MGC_HOME=/wv/icdet/work_areas/latest_ube/ic/ic_superproj/$VCO/Mgc_home/
 #export MGC_BIN=$MGC_HOME/bin
 #export PATH=$MGC_BIN:$PATH
-if ( -e /wv/pevtools/data_dir	) then
+if ( -e /wv/pevtools/data_dir ) then
     setenv DESIGN_DIR /wv/pevtools/data_dir
 endif
 
+if ( -e /amy/cal_dfm_qa/tot_master/calibre/dfm/fill/WRAP ) then
+	setenv DFM_TEST_BASE /amy/cal_dfm_qa/tot_master/calibre/dfm/fill/WRAP
+	setenv TEST_SUITE_TOP /amy/cal_dfm_qa/tot_master/calibre
+endif
+
 if ( -e /wv/calgrid/sge/default/common/settings.csh ) then
 	setenv DFM_TEST_BASE /wv/cal_dfm_qa/tot_master/calibre/dfm/rq/
 	setenv TEST_SUITE_TOP /wv/amy_dfm_qa/tot_master/calibre
@@ -125,4 +143,4 @@ alias oasis_info $HOME/local_rh_x64/private/fw/bin/oasis_info
 #
 alias cdw 'cd $HOME/devel/mg'
 alias setmgchome 'source $HOME/devel/scripts/mg/setmgchome.csh'
-alias ptags 'ctags --recurse=yes --verbose -h ".h.C"'
+alias ptags 'ctags --recurse=yes --verbose -h ".h.C" base lvbase iclv ponte dfm locallv'

mg/integrate.csh

@@ -0,0 +1,8 @@
+#!/bin/csh
+
+if ( $1 == "" || $2 == "" || $3 == "" ) then
+    echo 'Syntax: <file name> <rev1> <rev2>.'
+    exit
+endif
+
+cvs diff -tc -r $2 -r $3 $1 | patch -l -F 3 $1

mg/merge.csh

@@ -0,0 +1,4 @@
+#!/bin/csh
+
+calibredrv `dirname $0`/merge.tcl
+

mg/merge.tcl

@@ -0,0 +1,15 @@
+proc merge_phase { prefix } {
+    set pattern $prefix
+    append pattern "_*"
+    set dumps [glob $pattern ]
+    foreach f $dumps {
+       lappend input -in $f
+    }
+    #layout filemerge $input -out dump_merged.oas -smartdiff -mode append
+    eval "layout filemerge $input -out dump_merged_$prefix.oas -smartdiff -mode append"
+}
+
+merge_phase phase0
+merge_phase phase1
+merge_phase phase2
+merge_phase phase3