From 16886a1f2a6c47c25cbc42f7495a27fa0411c9ae Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Thu, 25 Sep 2014 17:34:05 -0400 Subject: [PATCH] Bug 445128 - Enable the use of p2 mirrors for CDT releases Note that will need to be changed at release time to point to the release location, which will probably be "tools/cdt/releases/8.6" Change-Id: I0a89c8807a435ac348f4f28f2442d27668248cfc Reviewed-on: https://git.eclipse.org/r/33992 Tested-by: Hudson CI Reviewed-by: Marc-Andre Laperle Tested-by: Marc-Andre Laperle Reviewed-by: Marc Khouzam Tested-by: Marc Khouzam --- pom.xml | 1 + .../antArtifactsUpdater.xml | 46 +++++++++++++++++++ releng/org.eclipse.cdt.repo/p2.xsl | 35 ++++++++++++++ releng/org.eclipse.cdt.repo/pom.xml | 46 +++++++++++-------- 4 files changed, 110 insertions(+), 18 deletions(-) create mode 100644 releng/org.eclipse.cdt.repo/antArtifactsUpdater.xml create mode 100644 releng/org.eclipse.cdt.repo/p2.xsl diff --git a/pom.xml b/pom.xml index 28972cd05b3..36960480031 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ 0.22.0 jacoco http://hudson.eclipse.org/cdt/job/cdt-master/lastSuccessfulBuild/artifact/releng/org.eclipse.cdt.repo/target/repository + tools/cdt/builds/master/nightly reuseReports ${project.basedir}/../../target/jacoco.exec cdt-e4.4 diff --git a/releng/org.eclipse.cdt.repo/antArtifactsUpdater.xml b/releng/org.eclipse.cdt.repo/antArtifactsUpdater.xml new file mode 100644 index 00000000000..0f274224e71 --- /dev/null +++ b/releng/org.eclipse.cdt.repo/antArtifactsUpdater.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.eclipse.cdt.repo/p2.xsl b/releng/org.eclipse.cdt.repo/p2.xsl new file mode 100644 index 00000000000..8c804d3b7eb --- /dev/null +++ b/releng/org.eclipse.cdt.repo/p2.xsl @@ -0,0 +1,35 @@ + + + + + + + + + + + + + p2.mirrorsURL + + + + + + + + + + + + + + + + + + + + + + diff --git a/releng/org.eclipse.cdt.repo/pom.xml b/releng/org.eclipse.cdt.repo/pom.xml index 93cb82f9016..ea4067b1600 100644 --- a/releng/org.eclipse.cdt.repo/pom.xml +++ b/releng/org.eclipse.cdt.repo/pom.xml @@ -23,28 +23,38 @@ production - /home/data/httpd/download.eclipse.org/tools/cdt/builds/master/nightly + /home/data/httpd/download.eclipse.org/${repo-path} - maven-antrun-plugin - 1.7 - - - verify - - - - - - - - run - - - + maven-antrun-plugin + 1.7 + + + verify + + + + + + + + + + + + + + + + + + + run + + +