From c017cd21c1a81c711f39988226dc7533a8089ef2 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Fri, 7 Feb 2020 15:27:53 +0000 Subject: [PATCH 1/2] Omit BASEBUILDNUMBER so it defaults to 0 --- staticanalysis/ccm.groovy | 2 +- staticanalysis/cpd.groovy | 2 +- staticanalysis/cppcheck.groovy | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/staticanalysis/ccm.groovy b/staticanalysis/ccm.groovy index 865e5fa..f0e5b80 100644 --- a/staticanalysis/ccm.groovy +++ b/staticanalysis/ccm.groovy @@ -54,7 +54,7 @@ pipeline { steps { script { version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER) + version.generate(meta, SOURCE_REVISION, SOURCE_PATH) } } } diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 21b8a5e..2bd12d9 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -73,7 +73,7 @@ pipeline { steps { script { version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER) + version.generate(meta, SOURCE_REVISION, SOURCE_PATH) } } } diff --git a/staticanalysis/cppcheck.groovy b/staticanalysis/cppcheck.groovy index 59323c1..bdc6a2a 100644 --- a/staticanalysis/cppcheck.groovy +++ b/staticanalysis/cppcheck.groovy @@ -48,7 +48,7 @@ pipeline { steps { script { version = load("${autobuilder.commonscripts()}/versionnumbering/generate.groovy") - version.generate(meta, SOURCE_REVISION, SOURCE_PATH, BASEBUILDNUMBER) + version.generate(meta, SOURCE_REVISION, SOURCE_PATH) } } } From 253025093e58bdfab2330ba1481f9659d8ac6d95 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Wed, 1 Apr 2020 13:09:34 +0100 Subject: [PATCH 2/2] Start converting autobuild for fx3 --- textutils/subst.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/textutils/subst.groovy b/textutils/subst.groovy index 055a269..c0207a3 100644 --- a/textutils/subst.groovy +++ b/textutils/subst.groovy @@ -1,5 +1,5 @@ -def substitute(String filepath, String pattern, String subst) { +def substitute(String filepath, pattern, String subst) { fileText = readFile(file: filepath, encoding: 'UTF-8') def converted = fileText.replaceAll(pattern, subst) writeFile(file: filepath, text: converted, encoding: 'UTF-8')