Merge remote-tracking branch 'origin/master' into production

This commit is contained in:
Dan Hawkins 2019-04-21 11:38:19 +01:00
commit 8efca65802

View file

@ -655,6 +655,10 @@ class MetaInfo extends GISJsonSerialised {
return METAFOLDERNAME
}
static String difffolder() {
return DIFFFOLDERNAME
}
String generateartifacts(ArrayList<String> releasedfromhere = new ArrayList<String>(), // These items are recorded in meta as released from here
ArrayList<String> releasedfromsubmeta = new ArrayList<String>(), // These items are not recorded in meta as released from here
String metafilepath ="${METAFOLDERNAME}/${METAFILENAME}"
@ -763,6 +767,11 @@ MetaInfo metareset(script) {
dir(mi.folder()) {
deleteDir()
}
dir(mi.difffolder()) {
deleteDir()
}
return mi
}