From f0959d32caf2416b30a2343c3b8de8a73440fbf0 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Sep 2020 08:02:15 +0100 Subject: [PATCH 1/7] Add an exclude list --- staticanalysis/cpd.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 2bd12d9..07bbe70 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -81,18 +81,18 @@ pipeline { steps { script { def PPDFOLDER = "${STATICANALYSIS}/ppd" - dir(PPDFOLDER) { + dir(SRC) { if (isUnix()) { sh """#!/bin/bash set -e export PMD_JAVA_OPTS=-Xmx65536m - "${PPD}/run.sh" cpd --minimum-tokens 100 --files "${SRC}" --language cpp --format xml --failOnViolation false > cpd.xml + "${PPD}/run.sh" cpd --minimum-tokens 100 --files . --exclude "${EXCLUDED_PATH_LIST.trim()}" --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" """ } else { bat """ set PMD_JAVA_OPTS=-Xmx2048m - "${PPD}/cpd.bat" --minimum-tokens 100 --files "${SRC}" --language cpp --format xml --failOnViolation false > cpd.xml + "${PPD}/cpd.bat" --minimum-tokens 100 --files . --exclude "${EXCLUDED_PATH_LIST.trim()}" --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" """ } } From 1cc691ee7a3d86886ad68ba817eb3377cb29db8c Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Sep 2020 08:08:50 +0100 Subject: [PATCH 2/7] Add an exclude list --- staticanalysis/cpd.groovy | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 07bbe70..ee1b1c7 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -81,18 +81,21 @@ pipeline { steps { script { def PPDFOLDER = "${STATICANALYSIS}/ppd" + excludeoptions = '' + if (EXCLUDED_PATH_LIST) { + excludeoptions = """--exclude "${EXCLUDED_PATH_LIST}" """ dir(SRC) { if (isUnix()) { sh """#!/bin/bash set -e export PMD_JAVA_OPTS=-Xmx65536m - "${PPD}/run.sh" cpd --minimum-tokens 100 --files . --exclude "${EXCLUDED_PATH_LIST.trim()}" --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" + "${PPD}/run.sh" cpd --minimum-tokens 100 --files . ${excludeoptions} --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" """ } else { bat """ set PMD_JAVA_OPTS=-Xmx2048m - "${PPD}/cpd.bat" --minimum-tokens 100 --files . --exclude "${EXCLUDED_PATH_LIST.trim()}" --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" + "${PPD}/cpd.bat" --minimum-tokens 100 --files . ${excludeoptions} --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" """ } } From c6ea368a3d7d0f9b058b00ecd34adeb12684f414 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Sep 2020 08:10:52 +0100 Subject: [PATCH 3/7] Add an exclude list --- staticanalysis/cpd.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index ee1b1c7..35d8094 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -84,6 +84,7 @@ pipeline { excludeoptions = '' if (EXCLUDED_PATH_LIST) { excludeoptions = """--exclude "${EXCLUDED_PATH_LIST}" """ + } dir(SRC) { if (isUnix()) { sh """#!/bin/bash From d8d59ba518bb732f8133f1217a33acb5d56da690 Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Sep 2020 08:31:52 +0100 Subject: [PATCH 4/7] Update static analysis --- staticanalysis/cpd.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 35d8094..233da57 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -60,7 +60,7 @@ pipeline { stage("Clean exports") { steps { script { - STATICANALYSIS = 'staticanalysis' + STATICANALYSIS = "${WORKSPACE}/staticanalysis" cleanfolders = [ STATICANALYSIS, ] From efc258daedf609cdf7eb8c0e7dd5603a0b56430e Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Sep 2020 08:35:48 +0100 Subject: [PATCH 5/7] Update static analysis --- staticanalysis/cpd.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 233da57..ef10e37 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -86,6 +86,7 @@ pipeline { excludeoptions = """--exclude "${EXCLUDED_PATH_LIST}" """ } dir(SRC) { + dir(PPDFOLDER) {} if (isUnix()) { sh """#!/bin/bash set -e From 67f5113cf43655f3a2cc027bdfb620a938f81c2b Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 13 Sep 2020 08:44:12 +0100 Subject: [PATCH 6/7] Update static analysis --- staticanalysis/cpd.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index ef10e37..d421446 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -86,16 +86,17 @@ pipeline { excludeoptions = """--exclude "${EXCLUDED_PATH_LIST}" """ } dir(SRC) { - dir(PPDFOLDER) {} if (isUnix()) { sh """#!/bin/bash set -e + mkdir -pv "${PPDFOLDER}" export PMD_JAVA_OPTS=-Xmx65536m "${PPD}/run.sh" cpd --minimum-tokens 100 --files . ${excludeoptions} --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" """ } else { bat """ + mkdir "${PPDFOLDER}" set PMD_JAVA_OPTS=-Xmx2048m "${PPD}/cpd.bat" --minimum-tokens 100 --files . ${excludeoptions} --language cpp --format xml --failOnViolation false > "${PPDFOLDER}/cpd.xml" """ From 80d9106f41cfe94aad1bed732f38292e209541db Mon Sep 17 00:00:00 2001 From: Dan Hawkins Date: Sun, 8 Nov 2020 21:44:53 +0000 Subject: [PATCH 7/7] Correction after subtree pull --- staticanalysis/cpd.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/staticanalysis/cpd.groovy b/staticanalysis/cpd.groovy index 531b3eb..6f3a33f 100644 --- a/staticanalysis/cpd.groovy +++ b/staticanalysis/cpd.groovy @@ -63,7 +63,7 @@ pipeline { stage("Clean exports") { steps { script { - STATICANALYSIS = "${WORKSPACE}/staticanalysis" + STATICANALYSIS = 'staticanalysis' cleanfolders = [ STATICANALYSIS, ]