Add publishable items to meta

This commit is contained in:
Dan Hawkins 2018-11-22 20:19:08 +00:00
commit d44af429e0
2 changed files with 34 additions and 18 deletions

View file

@ -269,6 +269,22 @@ class ChecksumInfo extends GISJsonSerialised {
}
}
class PublishableInfo extends GISJsonSerialised {
private String filepath
PublishableInfo(script, String filepath = "") {
super(script)
this.filepath = filepath
}
LinkedHashMap serialisationdata() {
def data = [
'filepath' : filepath,
]
return data
}
}
class MetaInfo extends GISJsonSerialised {
private String METAFOLDERNAME = "meta"
private String METAFILENAME = "info.json"
@ -282,6 +298,7 @@ class MetaInfo extends GISJsonSerialised {
ReleaseInfo releaseinfo
ChecksumInfo checksuminfo
private ArrayList<ConfigurationInfo> configurationinfo
private ArrayList<PublishableInfo> publishableinfo
private ArrayList<MetaInfo> associatedmeta
MetaInfo(script) {
@ -293,6 +310,7 @@ class MetaInfo extends GISJsonSerialised {
releaseinfo = new ReleaseInfo(script)
checksuminfo = new ChecksumInfo(script)
configurationinfo = new ArrayList<ConfigurationInfo>()
publishableinfo = new ArrayList<PublishableInfo>()
associatedmeta = new ArrayList<MetaInfo>()
}
@ -304,11 +322,24 @@ class MetaInfo extends GISJsonSerialised {
return configuration
}
void addPublishable(String filepath) {
def PublishableInfo pi = new PublishableInfo(script, filepath)
publishableinfo.add(pi)
}
void addConfigurationInfo(String configurationname, String configurationURL, String configurationversion, String configurationSHA) {
def ConfigurationInfo ci = new ConfigurationInfo(script, configurationname, configurationURL, configurationversion, configurationSHA)
configurationinfo.add(ci)
}
List publishableinfoserialised() {
def publishable = []
for (publishableitem in publishableinfo) {
publishable.add(publishableitem.serialisationdata())
}
return publishable
}
List associatedmetaserialised() {
def associated = []
for (metaitem in associatedmeta) {
@ -331,6 +362,7 @@ class MetaInfo extends GISJsonSerialised {
'releaseinfo' : releaseinfo.serialisationdata(),
'configuration' : configurationinfoserialised(),
'checksuminfo' : checksuminfo.serialisationdata(),
'publishableinfo' : publishableinfoserialised(),
'associatedmeta' : associatedmetaserialised(),
]
return data

View file

@ -1,26 +1,10 @@
metafolder = load("${autobuilder.commonscripts()}/meta/folder.groovy")
env.PUBLISHABLEARTIFACTS = "${metafolder.METAFOLDERNAME}/publishable/**"
// Generate a list of artifact files that are publishable to outside parties
def generatelist(publishable) {
def PUBLISHABLEFOLDER = "${WORKSPACE}/${metafolder.METAFOLDERNAME}/publishable"
sh """
rm -rf "${PUBLISHABLEFOLDER}"
mkdir -p "${PUBLISHABLEFOLDER}"
"""
def generatelist(meta, publishable) {
filelist = []
for (filepath in publishable) {
def files = findFiles(glob: filepath)
for (file in files) {
if (!file.directory) {
filelist.add(file.path)
}
}
meta.addPublishable(filepath)
}
def outJson = readJSON text: groovy.json.JsonOutput.toJson(filelist)
def PUBLISHABLEFILE = "${PUBLISHABLEFOLDER}/list.json"
writeJSON(file: PUBLISHABLEFILE, json: outJson, pretty: 4)
}
return this;