This commit is contained in:
Dan Hawkins 2018-12-16 12:18:14 +00:00
commit ff0e2987cf
4 changed files with 20 additions and 25 deletions

View file

@ -1,9 +1,9 @@
versiongenerator = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy")
def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', boolean fingerprint = false) {
def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, String filter = '**', String excludes = '', boolean fingerprint = false) {
copyArtifacts(
filter: filter,
excludes: excludes,
fingerprintArtifacts: fingerprint,
projectName: jenkinsjob.trim(),
selector: specific(buildnumber.toString()),
@ -14,9 +14,10 @@ def artifactimport(meta, String jenkinsjob, int buildnumber, String destpath, St
return importedmeta
}
def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', boolean fingerprint = false) {
def artifactimport(meta, String jenkinsjob, String buildselector, String destpath, String filter = '**', String excludes = '', boolean fingerprint = false) {
copyArtifacts(
filter: filter,
excludes: excludes,
fingerprintArtifacts: fingerprint,
projectName: jenkinsjob.trim(),
selector: [

View file

@ -1,30 +1,21 @@
// Given details about artifacts to import and details of installers to build, import artifacts that are required
def artifactsImporter(artifactDetails, installerDetails) {
def Map artifactsImporter(meta, artifactDetails, installerDetails) {
artifactFetched = [:]
def importer = load("${autobuilder.commonscripts()}/import/importer.groovy")
for (installer in toBuild) {
def artifactKey = installerDetails.get(installer)[0]
//echo "To build: ${installer} use artifactKey: ${artifactKey}"
(sourceProject, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey)
env.importDest = destFolder
(sourceProject, sourceselector, destFolder, toCopy, notToCopy, binariesFolders) = artifactDetails.get(artifactKey)
if (artifactFetched.get(artifactKey) == null) {
//echo "Artifact info: ${artifactInfo}"
copyArtifacts excludes: notToCopy, filter: toCopy, fingerprintArtifacts: true, projectName: "${sourceProject}", selector: lastSuccessful(), target: "${destFolder}"
def componentVersionFolder = "${WORKSPACE}\\version\\version_${artifactKey}"
def folderToCopy = "${destFolder}\\version"
echo "Copying from: ${folderToCopy} to: ${componentVersionFolder}"
fileOperations([folderCopyOperation(destinationFolderPath: componentVersionFolder, sourceFolderPath: folderToCopy)])
//fileOperations([fileCopyOperation(excludes: '', flattenFiles: false, includes: filesToCopy, targetLocation: componentVersionFolder )])
def gh = load("${autobuilder.commonscripts()}/versioncontrol/git.groovy")
artifactVersion = gh.getSHAFromVersion("${destFolder}/version")
artifactFetched.put(artifactKey, artifactVersion)
def importmeta = importer.artifactimport(meta, sourceProject, sourceselector, destFolder, toCopy, notToCopy, true)
artifactFetched.put(artifactKey, importmeta)
}
}
return artifactFetched
}
// Export any required binaries to the <WORKSPACE>/bin folder
def exportBinaries(artifactDetails, installerDetails) {
def placeBinaries(artifactDetails, installerDetails) {
for (installer in toBuild) {
(artifactSet, targetFolder, executionPath, ISMprojectFile, installerVariant, exportBinaries) = installerDetails.get(installer)
if (exportBinaries) {

View file

@ -605,8 +605,8 @@ class MetaInfo extends GISJsonSerialised {
return METAFOLDERNAME
}
String generateartifacts(ArrayList<String> releasedfromhere = new ArrayList<String>(),
ArrayList<String> releasedfromsubmeta = new ArrayList<String>(),
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}"
) {
def String artifactlist = METAARTIFACTS

View file

@ -1,17 +1,20 @@
def stamp(convertdetails) {
for (convertdetail in convertdetails) {
filetoconvert = convertdetail[0]
pattern = convertdetail[1]
replacement = convertdetail[2]
def filetoconvert = convertdetail[0]
def pattern = convertdetail[1]
def replacement = convertdetail[2]
//echo "Converting any instances of pattern: ${pattern} with replacement: ${replacement} in file: ${filetoconvert}"
def stampscript = "${autobuilder.commonscripts()}/versionstamping/versionstamper.py"
//echo "Using python: ${PYTHON} and script: ${stampscript}"
if (isUnix()) {
sh """
"${PYTHON}" -u "${autobuilder.commonscripts()}/versionstamping/versionstamper.py" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}"
"${PYTHON}" -u "${stampscript}" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}"
"""
}
else {
bat """
"%${PYTHON}%" -u "%${autobuilder.commonscripts()}%\\versionstamping\\versionstamper.py" -f "%${filetoconvert}%" -p "%${pattern}%" -s "%${replacement}%"
"${PYTHON}" -u "${stampscript}" -f "${filetoconvert}" -p "${pattern}" -s "${replacement}"
"""
}
}