From 055349a7348a4dc5791830f1f149ede063f980a0 Mon Sep 17 00:00:00 2001 From: Jonah Graham Date: Tue, 16 Jul 2019 15:11:49 -0400 Subject: [PATCH] Bug 548526: Enable individual mvn projects to be built Although a little profile "magic" is needed, by adding -DuseSimrelRepo to the command line to enable and disable the correct profiles individual mvn projects can be built against the simrelRepo. This enables, for example, the ability to build the standalone debugger against the simrel repo without having to change how normal builds are done by using: mvn verify -DuseSimrelRepo -f debug/org.eclipse.cdt.debug.application.product A simrel p2 site can also be provided with -Dsimrel-site= Change-Id: I45a636c3c1042bc2fbb6eea5129c6553027e92df --- pom.xml | 61 +++++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 8 deletions(-) diff --git a/pom.xml b/pom.xml index 7e9267f9595..94f0bd983c7 100644 --- a/pom.xml +++ b/pom.xml @@ -21,6 +21,7 @@ 1.1.5 jacoco http://ci.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository + https://download.eclipse.org/releases/2019-09 tools/cdt/builds/master/nightly reuseReports ${project.basedir}/../../target/jacoco.exec @@ -299,6 +300,14 @@ none + cdtRepo @@ -309,6 +318,50 @@ + + + simrelRepo + + + useSimrelRepo + + + + + simrel.repo + ${simrel-site} + p2 + + + + + + defaultCdtTarget + + + !useSimrelRepo + + + + + + org.eclipse.tycho + target-platform-configuration + ${tycho-version} + + + + org.eclipse.cdt + org.eclipse.cdt.target + ${target-platform} + 1.0.0 + + + + + + + macosx @@ -571,14 +624,6 @@ x86_64 - - - org.eclipse.cdt - org.eclipse.cdt.target - ${target-platform} - 1.0.0 - -