Updates for support NOS and NOL for marshaling. Marhsaling done in parallel...

Updates for support NOS and NOL for marshaling.  Marhsaling done in parallel now. New EMT from apogee.  

Former-commit-id: 23b72789442fc80746970e55c074c69371d989f8

.gitattributes

@@ -918,6 +918,7 @@ tools/cfar_configs/cfar_probBilr_probHeaprand_zipr.sh -text
 tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh -text
 tools/cfar_configs/cfar_probBilr_probNos_zipr.sh -text
 tools/cfar_configs/cfar_probBilr_probP1_probHeaprand_zipr.sh -text
+tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh -text
 tools/cfar_configs/cfar_probBilr_probP1_zipr.sh -text
 tools/cfar_configs/cfar_probBilr_zipr.sh -text
 tools/cfar_configs/cfar_probIlr_probP1_probHeaprand_probNos_strata.sh -text
@@ -944,6 +945,7 @@ tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_structNos_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_structP1Canaries_probBilr_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_structP1Canaries_probHeaprand_zipr.sh -text
+tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_structP1Canaries_zipr.sh -text
 tools/cfar_configs/cfar_structNoc_zipr.sh -text
 tools/cfar_configs/cfar_structNogOF_phase1_zipr.sh -text

tools/cfar_configs/cfar_probBilr_probNos_probNol_zipr.sh

 #!/bin/bash 
 
-$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on

tools/cfar_configs/cfar_probBilr_probP1_probNos_probNol_zipr.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step p1transform=on --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on

tools/cfar_configs/cfar_structNoc_structNos_structNol_zipr.sh

 #!/bin/bash 
 
-$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on

tools/cfar_configs/cfar_structNoc_structP1Canaries_structNos_structNol_zipr.sh

+#!/bin/bash 
+
+$PEASOUP_HOME/tools/cfar.sh "$@" --backend zipr --step-option zipr:"--zipr:seed $$" --structured_noc --structured_nos --step-option zipr:"--large_only:on true" --step non_overlapping_stack=on --config_name $(basename $0 .sh|sed "s/cfar_//") --step set_interpreter=on --step-option set_interpreter:"--interp /target_apps/ld-nol.so" --step nol=on --structured_p1_canaries  --step p1transform=on 

tools/generate_mvee_package.sh

@@ -290,8 +290,9 @@ finalize_json()
 	mkdir $outdir/marshaling
 	cp $CFAR_EMT_PLUGINS/dh_plugins.jar $outdir/marshaling/
 	cp $CFAR_EMT_PLUGINS/refresh.py $outdir/marshaling/
+	cp $CFAR_EMT_PLUGINS/refresh.sh $outdir/marshaling/
 	#tar -xzf $CFAR_APOGEE_DOWNLOADS_DIR/build-emt.tar.gz -C $outdir/marshaling/emt --strip-components=1
-	cp -R $CFAR_EMT_DIR $outdir/marshaling/emt
+	cp -R $CFAR_DIST_EMT_DIR $outdir/marshaling/emt
 
 
 	variants="$total_variants"