Skip to content
Snippets Groups Projects
Commit 90b982de authored by jdh8d's avatar jdh8d
Browse files

Fix to properly build emt in build-all, but only once during fresh checkouts...

Fix to properly build emt in build-all, but only once during fresh checkouts (as otherwise it's way too slow).  Re-release of broken package.  Fix to p1 to deal with doubling the size of huge stack frames (only does it above 32kb now).  Fix to VGT to mimic the input packages atd.class setting perfectly (omitted if omitted in the input package).  enabled polls for AWS.

Former-commit-id: b10a6be622aa81c549164232236533f135cbcff3
parent 63b8b4e3
No related branches found
No related tags found
No related merge requests found
......@@ -2,7 +2,7 @@
"atd" : {
"name" : "auto-generated .json file from zipr-based variants template",
"server" : "<<SERVER>>",
"class" : "<<CLASS>>",
<<CLASS>>,
"description" : "autogenerated zipr variants",
"performer" : "UVA-DoubleHelix",
"family" : "StaticBinaryRewriting"
......
......@@ -19,7 +19,7 @@ Usage:
--outdir <path_to_variants>
[--args <arguments string in json format> ]
[--server <servername>
[--class <atd class>
[--class <atd class> ]
[--mainexe <exe base name>
[--extra_preloads "<preloads>" ]
[(--help | h )]
......@@ -32,7 +32,7 @@ check_opts()
# defaults
args="\"-k\", \"start\""
server="APACHE"
class="None"
class=""
backend="zipr"
use_diehard="--nodiehard"
use_libtwitcher="--nolibtwitcher"
......@@ -647,7 +647,6 @@ finalize_json()
json_contents="${json_contents//<<LIBS>>/}"
json_contents="${json_contents//,<<LDLIB>>/}"
json_contents="${json_contents//<<LDLIB>>/}"
json_contents="${json_contents//<<CLASS>>/$class}"
json_contents="${json_contents//<<SERVER>>/$server}"
json_contents="${json_contents//<<ARGS>>/$args}"
json_contents="${json_contents//, <<CODE_MAP>>/}"
......@@ -656,6 +655,13 @@ finalize_json()
json_contents="${json_contents//<<SCOOP_MAP>>/}"
json_contents="${json_contents//, <<P1_MAP>>/}"
json_contents="${json_contents//<<P1_MAP>>/}"
if [[ -z "$class" ]]; then
# remove class field
json_contents="${json_contents//<<CLASS>>,/}"
else
# put proper class in place.
json_contents="${json_contents//<<CLASS>>/\"class\" : \"$class\"}"
fi
echo "$json_contents" > $json.ugly
echo "$json_contents" |json_pp > $json
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment