diff options
| author | Laurent Wouters | 2014-04-16 11:05:09 +0000 |
|---|---|---|
| committer | Laurent Wouters | 2014-04-17 13:13:00 +0000 |
| commit | 621a98627bf2dac3434242847ef2d1ecc3b020ec (patch) | |
| tree | 801b58a6ec431c818452a9f45f593ca3f446d578 /releng | |
| parent | a651be63146c825533df414bbf2fb884f35a95ac (diff) | |
| download | org.eclipse.papyrus-621a98627bf2dac3434242847ef2d1ecc3b020ec.tar.gz org.eclipse.papyrus-621a98627bf2dac3434242847ef2d1ecc3b020ec.tar.xz org.eclipse.papyrus-621a98627bf2dac3434242847ef2d1ecc3b020ec.zip | |
[releng] Moved the build configuration to Tycho
Change-Id: I6a47c3c1c3fe08b56815ab1149075984ede4e562
Signed-off-by: Laurent Wouters <laurent.wouters@cea.fr>
Diffstat (limited to 'releng')
| -rw-r--r-- | releng/TargetPlatform/.project | 11 | ||||
| -rw-r--r-- | releng/TargetPlatform/Indigo_developers.target | 47 | ||||
| -rw-r--r-- | releng/TargetPlatform/Indigo_runtime.target | 42 | ||||
| -rwxr-xr-x | releng/dev/category.xml | 12 | ||||
| -rwxr-xr-x | releng/dev/pom.xml | 29 | ||||
| -rwxr-xr-x | releng/extras/category.xml | 12 | ||||
| -rwxr-xr-x | releng/extras/pom.xml | 29 | ||||
| -rwxr-xr-x | releng/main/category.xml | 12 | ||||
| -rwxr-xr-x | releng/main/pom.xml | 29 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.feature/.project | 17 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml | 16 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/rcp/org.eclipse.papyrus.rcp.feature/license.html | 0 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml | 10 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.master/.project | 11 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs | 2 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry | 2 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.product/.project | 11 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml | 16 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/.project | 28 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs | 7 | ||||
| -rw-r--r-- | releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/rcp/org.eclipse.papyrus.rcp/pom.xml | 24 | ||||
| -rwxr-xr-x | releng/toolkit/cleaner.py | 120 | ||||
| -rwxr-xr-x | releng/toolkit/console.py | 51 | ||||
| -rwxr-xr-x | releng/toolkit/eclipse.py | 134 | ||||
| -rw-r--r-- | releng/toolkit/server/README.txt (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/README.txt) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/addDownloadStats-extra.xsl (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats-extra.xsl) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/addDownloadStats-main.xsl (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats-main.xsl) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/addDownloadStats.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/addToComposite.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addToComposite.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/addToComposite.xsl (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addToComposite.xsl) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/backupHudsonJobs.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/backupHudsonJobs.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/cronPromote.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/cronPromote.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/cronPromoteMonitor.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/cronPromoteMonitor.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-extra-nightly-tests.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-extra-nightly-tests.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-extra-nightly.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-extra-nightly.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-nightly-tests.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-nightly-tests.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-nightly.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-nightly.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-trunk-extra-nightly-tests.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-extra-nightly-tests.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-trunk-extra-nightly.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-extra-nightly.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly-3.8-tests.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly-3.8-tests.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly-tests.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly-tests.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly.xml (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly.xml) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/manualPromote.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/manualPromote_0.10.X.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote_0.10.X.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/manualPromote_0.9.X.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote_0.9.X.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/promoteFunctions.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/promoteFunctions.sh) | 0 | ||||
| -rw-r--r-- | releng/toolkit/server/updateServerSideScripts.sh (renamed from releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/updateServerSideScripts.sh) | 0 | ||||
| -rwxr-xr-x | releng/toolkit/tycho-generator.py | 234 | ||||
| -rwxr-xr-x | releng/toolkit/tycho-updater.py | 140 | ||||
| -rwxr-xr-x | releng/toolkit/xmlutils.py | 32 | ||||
| -rwxr-xr-x | releng/top-pom-dev.xml | 126 | ||||
| -rwxr-xr-x | releng/top-pom-extras.xml | 251 | ||||
| -rwxr-xr-x | releng/top-pom-main.xml | 241 | ||||
| -rwxr-xr-x[-rw-r--r--] | releng/top-pom-rcp.xml (renamed from releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml) | 71 |
60 files changed, 1536 insertions, 253 deletions
diff --git a/releng/TargetPlatform/.project b/releng/TargetPlatform/.project deleted file mode 100644 index 17ad58d066f..00000000000 --- a/releng/TargetPlatform/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>TargetPlatform</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/releng/TargetPlatform/Indigo_developers.target b/releng/TargetPlatform/Indigo_developers.target deleted file mode 100644 index c61f5bec3bd..00000000000 --- a/releng/TargetPlatform/Indigo_developers.target +++ /dev/null @@ -1,47 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.6"?>
-
-<target name="Indigo_developers" sequenceNumber="0">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
-<unit id="org.antlr.runtime.source" version="3.0.0.v200803061811"/>
-<unit id="org.apache.commons.lang.source" version="2.4.0.v201005080502"/>
-<unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20101204061544/repository"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.help.feature.group" version="1.3.0.v20101118-7i7tFE9FFt6ZopgSqKRnz0tH"/>
-<unit id="org.eclipse.jdt.source.feature.group" version="3.7.0.v20100824-0800-7z8eFcgFMTfEQG1byPJlI_d9H155"/>
-<unit id="org.eclipse.pde.source.feature.group" version="3.7.0.v20100803-7b7oFXNFEx2XmfiPhi5933"/>
-<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20100923-9fF7MHDqFsAkplGz0n61z-yU57WHoz0JdMfaI"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101116-7P7NFUFFLWUl6l510oC"/>
-<unit id="org.eclipse.pde.feature.group" version="3.7.0.v20100803-7b7oFXNFEx2XmfiPhi5933"/>
-<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20101115-9FB-FqhFr3P05j0S-HRVgSR"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.7milestones/S-3.7M4-201012081300"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.gmf.tooling.feature.group" version="2.4.0.v20101217-1532-7_7MFMTFIhIewClguWLA42l"/>
-<repository location="http://download.eclipse.org/modeling/gmp/updates/milestones/"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.acceleo.sdk.feature.group" version="3.1.0.v20101214-0511"/>
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.0.v20101215-0940"/>
-<unit id="org.eclipse.emf.facet.sdk.feature.group" version="0.1.0.v201012140927"/>
-<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.4.0.v20100428-2315-67J-95GFz01DOIuNNRTWK_NPj507"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.4.0.v20100428-2315-777N-9AZP-D1aQtjUklrYl0eU20D"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.4.0.v20100428-2315-67J-96SGR35WNqZRZfmQnghI6uFA"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.7.0.v20101213-1100-7G7W-A5WNg7SFaSXAIcORTQT_ILI"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.3.0.v20101213-1100-67C-8COMNDBIPRIFPQWRQW_KN8ZQ"/>
-<unit id="org.eclipse.gmf.feature.group" version="1.5.0.v20101215-1202-7d9C7LFYnmMD8lz-Npqqn-_gJ13R"/>
-<unit id="org.eclipse.ocl.all.sdk.feature.group" version="3.1.0.v20101209-1716"/>
-<unit id="org.eclipse.uml2.sdk.feature.group" version="3.2.0.v201010261912"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="1.0.1.v201008251220"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.epf.richtext.feature.group" version="1.6.0.201101131810"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/extra/updates/richtext"/>
-</location>
-</locations>
-</target>
diff --git a/releng/TargetPlatform/Indigo_runtime.target b/releng/TargetPlatform/Indigo_runtime.target deleted file mode 100644 index fac4a335310..00000000000 --- a/releng/TargetPlatform/Indigo_runtime.target +++ /dev/null @@ -1,42 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.6"?>
-
-<target name="Indigo_runtime" sequenceNumber="10">
-<locations>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.antlr.runtime" version="3.0.0.v200803061811"/>
-<unit id="org.antlr.runtime.source" version="3.0.0.v200803061811"/>
-<unit id="org.apache.commons.lang.source" version="2.4.0.v201005080502"/>
-<unit id="org.apache.commons.lang" version="2.4.0.v201005080502"/>
-<repository location="http://download.eclipse.org/tools/orbit/downloads/drops/S20101204061544/repository"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.help.feature.group" version="1.3.0.v20101118-7i7tFE9FFt6ZopgSqKRnz0tH"/>
-<unit id="org.eclipse.jdt.source.feature.group" version="3.7.0.v20100824-0800-7z8eFcgFMTfEQG1byPJlI_d9H155"/>
-<unit id="org.eclipse.pde.source.feature.group" version="3.7.0.v20100803-7b7oFXNFEx2XmfiPhi5933"/>
-<unit id="org.eclipse.platform.feature.group" version="3.7.0.v20100923-9fF7MHDqFsAkplGz0n61z-yU57WHoz0JdMfaI"/>
-<unit id="org.eclipse.equinox.executable.feature.group" version="3.5.0.v20101116-7P7NFUFFLWUl6l510oC"/>
-<unit id="org.eclipse.pde.feature.group" version="3.7.0.v20100803-7b7oFXNFEx2XmfiPhi5933"/>
-<unit id="org.eclipse.rcp.feature.group" version="3.7.0.v20101115-9FB-FqhFr3P05j0S-HRVgSR"/>
-<repository location="http://download.eclipse.org/eclipse/updates/3.7milestones/S-3.7M4-201012081300"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.emf.sdk.feature.group" version="2.7.0.v20101215-0940"/>
-<unit id="org.eclipse.emf.facet.sdk.feature.group" version="0.1.0.v201012140927"/>
-<unit id="org.eclipse.emf.query.sdk.feature.group" version="1.4.0.v20100428-2315-67J-95GFz01DOIuNNRTWK_NPj507"/>
-<unit id="org.eclipse.emf.transaction.sdk.feature.group" version="1.4.0.v20100428-2315-777N-9AZP-D1aQtjUklrYl0eU20D"/>
-<unit id="org.eclipse.emf.validation.sdk.feature.group" version="1.4.0.v20100428-2315-67J-96SGR35WNqZRZfmQnghI6uFA"/>
-<unit id="org.eclipse.gef.sdk.feature.group" version="3.7.0.v20101213-1100-7G7W-A5WNg7SFaSXAIcORTQT_ILI"/>
-<unit id="org.eclipse.zest.sdk.feature.group" version="1.3.0.v20101213-1100-67C-8COMNDBIPRIFPQWRQW_KN8ZQ"/>
-<unit id="org.eclipse.gmf.feature.group" version="1.5.0.v20101215-1202-7d9C7LFYnmMD8lz-Npqqn-_gJ13R"/>
-<unit id="org.eclipse.ocl.all.sdk.feature.group" version="3.1.0.v20101209-1716"/>
-<unit id="org.eclipse.uml2.sdk.feature.group" version="3.2.0.v201010261912"/>
-<unit id="org.eclipse.xtext.sdk.feature.group" version="1.0.1.v201008251220"/>
-<repository location="http://download.eclipse.org/releases/indigo"/>
-</location>
-<location includeAllPlatforms="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.epf.richtext.feature.group" version="1.6.0.201101131810"/>
-<repository location="http://download.eclipse.org/modeling/mdt/papyrus/extra/updates/richtext"/>
-</location>
-</locations>
-</target>
diff --git a/releng/dev/category.xml b/releng/dev/category.xml new file mode 100755 index 00000000000..1d43c452d33 --- /dev/null +++ b/releng/dev/category.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature id="org.eclipse.papyrus.dev.feature" url="features/org.eclipse.papyrus.dev.feature_1.0.0.qualifier.jar" version="1.0.0.qualifier"> + <category name="org.eclipse.papyrus.category"/> + </feature> + <feature id="org.eclipse.papyrus.dev.feature.source" url="features/org.eclipse.papyrus.dev.feature.source_1.0.0.qualifier.jar" version="1.0.0.qualifier"> + <category name="org.eclipse.papyrus.category"/> + </feature> + <category-def label="Papyrus Category" name="org.eclipse.papyrus.category"> + <description>Papyrus Category</description> + </category-def> +</site>
\ No newline at end of file diff --git a/releng/dev/pom.xml b/releng/dev/pom.xml new file mode 100755 index 00000000000..246dadfe828 --- /dev/null +++ b/releng/dev/pom.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../top-pom-dev.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.p2.dev</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file diff --git a/releng/extras/category.xml b/releng/extras/category.xml new file mode 100755 index 00000000000..75fdbcbcbf5 --- /dev/null +++ b/releng/extras/category.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature id="org.eclipse.papyrus.extra.feature" url="features/org.eclipse.papyrus.extra.feature_1.0.0.qualifier.jar" version="1.0.0.qualifier"> + <category name="org.eclipse.papyrus.category"/> + </feature> + <feature id="org.eclipse.papyrus.extra.feature.source" url="features/org.eclipse.papyrus.extra.feature.source_1.0.0.qualifier.jar" version="1.0.0.qualifier"> + <category name="org.eclipse.papyrus.category"/> + </feature> + <category-def label="Papyrus Category" name="org.eclipse.papyrus.category"> + <description>Papyrus Category</description> + </category-def> +</site>
\ No newline at end of file diff --git a/releng/extras/pom.xml b/releng/extras/pom.xml new file mode 100755 index 00000000000..b0bf8304c88 --- /dev/null +++ b/releng/extras/pom.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../top-pom-extras.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.p2.extras</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file diff --git a/releng/main/category.xml b/releng/main/category.xml new file mode 100755 index 00000000000..96a2939de83 --- /dev/null +++ b/releng/main/category.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<site> + <feature id="org.eclipse.papyrus.sdk.feature" url="features/org.eclipse.papyrus.sdk.feature_1.0.0.qualifier.jar" version="1.0.0.qualifier"> + <category name="org.eclipse.papyrus.category"/> + </feature> + <feature id="org.eclipse.papyrus.sdk.feature.source" url="features/org.eclipse.papyrus.sdk.feature.source_1.0.0.qualifier.jar" version="1.0.0.qualifier"> + <category name="org.eclipse.papyrus.category"/> + </feature> + <category-def label="Papyrus Category" name="org.eclipse.papyrus.category"> + <description>Papyrus Category</description> + </category-def> +</site>
\ No newline at end of file diff --git a/releng/main/pom.xml b/releng/main/pom.xml new file mode 100755 index 00000000000..6bbf0ab3404 --- /dev/null +++ b/releng/main/pom.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>org.eclipse.papyrus</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <relativePath>../top-pom-main.xml</relativePath>
+ </parent>
+
+ <artifactId>org.eclipse.papyrus.p2.main</artifactId>
+ <groupId>org.eclipse.papyrus</groupId>
+ <version>1.0.0-SNAPSHOT</version>
+ <packaging>eclipse-repository</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.eclipse.tycho</groupId>
+ <artifactId>target-platform-configuration</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <includePackedArtifacts>true</includePackedArtifacts>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.project b/releng/rcp/org.eclipse.papyrus.rcp.feature/.project deleted file mode 100644 index 3ceac2f77b2..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/.project +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.papyrus.rcp.feature</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.pde.FeatureBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.FeatureNature</nature> - </natures> -</projectDescription> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties index e11b8a96f0f..a4bee2949c0 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/build.properties @@ -1,7 +1,3 @@ bin.includes = feature.xml,\ feature.properties,\ - license.html -#root.win32.win32.x86 = win32 -#root.win32.win32.x86_64 = win64 -#root.linux.gtk.x86 = linux32 -#root.linux.gtk.x86_64 = linux64
\ No newline at end of file + license.html
\ No newline at end of file diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties index 6695a516cbf..6695a516cbf 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.properties diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml index 1ce8d4a8c48..36e344c56db 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/feature.xml @@ -33,6 +33,7 @@ http://www.eclipse.org/legal/epl-v10.html </url>
<requires>
+ <!-- Features for the Eclipse Modeling Tools distribution -->
<import feature="org.eclipse.amalgam.discovery"/>
<import feature="org.eclipse.cvs"/>
<import feature="org.eclipse.egit"/>
@@ -40,7 +41,6 @@ http://www.eclipse.org/legal/epl-v10.html <import feature="org.eclipse.emf.cdo.epp"/>
<import feature="org.eclipse.emf.compare.ide.ui.source"/>
<import feature="org.eclipse.emf.compare.source"/>
- <import feature="org.eclipse.emf.ecoretools.design"/>
<import feature="org.eclipse.emf.eef.codegen.ecore-feature"/>
<import feature="org.eclipse.emf.query.sdk"/>
<import feature="org.eclipse.emf.sdk"/>
@@ -61,13 +61,23 @@ http://www.eclipse.org/legal/epl-v10.html <import feature="org.eclipse.mylyn_feature"/>
<import feature="org.eclipse.ocl.all.sdk"/>
<import feature="org.eclipse.emf.cdo.dawn.sdk"/>
- <import feature="org.eclipse.papyrus.sdk.sources.feature"/>
- <import feature="org.eclipse.papyrus.extra.sources.feature"/>
<import feature="org.eclipse.pde"/>
<import feature="org.eclipse.rcp"/>
<import feature="org.eclipse.sdk"/>
<import feature="org.eclipse.uml2.sdk"/>
<import feature="org.eclipse.xsd.sdk"/>
+
+ <!-- Papyrus components -->
+ <import feature="org.eclipse.papyrus.sdk.feature.source"/>
+ <import feature="org.eclipse.papyrus.extra.feature.source"/>
+ <import feature="org.eclipse.papyrus.dev.feature.source"/>
+
+ <!-- Additional components -->
+ <import feature="org.eclipse.team.svn"/>
+ <import feature="org.eclipse.team.svn.revision.graph"/>
+ <import feature="org.eclipse.team.svn.mylyn"/>
+ <import feature="org.eclipse.gmf.sdk"/>
+ <import feature="org.eclipse.gmf.tooling.codegen.xtend2"/>
</requires>
<plugin
diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html b/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html index 5ef681156be..5ef681156be 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/license.html diff --git a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml index 5964327ff2c..75a6c0ce089 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.feature/pom.xml @@ -1,15 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project> <modelVersion>4.0.0</modelVersion> <parent> - <artifactId>org.eclipse.papyrus.rcp.master</artifactId> + <artifactId>org.eclipse.papyrus</artifactId> <groupId>org.eclipse.papyrus</groupId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../org.eclipse.papyrus.rcp.master</relativePath> + <relativePath>../../top-pom-rcp.xml</relativePath> </parent> - <groupId>org.eclipse.papyrus.features</groupId> + <groupId>org.eclipse.papyrus</groupId> <artifactId>org.eclipse.papyrus.rcp.feature</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.project b/releng/rcp/org.eclipse.papyrus.rcp.master/.project deleted file mode 100644 index 7cc3cdc1a8b..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.papyrus.rcp.master</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs deleted file mode 100644 index b196c64a341..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ltk.core.refactoring.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.ltk.core.refactoring.enable.project.refactoring.history=false diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry b/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry deleted file mode 100644 index 2fb76f2a8e8..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/.settings/org.eclipse.ocl.modelregistry +++ /dev/null @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<mreg:ModelRegistrySettings xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:mreg="http://www.eclipse.org/ocl/1.0/ModelRegistry"/> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/.project b/releng/rcp/org.eclipse.papyrus.rcp.product/.project deleted file mode 100644 index 996f921eba3..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/.project +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.papyrus.rcp.product</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - </buildSpec> - <natures> - </natures> -</projectDescription> diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml index f7eace2a76c..bc3dfdd91c1 100644 --- a/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp.product/pom.xml @@ -1,18 +1,19 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<?xml version="1.0" encoding="UTF-8"?> +<project> <modelVersion>4.0.0</modelVersion> - <artifactId>org.eclipse.papyrus.rcp.product</artifactId> - <packaging>eclipse-repository</packaging> <parent> + <artifactId>org.eclipse.papyrus</artifactId> <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.rcp.master</artifactId> <version>1.0.0-SNAPSHOT</version> - <relativePath>../org.eclipse.papyrus.rcp.master</relativePath> + <relativePath>../../top-pom-rcp.xml</relativePath> </parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.rcp.product</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-repository</packaging> <properties> <product-id>org.eclipse.papyrus.rcp.product</product-id> </properties> - <version>1.0.0-SNAPSHOT</version> <build> <plugins> <plugin> @@ -58,5 +59,4 @@ </plugin> </plugins> </build> - </project>
\ No newline at end of file diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.project b/releng/rcp/org.eclipse.papyrus.rcp/.project deleted file mode 100644 index 5a657096653..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp/.project +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.papyrus.rcp</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.jdt.core.javanature</nature> - </natures> -</projectDescription> diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index af0f20f97a5..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,7 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 -org.eclipse.jdt.core.compiler.compliance=1.5 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.5 diff --git a/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs b/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs deleted file mode 100644 index f897a7f1cb2..00000000000 --- a/releng/rcp/org.eclipse.papyrus.rcp/.settings/org.eclipse.m2e.core.prefs +++ /dev/null @@ -1,4 +0,0 @@ -activeProfiles= -eclipse.preferences.version=1 -resolveWorkspaceProjects=true -version=1 diff --git a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml index de5a5b12f8a..c50e5831a4f 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp/pom.xml +++ b/releng/rcp/org.eclipse.papyrus.rcp/pom.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <modelVersion>4.0.0</modelVersion> - <parent> - <artifactId>org.eclipse.papyrus.rcp.master</artifactId> - <groupId>org.eclipse.papyrus</groupId> - <version>1.0.0-SNAPSHOT</version> - <relativePath>../org.eclipse.papyrus.rcp.master</relativePath> - </parent> - <artifactId>org.eclipse.papyrus.rcp</artifactId> - <version>1.0.0-SNAPSHOT</version> - <packaging>eclipse-plugin</packaging> +<project> + <modelVersion>4.0.0</modelVersion> + <parent> + <artifactId>org.eclipse.papyrus</artifactId> + <groupId>org.eclipse.papyrus</groupId> + <version>1.0.0-SNAPSHOT</version> + <relativePath>../../top-pom-rcp.xml</relativePath> + </parent> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus.rcp</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>eclipse-plugin</packaging> </project> diff --git a/releng/toolkit/cleaner.py b/releng/toolkit/cleaner.py new file mode 100755 index 00000000000..0b6be0a45eb --- /dev/null +++ b/releng/toolkit/cleaner.py @@ -0,0 +1,120 @@ +################################################################################
+# Copyright (c) 2013 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#
+################################################################################
+
+import os # File handling
+import os.path # File path handling
+import re # Regular expressions
+import shutil # File handling
+import sys # System
+import subprocess # Process handling
+import xml.dom.minidom # Minimal XML
+
+import console # Console pretty printing
+import eclipse # Eclipse API
+import xmlutils # XML utilities
+
+
+# Print how to use this script
+def printUsage():
+ print("Usage:")
+ print(" python cleaner.py [-h | --help] [--color] <targets>")
+ print(" <targets> is the list of files and directories to clean")
+ print("Options:")
+ print(" -h, --help: print this screen")
+ print(" --color: activate console color")
+
+
+# Cleanup the given bundle
+def cleanup(bundle):
+ cleanupClasspath(bundle)
+ cleanupBuildProperties(bundle)
+
+# Cleanup the bundle's class path
+def cleanupClasspath(bundle):
+ subs = os.listdir(bundle.location)
+ if not ".classpath" in subs:
+ return
+ doc = xml.dom.minidom.parse(os.path.join(bundle.location, ".classpath"))
+ dirty = False
+ for entry in doc.getElementsByTagName("classpathentry"):
+ data = entry.getAttribute("excluding")
+ folder = entry.getAttribute("path")
+ if data is not None and len(data)>0:
+ files = data.split("|")
+ for file in files:
+ if file is not None and len(file)>0:
+ dirty = True
+ full = os.path.join(bundle.location, os.path.join(folder, os.path.join(file)))
+ print("Found " + full)
+ if full.endswith("/"):
+ subprocess.call(["git", "rm", "-r", full])
+ else:
+ subprocess.call(["git", "rm", full])
+ entry.parentNode.removeChild(entry)
+ if dirty:
+ xmlutils.output(doc, os.path.join(bundle.location, ".classpath"))
+ console.log("Bundle " + bundle.name + " => Fixed .classpath to remove excluded sources")
+
+# Cleanup the bundle's build properties
+def cleanupBuildProperties(bundle):
+ subs = os.listdir(bundle.location)
+ if not "build.properties" in subs:
+ return
+ properties = open(os.path.join(bundle.location, "build.properties"), "r")
+ found = False
+ for line in properties:
+ if line.find("src.includes") != -1:
+ found = True
+ break
+ properties.close()
+ if not found:
+ if not "about.html" in subs:
+ shutil.copy("about.html", os.path.join(bundle.location, "about.html"))
+ properties = open(os.path.join(bundle.location, "build.properties"), "a")
+ properties.write("src.includes = about.html\n")
+ properties.close()
+ console.log("Bundle " + bundle.name + " => Fixed build.properties to add src.includes")
+
+# Execute the cleanup
+def execute(targets):
+ # Build the repo
+ repo = eclipse.Repository()
+ for target in targets:
+ repo.load(target)
+ # Do the cleanup
+ for name in repo.plugins:
+ cleanup(repo.plugins[name])
+ for name in repo.features:
+ cleanup(repo.features[name])
+
+# Main script
+if __name__=="__main__":
+ # Checks the arguments
+ nb = len(sys.argv)
+ if nb <= 1:
+ printUsage()
+ sys.exit(1)
+
+ targets = []
+ # Parse the arguments
+ for arg in sys.argv[1:]:
+ if arg == "-h" or arg == "--help":
+ printUsage()
+ sys.exit(0)
+ elif arg == console.CLI_COLOR:
+ console.USE_COLOR = True
+ else:
+ targets.append(arg)
+ # Execute
+ code = execute(targets)
+ sys.exit(code)
\ No newline at end of file diff --git a/releng/toolkit/console.py b/releng/toolkit/console.py new file mode 100755 index 00000000000..9739fa3032f --- /dev/null +++ b/releng/toolkit/console.py @@ -0,0 +1,51 @@ +################################################################################
+# Copyright (c) 2014 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#
+################################################################################
+
+# Log levels
+LEVELS={
+ "DEBUG":0,
+ "INFO":0,
+ "WARNING":93,
+ "ERROR":91
+}
+
+# Color codes for the console colors
+COLORS={
+ "ENDC":0, # RESET COLOR
+ "GREY70":97,
+ "RED":91,
+ "YELLOW":93,
+ "BLUE":94,
+ "PURPLE":95,
+ "GREEN":92,
+}
+
+# Activate/Deactivate the use of console colors
+USE_COLOR=False
+# Command line option to activate colors
+CLI_COLOR="--color"
+
+# Logs the given message at the given level
+def log(message, level="INFO"):
+ print(__getFormatted(message, level))
+
+# Gets the formatted string for the given message and level
+def __getFormatted(message, level):
+ if USE_COLOR and LEVELS[level] > 0:
+ return __termcode(LEVELS[level]) + "[" + level + "] " + message + __termcode(0)
+ else:
+ return "[" + level + "] " + message
+
+# Gets the string for the given console color
+def __termcode(num):
+ return "\033[%sm"%num
\ No newline at end of file diff --git a/releng/toolkit/eclipse.py b/releng/toolkit/eclipse.py new file mode 100755 index 00000000000..0e5180ddec1 --- /dev/null +++ b/releng/toolkit/eclipse.py @@ -0,0 +1,134 @@ +################################################################################
+# Copyright (c) 2014 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#
+################################################################################
+
+# This script provides an API to load and manipulate
+# Eclipse plugins and features in a code repository
+
+import os # File handling
+import os.path # File path handling
+import re # Regular expressions
+import xml.dom.minidom # Minimal XML
+
+# Represents an Eclipse bundle
+class Bundle:
+ # Constructor
+ def __init__(self, location):
+ # The name as the last element of the path (folder name)
+ self.name = os.path.basename(location)
+ # The folder
+ self.location = location
+
+
+# Represents an Eclipse plugin
+class Plugin(Bundle):
+ def __init__(self, location):
+ Bundle.__init__(self, location)
+ # Initializes the list of dependencies
+ self.dependencies=[]
+ # Initializes the manifest data
+ self.properties={}
+ # Load the data from manifest
+ manifest = open(os.path.join(os.path.join(location, "META-INF"), "MANIFEST.MF"), "r")
+ onDep = False
+ for line in manifest:
+ if line.startswith("Require-Bundle:") or onDep:
+ m = re.search("[a-zA-Z_][a-zA-Z_0-9]+(\\.[a-zA-Z_][a-zA-Z_0-9]+)+", line)
+ dep = m.group(0)
+ self.dependencies.append(dep)
+ onDep = line.endswith(",")
+ elif line.startswith("Bundle-"):
+ m = re.match("Bundle-(\\w+): (.*)", line)
+ self.properties[m.group(1)] = m.group(2)
+ manifest.close()
+
+
+# Represents an Eclipse feature
+class Feature(Bundle):
+ def __init__(self, location):
+ Bundle. __init__(self, location)
+ # Initializes the list of the included features
+ self.included=[]
+ # Initializes the list of the plugins
+ self.plugins=[]
+ # Load the content
+ doc = xml.dom.minidom.parse(os.path.join(location, "feature.xml"))
+ for node in doc.getElementsByTagName("plugin"):
+ id = node.getAttribute("id")
+ self.plugins.append(id)
+ for node in doc.getElementsByTagName("includes"):
+ id = node.getAttribute("id")
+ self.included.append(id)
+
+
+# Represents a repository of Eclipse plugins and features
+class Repository:
+ def __init__(self):
+ # Initializes a dictionary of plugins indexed by name
+ self.plugins={}
+ # Initializes a dictionary of features indexed by name
+ self.features={}
+
+ # Recursively load plugins and features in the given directory
+ def load(self, dir):
+ subs = os.listdir(dir)
+ if "META-INF" in subs:
+ # this is a plugin
+ plugin = Plugin(dir)
+ self.plugins[plugin.name] = plugin
+ return
+ if "feature.xml" in subs:
+ # this is a feature
+ feature = Feature(dir)
+ self.features[feature.name] = feature
+ return
+ for name in subs:
+ sub = os.path.join(dir, name)
+ if os.path.isdir(sub):
+ self.load(sub)
+
+ # Checks the consistency of the repository to check whether
+ # all required features and plugins are present
+ # The given pattern is used to determine whether a feature or
+ # plugin is required ; matching means required
+ # This method returns the list of the missing features and plugins
+ def check(self, includePattern, excludePattern):
+ result=[]
+ for name in self.features:
+ if match(name, excludePattern):
+ continue
+ feature = self.features[name]
+ for included in feature.included:
+ if match(included, excludePattern):
+ continue
+ if not included in self.features and match(included, includePattern):
+ result.append(included)
+ for plugin in feature.plugins:
+ if match(plugin, excludePattern):
+ continue
+ if not plugin in self.plugins and match(plugin, includePattern):
+ result.append(plugin)
+ for name in self.plugins:
+ if match(name, excludePattern):
+ continue
+ plugin = self.plugins[name]
+ for dep in plugin.dependencies:
+ if match(dep, excludePattern):
+ continue
+ if not dep in self.plugins and match(dep, includePattern):
+ result.append(dep)
+ return result
+
+
+def match(value, pattern):
+ m = re.match(pattern, value)
+ return (m is not None)
\ No newline at end of file diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/README.txt b/releng/toolkit/server/README.txt index 71b81544307..71b81544307 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/README.txt +++ b/releng/toolkit/server/README.txt diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats-extra.xsl b/releng/toolkit/server/addDownloadStats-extra.xsl index 55ab3d4a3c1..55ab3d4a3c1 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats-extra.xsl +++ b/releng/toolkit/server/addDownloadStats-extra.xsl diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats-main.xsl b/releng/toolkit/server/addDownloadStats-main.xsl index eda7ed538d7..eda7ed538d7 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats-main.xsl +++ b/releng/toolkit/server/addDownloadStats-main.xsl diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats.sh b/releng/toolkit/server/addDownloadStats.sh index 33d635783be..33d635783be 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addDownloadStats.sh +++ b/releng/toolkit/server/addDownloadStats.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addToComposite.sh b/releng/toolkit/server/addToComposite.sh index 20d014023ee..20d014023ee 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addToComposite.sh +++ b/releng/toolkit/server/addToComposite.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addToComposite.xsl b/releng/toolkit/server/addToComposite.xsl index d96dbdf8b88..d96dbdf8b88 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/addToComposite.xsl +++ b/releng/toolkit/server/addToComposite.xsl diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/backupHudsonJobs.sh b/releng/toolkit/server/backupHudsonJobs.sh index 68b61e6575a..68b61e6575a 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/backupHudsonJobs.sh +++ b/releng/toolkit/server/backupHudsonJobs.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/cronPromote.sh b/releng/toolkit/server/cronPromote.sh index 02f14572a37..02f14572a37 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/cronPromote.sh +++ b/releng/toolkit/server/cronPromote.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/cronPromoteMonitor.sh b/releng/toolkit/server/cronPromoteMonitor.sh index 7ae3f94d7e6..7ae3f94d7e6 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/cronPromoteMonitor.sh +++ b/releng/toolkit/server/cronPromoteMonitor.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-extra-nightly-tests.xml b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-extra-nightly-tests.xml index 8f77dda72e0..8f77dda72e0 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-extra-nightly-tests.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-extra-nightly-tests.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-extra-nightly.xml b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-extra-nightly.xml index fd970cc2f79..fd970cc2f79 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-extra-nightly.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-extra-nightly.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-nightly-tests.xml b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-nightly-tests.xml index e12cd463800..e12cd463800 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-nightly-tests.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-nightly-tests.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-nightly.xml b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-nightly.xml index 97e2a363746..97e2a363746 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-0.8-maintenance-nightly.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-0.8-maintenance-nightly.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-extra-nightly-tests.xml b/releng/toolkit/server/hudsonJobs/papyrus-trunk-extra-nightly-tests.xml index 41a8bf62d51..41a8bf62d51 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-extra-nightly-tests.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-trunk-extra-nightly-tests.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-extra-nightly.xml b/releng/toolkit/server/hudsonJobs/papyrus-trunk-extra-nightly.xml index 07e02f3b109..07e02f3b109 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-extra-nightly.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-trunk-extra-nightly.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly-3.8-tests.xml b/releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly-3.8-tests.xml index a56dfb4aa1f..a56dfb4aa1f 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly-3.8-tests.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly-3.8-tests.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly-tests.xml b/releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly-tests.xml index 56975fbaef7..56975fbaef7 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly-tests.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly-tests.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly.xml b/releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly.xml index d1504bd0b2e..d1504bd0b2e 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/hudsonJobs/papyrus-trunk-nightly.xml +++ b/releng/toolkit/server/hudsonJobs/papyrus-trunk-nightly.xml diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote.sh b/releng/toolkit/server/manualPromote.sh index 8f46e2bf2a5..8f46e2bf2a5 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote.sh +++ b/releng/toolkit/server/manualPromote.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote_0.10.X.sh b/releng/toolkit/server/manualPromote_0.10.X.sh index 0a8e7b6d598..0a8e7b6d598 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote_0.10.X.sh +++ b/releng/toolkit/server/manualPromote_0.10.X.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote_0.9.X.sh b/releng/toolkit/server/manualPromote_0.9.X.sh index 2af3ac95ab6..2af3ac95ab6 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/manualPromote_0.9.X.sh +++ b/releng/toolkit/server/manualPromote_0.9.X.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/promoteFunctions.sh b/releng/toolkit/server/promoteFunctions.sh index d59bad9846f..d59bad9846f 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/promoteFunctions.sh +++ b/releng/toolkit/server/promoteFunctions.sh diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/updateServerSideScripts.sh b/releng/toolkit/server/updateServerSideScripts.sh index ea5de711c02..ea5de711c02 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/serverConfig/updateServerSideScripts.sh +++ b/releng/toolkit/server/updateServerSideScripts.sh diff --git a/releng/toolkit/tycho-generator.py b/releng/toolkit/tycho-generator.py new file mode 100755 index 00000000000..dbf24fff7fb --- /dev/null +++ b/releng/toolkit/tycho-generator.py @@ -0,0 +1,234 @@ +################################################################################
+# Copyright (c) 2014 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#
+################################################################################
+
+import os # File handling
+import os.path # File path handling
+import re # Regular expressions
+import sys # System
+import xml.dom.minidom # Minimal XML
+
+import console # Console pretty printing
+import eclipse # Eclipse API
+import xmlutils # XML utilities
+
+
+# Represents a build target
+class Target:
+ def __init__(self, name, pom, site, feature):
+ # The target's name
+ self.name = name
+ # The path to the top pom.xml file
+ self.pom = pom
+ # The path to the repository (update site) project
+ self.site = site
+ # The target's top feature
+ self.feature = feature
+
+
+# General constants
+MAVEN_MODEL_VERSION="4.0.0"
+
+# Product constants
+PRODUCT_VERSION = "1.0.0"
+PRODUCT_CATEGORY_ID = "org.eclipse.papyrus.category"
+PRODUCT_CATEGORY_LABEL = "Papyrus Category"
+PRODUCT_CATEGORY_DESC = PRODUCT_CATEGORY_LABEL
+PRODUCT_GROUP = "org.eclipse.papyrus"
+
+# Generator targets configuration
+TARGETS = [ Target( "main",
+ "releng/top-pom-main.xml",
+ "releng/main",
+ "org.eclipse.papyrus.sdk.feature"),
+ Target( "extras",
+ "releng/top-pom-extras.xml",
+ "releng/extras",
+ "org.eclipse.papyrus.extra.feature"),
+ Target( "dev",
+ "releng/top-pom-dev.xml",
+ "releng/dev",
+ "org.eclipse.papyrus.dev.feature") ]
+# Generator inputs configuration
+INPUTS = [
+ "plugins",
+ "extraplugins",
+ "features/papyrus-main-features",
+ "features/papyrus-extra-features",
+ "features/papyrus-dev-features"
+]
+# Pattern to recognize required plugin to include in the build
+PATTERN_INCLUDE = "org\\.eclipse\\.papyrus\\..*"
+# Pattern to recognize required plugin to exclude from the build
+PATTERN_EXCLUDE = "(.*\\.source.feature)|(.*\\.tests)"
+
+
+# Print how to use this script
+def printUsage():
+ print("Usage:")
+ print(" python tycho-generator.py [-h | --help] [--color]")
+ print("Options:")
+ print(" -h, --help: print this screen")
+ print(" --color: activate console color")
+
+
+# Generate the Tycho data and files
+def generate(inputs, targets, includePattern, excludePattern):
+ # Build repo
+ console.log("== Preparing the repository ...")
+ repo = getRepo(inputs, includePattern, excludePattern)
+ if repo is None:
+ return 1
+ # Setup the bundles' target data
+ for target in targets:
+ addTarget(repo, target.feature, target)
+ # Generate all bundles POM
+ console.log("== Generating POM for features ...")
+ for name in iter(sorted(repo.features)):
+ if not generateBundlePOM(repo.features[name], "eclipse-feature"):
+ return 2
+ console.log("== Generating POM for plugins ...")
+ for name in iter(sorted(repo.plugins)):
+ if not generateBundlePOM(repo.plugins[name], "eclipse-plugin"):
+ return 2
+ # Update the targets' top pom.xml
+ console.log("== Updating the module references in top POMs ...")
+ for target in targets:
+ updateModules(repo, target)
+ return 0
+
+
+# Gets an initialized repository of features and plugins
+# includePattern is used to identify required plugins and features
+# excludePattern is used to ignore MISSING plugins and features
+def getRepo(inputs, includePattern, excludePattern):
+ # Build the repo
+ repo = eclipse.Repository()
+ for input in inputs:
+ repo.load(input)
+ # Check for missing bundles
+ missing = repo.check(includePattern, excludePattern)
+ for m in missing:
+ console.log("Missing bundle " + m, "ERROR")
+ if len(missing) > 0:
+ return None
+ # Initializes the targets
+ for name in repo.plugins:
+ repo.plugins[name].targets = []
+ for name in repo.features:
+ repo.features[name].targets = []
+ return repo
+
+
+# Recursively add a target to a feature, its included features and its plugins
+def addTarget(repo, featureName, target):
+ # If the feature is missing
+ if not featureName in repo.features:
+ return
+ feature = repo.features[featureName]
+ # Add the target is required
+ if not target in feature.targets:
+ feature.targets.append(target)
+ # Traverse all sub-features
+ for included in feature.included:
+ addTarget(repo, included, target)
+ # Traverse all plugins
+ for name in feature.plugins:
+ if name in repo.plugins:
+ plugin = repo.plugins[name]
+ if not target in plugin.targets:
+ plugin.targets.append(target)
+
+
+# Generate the pom.xml file for the given bundle and given packaging
+def generateBundlePOM(bundle, packaging):
+ if len(bundle.targets) == 0:
+ console.log("Bundle " + bundle.name + " has no target => skipped", "WARNING")
+ return True
+ if len(bundle.targets) >= 2:
+ console.log("Bundle " + bundle.name + " has more than one target:", "ERROR")
+ for target in bundle.targets:
+ console.log("\t" + target, "ERROR")
+ return False
+ if os.path.isfile(os.path.join(bundle.location, "pom.xml")):
+ console.log("Bundle " + bundle.name + " already has pom.xml => skipped")
+ return True
+ relative = os.path.relpath(".", bundle.location)
+ relative = os.path.join(relative, bundle.targets[0].pom)
+ impl = xml.dom.minidom.getDOMImplementation()
+ doc = impl.createDocument(None, "project", None)
+ project = doc.documentElement
+ appendText(doc, project, "modelVersion", MAVEN_MODEL_VERSION)
+ parent = doc.createElement("parent")
+ project.appendChild(parent)
+ appendTychoRef(doc, parent, PRODUCT_GROUP)
+ appendText(doc, parent, "relativePath", relative)
+ appendTychoRef(doc, project, bundle.name)
+ appendText(doc, project, "packaging", packaging)
+ xmlutils.output(doc, os.path.join(bundle.location, "pom.xml"))
+ console.log("Bundle " + bundle.name + " POM generated for target " + bundle.targets[0].name)
+ return True
+
+
+# Append an element node with the given tag and content
+def appendText(doc, parent, tag, content):
+ child = doc.createElement(tag)
+ parent.appendChild(child)
+ child.appendChild(doc.createTextNode(content))
+
+
+# Append Tycho-specific data
+def appendTychoRef(doc, parent, id):
+ appendText(doc, parent, "artifactId", id)
+ appendText(doc, parent, "groupId", PRODUCT_GROUP)
+ appendText(doc, parent, "version", PRODUCT_VERSION + "-SNAPSHOT")
+
+
+# Updates the modules for the given target
+def updateModules(repo, target):
+ doc = xml.dom.minidom.parse(target.pom)
+ modules = doc.getElementsByTagName("modules")[0]
+ for module in modules.getElementsByTagName("module"):
+ modules.removeChild(module)
+ for name in iter(sorted(repo.features)):
+ feature = repo.features[name]
+ if target in feature.targets:
+ modules.appendChild(getBundleModuleNode(feature, doc, target))
+ for name in iter(sorted(repo.plugins)):
+ plugin = repo.plugins[name]
+ if target in plugin.targets:
+ modules.appendChild(getBundleModuleNode(plugin, doc, target))
+ repoNode = doc.createElement("module")
+ repoNode.appendChild(doc.createTextNode(target.name))
+ modules.appendChild(repoNode)
+ xmlutils.output(doc, target.pom)
+ console.log("Updated top POM for target " + target.name)
+
+# Get the path to this bundle relatively to the given target's top POM
+def getBundleModuleNode(bundle, doc, target):
+ child = doc.createElement("module")
+ child.appendChild(doc.createTextNode(os.path.join("..", bundle.location)))
+ return child
+
+
+# Main script
+if __name__=="__main__":
+ # Checks the arguments
+ for arg in sys.argv[1:]:
+ if arg == "-h" or arg == "--help":
+ printUsage()
+ sys.exit(0)
+ elif arg == console.CLI_COLOR:
+ console.USE_COLOR = True
+ # Execute the generation
+ code = generate(INPUTS, TARGETS, PATTERN_INCLUDE, PATTERN_EXCLUDE)
+ sys.exit(code)
\ No newline at end of file diff --git a/releng/toolkit/tycho-updater.py b/releng/toolkit/tycho-updater.py new file mode 100755 index 00000000000..70ca7236d98 --- /dev/null +++ b/releng/toolkit/tycho-updater.py @@ -0,0 +1,140 @@ +################################################################################
+# Copyright (c) 2014 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#
+################################################################################
+
+# This script provides an API to update the URI
+# of P2 update sites in Tycho pom.xml using the
+# Eclipse SIMREL repository
+
+import os.path # File path handling
+import re # Regular expressions
+import shutil # Shell utilities
+import subprocess # OS Process management
+import sys # System
+import xml.dom.minidom # Minimal XML
+
+import console # Console pretty printing
+import xmlutils # XML utilities
+
+
+# URI of the git SIMREL repository
+SIMREL_GIT="http://git.eclipse.org/gitroot/simrel/org.eclipse.simrel.build.git"
+
+# Path of the local SIMREL repository
+SIMREL_PATH="simrel"
+
+
+# Print how to use this script
+def printUsage():
+ print("Usage:")
+ print(" python tycho-updater.py [-h | --help] [--color] [--simrel <local>] <targets>")
+ print(" <targets> is the list of file to update")
+ print("Options:")
+ print(" -h, --help: print this screen")
+ print(" --color: activate console color")
+ print(" --simrel <local>: use the SIMREL repo at the given <local> path")
+
+# Get the update site URL for the given identifier
+# An identifier is a simple name with an optional '[index]' suffix where index is the integer index of the update site to use
+def getURLFor(simrel, id):
+ m = re.match("(?P<id>(\\w|-)+)(\\[(?P<index>\\d+)\\])?", id)
+ if m is None:
+ return None
+ file = simrel + "/" + m.group("id") + ".b3aggrcon"
+ index = m.group("index")
+ if index is None:
+ index = 0
+ else:
+ index = int(index)
+ if os.path.isfile(file):
+ content = xml.dom.minidom.parse(simrel + "/" + m.group("id") + ".b3aggrcon")
+ location = content.getElementsByTagName("repositories")[index].getAttribute("location")
+ return location
+ return None
+
+# Update the given Tycho pom.xml file with new update sites
+def update(simrel, target):
+ console.log("Reading " + target)
+ pom = xml.dom.minidom.parse(target)
+
+ console.log("Updating " + target)
+ for node in pom.getElementsByTagName("repository"):
+ id = node.getElementsByTagName("id")[0].childNodes[0].data
+ url = node.getElementsByTagName("url")[0].childNodes[0].data
+ data = getURLFor(simrel, id)
+ if data == None:
+ console.log(id + " => no matching repository found", "WARNING")
+ else:
+ if data == url:
+ console.log(id + " => no change")
+ else:
+ node.getElementsByTagName("url")[0].childNodes[0].data = data
+ console.log(id + " => updated to " + data)
+
+ console.log("Writing back " + target)
+ xmlutils.output(pom, target)
+
+
+
+# Main script
+if __name__=="__main__":
+ # Checks the arguments
+ nb = len(sys.argv)
+ if nb <= 1:
+ printUsage()
+ sys.exit(1)
+
+ # Initializes the local data
+ local = False
+ simrel = SIMREL_PATH
+ targets = []
+
+ # Parse the arguments
+ expectLocal = False
+ for arg in sys.argv[1:]:
+ if arg == "-h" or arg == "--help":
+ printUsage()
+ sys.exit(0)
+ elif arg == console.CLI_COLOR:
+ console.USE_COLOR = True
+ elif arg == "--simrel":
+ expectLocal = True
+ elif expectLocal:
+ local = True
+ simrel = arg
+ expectLocal = False
+ else:
+ targets.append(arg)
+
+ # Checks the data
+ if expectLocal:
+ console.log("Expected path the local SIMREL repo", "ERROR")
+ printUsage()
+ sys.exit(1)
+ if len(targets) == 0:
+ console.log("No target given", "ERROR")
+ printUsage()
+ sys.exit(1)
+
+ # Clone the SIMREL repo if needed
+ if local:
+ console.log("Using local simrel at " + simrel)
+ else:
+ console.log("Cloning the simrel repository from Eclipse")
+ subprocess.call(["git", "clone", SIMREL_GIT, simrel])
+ # Do the updates
+ for target in targets:
+ update(simrel, target)
+ # Cleanup if required
+ if not local:
+ console.log("Cleaning up ...")
+ shutil.rmtree(simrel)
\ No newline at end of file diff --git a/releng/toolkit/xmlutils.py b/releng/toolkit/xmlutils.py new file mode 100755 index 00000000000..cb206f4e57e --- /dev/null +++ b/releng/toolkit/xmlutils.py @@ -0,0 +1,32 @@ +################################################################################
+# Copyright (c) 2014 CEA LIST.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+# Laurent Wouters laurent.wouters@cea.fr - Initial API and implementation
+#
+################################################################################
+
+# System imports
+import xml.dom.minidom # Minimal XML
+
+
+# encoding of the XML files
+XML_ENCODING="UTF-8"
+# identation string
+XML_IDENT="\t"
+# new line string
+XML_NEWLINE="\n"
+
+
+# Outputs the XML document in the given file with pretty printing
+def output(document, file):
+ document.normalize()
+ content = XML_NEWLINE.join([line for line in document.toprettyxml(XML_IDENT, XML_NEWLINE, XML_ENCODING).split(XML_NEWLINE) if line.strip()])
+ output = open(file, "w")
+ output.write(content)
+ output.close()
\ No newline at end of file diff --git a/releng/top-pom-dev.xml b/releng/top-pom-dev.xml new file mode 100755 index 00000000000..c7033223625 --- /dev/null +++ b/releng/top-pom-dev.xml @@ -0,0 +1,126 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>dev</module> + </modules> + <properties> + <tycho-version>0.20.0</tycho-version> + <tychoExtrasVersion>0.20.0</tychoExtrasVersion> + </properties> + <repositories> + <repository> + <id>eclipse</id> + <layout>p2</layout> + <url>http://download.eclipse.org/releases/luna</url> + </repository> + <repository> + <id>ep</id> + <layout>p2</layout> + <url>http://download.eclipse.org/eclipse/updates/4.4</url> + </repository> + <repository> + <id>emf-cdo</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20140312-0256</url> + </repository> + <repository> + <id>papyrus-main</id> + <layout>p2</layout> + <url>${papyrus.repo.main}</url> + </repository> + </repositories> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <optimize>true</optimize> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/releng/top-pom-extras.xml b/releng/top-pom-extras.xml new file mode 100755 index 00000000000..8e9558a93ce --- /dev/null +++ b/releng/top-pom-extras.xml @@ -0,0 +1,251 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>extras</module> + </modules> + <properties> + <tycho-version>0.20.0</tycho-version> + <tychoExtrasVersion>0.20.0</tychoExtrasVersion> + </properties> + <repositories> + <repository> + <id>papyrus-main</id> + <layout>p2</layout> + <url>${papyrus.repo.main}</url> + </repository> + <repository> + <id>birt</id> + <layout>p2</layout> + <url>http://download.eclipse.org/birt/update-site/luna-interim/</url> + </repository> + <repository> + <id>cdt</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/cdt/builds/luna/milestones</url> + </repository> + <repository> + <id>emf</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/updates/</url> + </repository> + <repository> + <id>emf-cdo</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20140312-0256</url> + </repository> + <repository> + <id>emf-compare</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.0/S201403111515</url> + </repository> + <repository> + <id>emf-emf</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/emf/updates/milestones/</url> + </repository> + <repository> + <id>emft-emffacet</id> + <layout>p2</layout> + <url>http://download.eclipse.org/facet/updates/integration/0.4.0/I201402271523/</url> + </repository> + <repository> + <id>emft-mwe</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201403111231/mwe</url> + </repository> + <repository> + <id>emf-transaction</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones</url> + </repository> + <repository> + <id>emf-validation</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/validation/updates/milestones</url> + </repository> + <repository> + <id>ep</id> + <layout>p2</layout> + <url>http://download.eclipse.org/eclipse/updates/4.4milestones/S-4.4M6-201403061200/</url> + </repository> + <repository> + <id>gef</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/gef/updates/milestones</url> + </repository> + <repository> + <id>gmp-gmf-notation</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones</url> + </repository> + <repository> + <id>gmp-gmf-runtime</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones</url> + </repository> + <repository> + <id>gmf-tooling</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.M6a</url> + </repository> + <repository> + <id>m2m-atl</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mmt/atl/updates/milestones/3.5/</url> + </repository> + <repository> + <id>m2t-acceleo</id> + <layout>p2</layout> + <url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201403120947</url> + </repository> + <repository> + <id>m2t-xpand</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201403111353/</url> + </repository> + <repository> + <id>mdt-modisco</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/modisco/updates/integration/0.12.0/I201401201815/</url> + </repository> + <repository> + <id>mdt-ocl</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212</url> + </repository> + <repository> + <id>mdt-uml2</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0-I-builds</url> + </repository> + <repository> + <id>mmt-qvto</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201403110437</url> + </repository> + <repository> + <id>mylyn</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mylyn/snapshots/3.11</url> + </repository> + <repository> + <id>nattable</id> + <layout>p2</layout> + <url>http://download.eclipse.org/nattable/releases/1.0.1/repository/</url> + </repository> + <repository> + <id>orbit</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository</url> + </repository> + <repository> + <id>subversive</id> + <layout>p2</layout> + <url>http://download.eclipse.org/technology/subversive/2.0/luna-site/</url> + </repository> + <repository> + <id>tmf-xtext</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201403111428/</url> + </repository> + <repository> + <id>webtools</id> + <layout>p2</layout> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.6.0/S-3.6.0M6-20140310170306/repository/</url> + </repository> + </repositories> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <optimize>true</optimize> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/releng/top-pom-main.xml b/releng/top-pom-main.xml new file mode 100755 index 00000000000..5c0cc04f3bb --- /dev/null +++ b/releng/top-pom-main.xml @@ -0,0 +1,241 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>org.eclipse.papyrus</groupId> + <artifactId>org.eclipse.papyrus</artifactId> + <version>1.0.0-SNAPSHOT</version> + <packaging>pom</packaging> + <modules> + <module>main</module> + </modules> + <properties> + <tycho-version>0.20.0</tycho-version> + <tychoExtrasVersion>0.20.0</tychoExtrasVersion> + </properties> + <repositories> + <repository> + <id>birt</id> + <layout>p2</layout> + <url>http://download.eclipse.org/birt/update-site/luna-interim/</url> + </repository> + <repository> + <id>emf</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/updates/</url> + </repository> + <repository> + <id>emf-compare</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/compare/updates/milestones/3.0/S201403111515</url> + </repository> + <repository> + <id>emf-emf</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/emf/updates/milestones/</url> + </repository> + <repository> + <id>emft-emffacet</id> + <layout>p2</layout> + <url>http://download.eclipse.org/facet/updates/integration/0.4.0/I201402271523/</url> + </repository> + <repository> + <id>emft-mwe[0]</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201403111231/mwe</url> + </repository> + <repository> + <id>emft-mwe[1]</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emft/mwe/updates/milestones/S201403111450/mwe2lang</url> + </repository> + <repository> + <id>emf-transaction</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/transaction/updates/milestones</url> + </repository> + <repository> + <id>emf-validation</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/validation/updates/milestones</url> + </repository> + <repository> + <id>ep</id> + <layout>p2</layout> + <url>http://download.eclipse.org/eclipse/updates/4.4milestones/S-4.4M6-201403061200/</url> + </repository> + <repository> + <id>gef</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/gef/updates/milestones</url> + </repository> + <repository> + <id>gmp-gmf-notation</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones</url> + </repository> + <repository> + <id>gmp-gmf-runtime</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones</url> + </repository> + <repository> + <id>gmf-tooling</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.M6a</url> + </repository> + <repository> + <id>m2m-atl</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mmt/atl/updates/milestones/3.5/</url> + </repository> + <repository> + <id>m2t-acceleo</id> + <layout>p2</layout> + <url>http://download.eclipse.org/acceleo/updates/milestones/3.5/S201403120947</url> + </repository> + <repository> + <id>m2t-xpand</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/m2t/xpand/updates/milestones/S201403111353/</url> + </repository> + <repository> + <id>mdt-modisco</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/modisco/updates/integration/0.12.0/I201401201815/</url> + </repository> + <repository> + <id>mdt-ocl</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/ocl/updates/milestones/5.0.0/S201403101212</url> + </repository> + <repository> + <id>mdt-uml2</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0-I-builds</url> + </repository> + <repository> + <id>mmt-qvto</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mmt/qvto/updates/milestones/3.4.0/S201403110437</url> + </repository> + <repository> + <id>mylyn</id> + <layout>p2</layout> + <url>http://download.eclipse.org/mylyn/snapshots/3.11</url> + </repository> + <repository> + <id>nattable</id> + <layout>p2</layout> + <url>http://download.eclipse.org/nattable/releases/1.0.1/repository/</url> + </repository> + <repository> + <id>orbit</id> + <layout>p2</layout> + <url>http://download.eclipse.org/tools/orbit/downloads/drops/R20130517111416/repository</url> + </repository> + <repository> + <id>subversive</id> + <layout>p2</layout> + <url>http://download.eclipse.org/technology/subversive/2.0/luna-site/</url> + </repository> + <repository> + <id>tmf-xtext</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/head/S201403111428/</url> + </repository> + <repository> + <id>webtools</id> + <layout>p2</layout> + <url>http://download.eclipse.org/webtools/downloads/drops/R3.6.0/S-3.6.0M6-20140310170306/repository/</url> + </repository> + </repositories> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>2.6</version> + <configuration> + <encoding>UTF-8</encoding> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-compiler-plugin</artifactId> + <version>${tycho-version}</version> + <configuration> + <source>1.6</source> + <target>1.6</target> + <optimize>true</optimize> + <showWarnings>true</showWarnings> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-maven-plugin</artifactId> + <version>${tycho-version}</version> + <extensions>true</extensions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>target-platform-configuration</artifactId> + <version>${tycho-version}</version> + <configuration> + <environments> + <environment> + <os>win32</os> + <ws>win32</ws> + <arch>x86_64</arch> + </environment> + </environments> + </configuration> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-repository-plugin</artifactId> + <version>${tycho-version}</version> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-source-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>plugin-source</id> + <goals> + <goal>plugin-source</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tychoExtrasVersion}</version> + <executions> + <execution> + <id>source-feature</id> + <phase>package</phase> + <goals> + <goal>source-feature</goal> + </goals> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho-version}</version> + <executions> + <execution> + <id>attach-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project>
\ No newline at end of file diff --git a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml b/releng/top-pom-rcp.xml index 94b2523b4d2..1492d1aaa08 100644..100755 --- a/releng/rcp/org.eclipse.papyrus.rcp.master/pom.xml +++ b/releng/top-pom-rcp.xml @@ -1,30 +1,39 @@ <?xml version="1.0" encoding="UTF-8"?> -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project> <modelVersion>4.0.0</modelVersion> <groupId>org.eclipse.papyrus</groupId> - <artifactId>org.eclipse.papyrus.rcp.master</artifactId> + <artifactId>org.eclipse.papyrus</artifactId> <version>1.0.0-SNAPSHOT</version> <packaging>pom</packaging> - - <!-- tycho requires maven >= 3.0 --> - <prerequisites> - <maven>3.0</maven> - </prerequisites> - - + <modules> + <module>rcp/org.eclipse.papyrus.rcp</module> + <module>rcp/org.eclipse.papyrus.rcp.feature</module> + <module>rcp/org.eclipse.papyrus.rcp.product</module> + </modules> <properties> - <tycho-version>0.19.0</tycho-version> + <tycho-version>0.20.0</tycho-version> + <tychoExtrasVersion>0.20.0</tychoExtrasVersion> </properties> <repositories> - <!-- configure p2 repository to resolve against --> + <!-- Eclipse MDT components --> <repository> - <id>Luna</id> + <id>eclipse</id> <layout>p2</layout> <url>http://download.eclipse.org/releases/luna</url> </repository> <repository> + <id>ep</id> + <layout>p2</layout> + <url>http://download.eclipse.org/eclipse/updates/4.4</url> + </repository> + <repository> + <id>emf-cdo</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20140312-0256</url> + </repository> + + <!-- Papyrus components --> + <repository> <id>papyrus-main</id> <layout>p2</layout> <url>${papyrus.repo.main}</url> @@ -35,19 +44,36 @@ <url>${papyrus.repo.extras}</url> </repository> <repository> - <id>cdo-dawn</id> + <id>papyrus-dev</id> <layout>p2</layout> - <url>http://download.eclipse.org/modeling/emf/cdo/drops/S20140129-1205</url> + <url>${papyrus.repo.dev}</url> </repository> + + <!-- Additional components --> <repository> - <id>uml-5</id> + <id>subversive</id> <layout>p2</layout> - <url>http://download.eclipse.org/modeling/mdt/uml2/updates/5.0-I-builds/I201403011958</url> + <url>http://download.eclipse.org/technology/subversive/2.0/update-site/</url> </repository> <repository> - <id>eclipse-update</id> + <id>gmp-gmf-notation</id> <layout>p2</layout> - <url>http://download.eclipse.org/eclipse/updates/4.4</url> + <url>http://download.eclipse.org/modeling/gmp/gmf-notation/updates/milestones</url> + </repository> + <repository> + <id>gmp-gmf-runtime</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-runtime/updates/milestones</url> + </repository> + <repository> + <id>gmf-tooling</id> + <layout>p2</layout> + <url>http://download.eclipse.org/modeling/gmp/gmf-tooling/updates/milestones-3.2.M6a</url> + </repository> + <repository> + <id>otdt</id> + <layout>p2</layout> + <url>http://download.eclipse.org/objectteams/updates/ot2.2/</url> </repository> </repositories> <build> @@ -117,9 +143,4 @@ </plugin> </plugins> </build> - <modules> - <module>../org.eclipse.papyrus.rcp</module> - <module>../org.eclipse.papyrus.rcp.feature</module> - <module>../org.eclipse.papyrus.rcp.product</module> - </modules> </project> |