Skip to content

Commit 0562ceb

Browse files
committed
Streamline compile log display in Eclipse build website
- Show compiler issues as nested code within the compiler-issues table and drop generation of separate compile log html pages. To display the details of a compiler issue, the corresponding compile log XML files is fetched and parsed in javascript within the site. - Drop compile errors column as a build with compile errors fails and never has a drop produced, so this column was always empty. - Merge the two tables that used to display different kind of compiler issues - Merge columns for Forbidden Access and Discouraged Access warnings into one Access warnings column
1 parent 97792fd commit 0562ceb

File tree

17 files changed

+453
-1048
lines changed

17 files changed

+453
-1048
lines changed

JenkinsJobs/Builds/build.jenkinsfile

Lines changed: 5 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -388,34 +388,15 @@ pipeline {
388388

389389
# Gather compilelogs
390390
pushd ${AGG_DIR}
391-
compilelogsDir=${DROP_DIR}/${BUILD_ID}/compilelogs/plugins
392-
for log in $(find ${AGG_DIR} -name "compilelogs" -type d ); do
391+
compilelogsDir=${DROP_DIR}/${BUILD_ID}/compilelogs
392+
mkdir -p ${compilelogsDir}
393+
for log in $(find . -name "compilelogs" -type d ); do
393394
targetDir=$( dirname $log )
394-
if [ ! -r $targetDir/MANIFEST.MF ]; then
395-
echo "** Failed to process $log in $targetDir. Likely compile error. Will backup to source MANIFEST.MF in directory containing target."
396-
targetDir=$( dirname $targetDir )
397-
if [ ! -r $targetDir/META-INF/MANIFEST.MF ]; then
398-
echo "**Failed to process $log in $targetDir."
399-
else
400-
bundleId=$( grep Bundle-SymbolicName $targetDir/META-INF/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\\; | tr -d '\\f\\r\\n\\t' )
401-
bundleVersion=$( grep Bundle-Version $targetDir/META-INF/MANIFEST.MF | cut -f2 -d" " | tr -d '\\f\\r\\n\\t' )
402-
mkdir -p $compilelogsDir/${bundleId}_${bundleVersion}
403-
rsync -vr $log/ $compilelogsDir/${bundleId}_${bundleVersion}/
404-
fi
405-
else
406-
bundleId=$( grep Bundle-SymbolicName $targetDir/MANIFEST.MF | cut -f2 -d" " | cut -f1 -d\\; | tr -d '\\f\\r\\n\\t' )
407-
bundleVersion=$( grep Bundle-Version $targetDir/MANIFEST.MF | cut -f2 -d" " | tr -d '\\f\\r\\n\\t' )
408-
mkdir -p $compilelogsDir/${bundleId}_${bundleVersion}
409-
rsync -vr $log/ $compilelogsDir/${bundleId}_${bundleVersion}/
410-
fi
395+
fullName=$(awk -F '[:;[:space:]]+' '/^Bundle-SymbolicName/ {name=$2} /^Bundle-Version/ {version=$2} END {print name "_" version}' $targetDir/MANIFEST.MF)
396+
cp -r "${log}" "${compilelogsDir}/${fullName}/"
411397
done
412398
popd
413399

414-
# Verify compilelog
415-
java \
416-
-Dinput=${DROP_DIR}/${BUILD_ID}/compilelogs/plugins \
417-
${WORKSPACE}/scripts/releng/CompileLogConverter.java
418-
419400
# Generate repository reports
420401
$BASE_BUILDER_ECLIPSE_EXE \
421402
-application org.eclipse.cbi.p2repo.analyzers.repoReport \

scripts/releng/CompileLogConverter.java

Lines changed: 0 additions & 208 deletions
This file was deleted.

0 commit comments

Comments
 (0)