From af4bde1ed257c9f0311fc31e14c2f3087ea8e928 Mon Sep 17 00:00:00 2001 From: Matthias Sohn Date: Tue, 17 Feb 2015 00:12:01 +0100 Subject: [PATCH] Use Target Platform Definition DSL to generate target platforms The "Target Platform Definition DSL and Generator" [1] heavily simplifies maintenance of target platforms. It allows to modularize target platform definitions which eliminates code duplication. The .target files understood by P2 and Tycho are generated from .tpd files which are written in the target platform definition DSL. In order to edit .tpd files and generate .target files install the "Target Platform Definition DSL and Generator" 2.0 or later [2] (Note: on Kepler you also need to add [3] to get Xtext 2.5 which is not available by default on Kepler). This tools is needed only if you need to change the Target Platform definition files (*.targetplatform and *.tpd) and re-generate the *.target files. In normal development you do not need this and can simply use the generated *.target themselves. In addition - update Orbit repository for 4.5 to Mars M5 - use latest released Orbit p2 repository for platform version Luna and earlier [1] https://github.com/mbarbero/fr.obeo.releng.targetplatform [2] http://mbarbero.github.io/fr.obeo.releng.targetplatform/p2/latest/ [3] http://download.eclipse.org/modeling/tmf/xtext/updates/releases/ Change-Id: Ia701972785c3e88aba66a7f15a2b3cf638727eea Signed-off-by: Matthias Sohn --- .../org.eclipse.jgit.target/jgit-4.3.target | 33 +++++++---------- .../org.eclipse.jgit.target/jgit-4.3.tpd | 8 +++++ .../org.eclipse.jgit.target/jgit-4.4.target | 31 +++++++--------- .../org.eclipse.jgit.target/jgit-4.4.tpd | 8 +++++ .../org.eclipse.jgit.target/jgit-4.5.target | 31 +++++++--------- .../org.eclipse.jgit.target/jgit-4.5.tpd | 8 +++++ .../orbit/R20150124073747-Luna-SR2.tpd | 35 +++++++++++++++++++ .../orbit/S20150202203538-Mars-M5.tpd | 35 +++++++++++++++++++ .../projects/jetty-7.6.14.tpd | 20 +++++++++++ 9 files changed, 151 insertions(+), 58 deletions(-) create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd create mode 100644 org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target index 9bf94ccc8..c0eff7da4 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.target @@ -1,17 +1,9 @@ - - - + + + - - + @@ -28,11 +20,11 @@ + - - - - + + + @@ -53,18 +45,19 @@ - - + + + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd new file mode 100644 index 000000000..1d16481cd --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.3.tpd @@ -0,0 +1,8 @@ +target "jgit-4.3" with source configurePhase + +include "projects/jetty-7.6.14.tpd" +include "orbit/R20150124073747-Luna-SR2.tpd" + +location "http://download.eclipse.org/releases/kepler/" { + org.eclipse.osgi lazy +} diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target index 2645b1636..c414f4152 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.target @@ -1,17 +1,9 @@ - - - + + + - - + @@ -28,11 +20,11 @@ + - - - + + @@ -53,18 +45,19 @@ - - + + + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd new file mode 100644 index 000000000..afbe9c9f7 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.4.tpd @@ -0,0 +1,8 @@ +target "jgit-4.4" with source configurePhase + +include "projects/jetty-7.6.14.tpd" +include "orbit/R20150124073747-Luna-SR2.tpd" + +location "http://download.eclipse.org/releases/luna/" { + org.eclipse.osgi lazy +} \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index 1ba912232..45dec35ae 100644 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target @@ -1,17 +1,9 @@ - - - + + + - - + @@ -28,11 +20,11 @@ + - - - + + @@ -53,18 +45,19 @@ - - + + + - - + + diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd new file mode 100644 index 000000000..33b088a68 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.tpd @@ -0,0 +1,8 @@ +target "jgit-4.5" with source configurePhase + +include "projects/jetty-7.6.14.tpd" +include "orbit/S20150202203538-Mars-M5.tpd" + +location "http://download.eclipse.org/releases/mars/" { + org.eclipse.osgi lazy +} \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd new file mode 100644 index 000000000..5384a9a21 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20150124073747-Luna-SR2.tpd @@ -0,0 +1,35 @@ +target "R20150124073747" with source configurePhase +// see http://download.eclipse.org/tools/orbit/downloads/ + +location "http://download.eclipse.org/tools/orbit/downloads/drops/R20150124073747/repository/" { + org.apache.ant [1.9.2.v201404171502,1.9.2.v201404171502] + org.apache.ant.source [1.9.2.v201404171502,1.9.2.v201404171502] + org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.httpcomponents.httpcore [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpcore.source [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpclient [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.httpcomponents.httpclient.source [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] + org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] + org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] + org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] + org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] + org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] + javaewah [0.7.9.v201401101600,0.7.9.v201401101600] + javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600] + org.objenesis [1.0.0.v201105211943,1.0.0.v201105211943] + org.objenesis.source [1.0.0.v201105211943,1.0.0.v201105211943] + org.mockito [1.8.4.v201303031500,1.8.4.v201303031500] + org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500] + com.jcraft.jsch [0.1.51.v201410302000,0.1.51.v201410302000] + com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000] + org.junit [4.11.0.v201303080030,4.11.0.v201303080030] + org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030] + javax.servlet [2.5.0.v201103041518,2.5.0.v201103041518] + javax.servlet.source [2.5.0.v201103041518,2.5.0.v201103041518] + org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617] + org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617] +} \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd new file mode 100644 index 000000000..d41a5f4df --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/S20150202203538-Mars-M5.tpd @@ -0,0 +1,35 @@ +target "S20141023165154-Mars-M3" with source configurePhase +// see http://download.eclipse.org/tools/orbit/downloads/ + +location "http://download.eclipse.org/tools/orbit/downloads/drops/S20150202203538/repository/" { + org.apache.ant [1.9.4.v201410062020,1.9.4.v201410062020] + org.apache.ant.source [1.9.4.v201410062020,1.9.4.v201410062020] + org.apache.commons.compress [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.compress.source [1.6.0.v201310281400,1.6.0.v201310281400] + org.apache.commons.logging [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.commons.logging.source [1.1.1.v201101211721,1.1.1.v201101211721] + org.apache.httpcomponents.httpcore [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpcore.source [4.1.4.v201203221030,4.1.4.v201203221030] + org.apache.httpcomponents.httpclient [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.httpcomponents.httpclient.source [4.1.3.v201209201135,4.1.3.v201209201135] + org.apache.log4j [1.2.15.v201012070815,1.2.15.v201012070815] + org.apache.log4j.source [1.2.15.v201012070815,1.2.15.v201012070815] + org.kohsuke.args4j [2.0.21.v201301150030,2.0.21.v201301150030] + org.kohsuke.args4j.source [2.0.21.v201301150030,2.0.21.v201301150030] + org.hamcrest.core [1.3.0.v201303031735,1.3.0.v201303031735] + org.hamcrest.core.source [1.3.0.v201303031735,1.3.0.v201303031735] + javaewah [0.7.9.v201401101600,0.7.9.v201401101600] + javaewah.source [0.7.9.v201401101600,0.7.9.v201401101600] + org.objenesis [1.0.0.v201105211943,1.0.0.v201105211943] + org.objenesis.source [1.0.0.v201105211943,1.0.0.v201105211943] + org.mockito [1.8.4.v201303031500,1.8.4.v201303031500] + org.mockito.source [1.8.4.v201303031500,1.8.4.v201303031500] + com.jcraft.jsch [0.1.51.v201410302000,0.1.51.v201410302000] + com.jcraft.jsch.source [0.1.51.v201410302000,0.1.51.v201410302000] + org.junit [4.11.0.v201303080030,4.11.0.v201303080030] + org.junit.source [4.11.0.v201303080030,4.11.0.v201303080030] + javax.servlet [2.5.0.v201103041518,2.5.0.v201103041518] + javax.servlet.source [2.5.0.v201103041518,2.5.0.v201103041518] + org.tukaani.xz [1.3.0.v201308270617,1.3.0.v201308270617] + org.tukaani.xz.source [1.3.0.v201308270617,1.3.0.v201308270617] +} \ No newline at end of file diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd new file mode 100644 index 000000000..2e338d637 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/projects/jetty-7.6.14.tpd @@ -0,0 +1,20 @@ +target "jetty-7.6.14" with source configurePhase + +location jetty-7.6.14 "http://download.eclipse.org/jetty/updates/jetty-bundles-7.x/7.6.14.v20131031/" { + org.eclipse.jetty.client [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.client.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.continuation [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.continuation.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.http [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.http.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.io [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.io.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.security [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.security.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.server [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.server.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.servlet [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.servlet.source [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.util [7.6.14.v20131031,7.6.14.v20131031] + org.eclipse.jetty.util.source [7.6.14.v20131031,7.6.14.v20131031] +}