Skip to content

Commit

Permalink
Make the compiler baseline configuration configurable by properties
Browse files Browse the repository at this point in the history
Currently the baseline settings are hardcoded (and always override the
platform parent configuration), this extract these into some properties
that can be overridden from the commandline.

This also adjust the Jenkinsfile to use this new way of selectively
disable replace/compare of the baseline in case of building the
compiler-compiler.

See eclipse-platform/eclipse.platform.releng.aggregator#1395
  • Loading branch information
laeubi committed Sep 26, 2023
1 parent 529ca0b commit 8b132a4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pipeline {
# via configuration/argLine property in pom.xml
# export MAVEN_OPTS="-Xmx2G"
mvn clean install -f org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99 -Dmaven.repo.local=$WORKSPACE/.m2/repository
mvn clean install -f org.eclipse.jdt.core.compiler.batch -DlocalEcjVersion=99.99 -Dmaven.repo.local=$WORKSPACE/.m2/repository -DcompilerBaselineMode=disable -DcompilerBaselineReplace=none
mvn -U clean verify --batch-mode --fail-at-end -Dmaven.repo.local=$WORKSPACE/.m2/repository \
-Ptest-on-javase-21 -Pbree-libs -Papi-check \
Expand Down
6 changes: 4 additions & 2 deletions org.eclipse.jdt.core.compiler.batch/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@
<packaging>eclipse-plugin</packaging>

<properties>
<compilerBaselineReplace>common</compilerBaselineReplace>
<compilerBaselineMode>warn</compilerBaselineMode>
<defaultSigning-excludeInnerJars>true</defaultSigning-excludeInnerJars>
<code.ignoredWarnings>-warn:+fieldHiding,-unavoidableGenericProblems</code.ignoredWarnings>
<localEcjVersion>${project.version}</localEcjVersion>
Expand Down Expand Up @@ -76,8 +78,8 @@
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<configuration>
<baselineMode>warn</baselineMode>
<baselineReplace>common</baselineReplace>
<baselineMode>${compilerBaselineMode}</baselineMode>
<baselineReplace>${compilerBaselineReplace}</baselineReplace>
</configuration>
<executions>
<execution>
Expand Down

0 comments on commit 8b132a4

Please sign in to comment.