diff options
| author | Lars Vogel | 2016-03-04 09:53:13 +0000 |
|---|---|---|
| committer | Lars Vogel | 2016-03-04 19:27:31 +0000 |
| commit | 8de1d86a34b0e598d94494bd3dd958daa3c6a2ce (patch) | |
| tree | f8940d19644139981f478f956effb5982e7d4cad | |
| parent | 8a3514717601b485d78e71c33e88b75c62484f56 (diff) | |
| parent | f6674ff15d54439d36a4f0c35f547d369c67254e (diff) | |
| download | eclipse.pde.ui-8de1d86a34b0e598d94494bd3dd958daa3c6a2ce.tar.gz eclipse.pde.ui-8de1d86a34b0e598d94494bd3dd958daa3c6a2ce.tar.xz eclipse.pde.ui-8de1d86a34b0e598d94494bd3dd958daa3c6a2ce.zip | |
Bug 475932 Merged eclipse.pde into eclipse.pde.ui repository
This merges the master branch for eclipse.pde into eclipse.pde.ui to
simplify the maintenance of the pde feature. See
https://bugs.eclipse.org/bugs/show_bug.cgi?id=475932 for details.
The URL for cloning the merged eclipse.pde repository (now integrated
into this repository) can be found via the Gerrit review server
https://git.eclipse.org/r/#/admin/projects/pde/eclipse.pde
For example:
git://git.eclipse.org/gitroot/pde/eclipse.pde
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
10 files changed, 347 insertions, 0 deletions
diff --git a/features/org.eclipse.pde-feature/.project b/features/org.eclipse.pde-feature/.project new file mode 100644 index 0000000000..fe6ac4e5e2 --- /dev/null +++ b/features/org.eclipse.pde-feature/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.pde-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/features/org.eclipse.pde-feature/.settings/org.eclipse.core.resources.prefs b/features/org.eclipse.pde-feature/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000000..99f26c0203 --- /dev/null +++ b/features/org.eclipse.pde-feature/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/<project>=UTF-8 diff --git a/features/org.eclipse.pde-feature/.settings/org.eclipse.core.runtime.prefs b/features/org.eclipse.pde-feature/.settings/org.eclipse.core.runtime.prefs new file mode 100644 index 0000000000..c522e1f4ae --- /dev/null +++ b/features/org.eclipse.pde-feature/.settings/org.eclipse.core.runtime.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1
+line.separator=\n
diff --git a/features/org.eclipse.pde-feature/build.properties b/features/org.eclipse.pde-feature/build.properties new file mode 100644 index 0000000000..7e06f09787 --- /dev/null +++ b/features/org.eclipse.pde-feature/build.properties @@ -0,0 +1,13 @@ +############################################################################### +# Copyright (c) 2000, 2012 IBM Corporation and others. +# 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: +# IBM Corporation - initial API and implementation +############################################################################### +bin.includes=\ +feature.xml,\ +feature.properties diff --git a/features/org.eclipse.pde-feature/feature.properties b/features/org.eclipse.pde-feature/feature.properties new file mode 100644 index 0000000000..b58333f795 --- /dev/null +++ b/features/org.eclipse.pde-feature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2000, 2014 IBM Corporation and others. +# 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: +# IBM Corporation - initial API and implementation +############################################################################### +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=Eclipse Plug-in Development Environment + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse.org + +# "description" property - description of the feature +description=Eclipse plug-in development environment. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2000, 2015 IBM Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors:\n\ + IBM Corporation - initial API and implementation\n +################ end of copyright property ####################################
\ No newline at end of file diff --git a/features/org.eclipse.pde-feature/feature.xml b/features/org.eclipse.pde-feature/feature.xml new file mode 100644 index 0000000000..0cb9f44911 --- /dev/null +++ b/features/org.eclipse.pde-feature/feature.xml @@ -0,0 +1,172 @@ +<?xml version="1.0" encoding="UTF-8"?> +<feature + id="org.eclipse.pde" + label="%featureName" + version="3.12.0.qualifier" + provider-name="%providerName" + license-feature="org.eclipse.license" + license-feature-version="0.0.0"> + + <description> + %description + </description> + + <copyright> + %copyright + </copyright> + + <license url="%licenseURL"> + %license + </license> + + <requires> + <import feature="org.eclipse.jdt" version="3.12.0" match="compatible"/> + </requires> + + <plugin + id="org.eclipse.pde" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.build" + download-size="0" + install-size="0" + version="0.0.0"/> + + <plugin + id="org.eclipse.pde.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.junit.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.runtime" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.doc.user" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ui.templates" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.views.log" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.objectweb.asm.tree" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.api.tools" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.api.tools.annotations" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.api.tools.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ds.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ds.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.launching" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ua.core" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ua.ui" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.ui.trace" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + + <plugin + id="org.eclipse.pde.ds.annotations" + download-size="0" + install-size="0" + version="0.0.0" + unpack="false"/> + +</feature> diff --git a/features/org.eclipse.pde-feature/forceQualifierUpdate.txt b/features/org.eclipse.pde-feature/forceQualifierUpdate.txt new file mode 100644 index 0000000000..ee221ef16b --- /dev/null +++ b/features/org.eclipse.pde-feature/forceQualifierUpdate.txt @@ -0,0 +1,5 @@ +[Bug 390930] [1.8] Update to ASM 5.x +[Bug 428468] [1.8][compiler] Finishing touches for Java 8 release - Touching bundle to pick up new ASM version +[Bug 430892] PDE feature needs to be "touched" (for I-build) +[Bug 399749] update to Orbit M7 S-build URL +[Bug 486479 ] pde feature needs to be 'touched' diff --git a/features/org.eclipse.pde-feature/pom.xml b/features/org.eclipse.pde-feature/pom.xml new file mode 100644 index 0000000000..55f59171f7 --- /dev/null +++ b/features/org.eclipse.pde-feature/pom.xml @@ -0,0 +1,63 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright (c) 2012, 2014 Eclipse Foundation and others. + All rights reserved. This program and the accompanying materials + are made available under the terms of the Eclipse Distribution License v1.0 + which accompanies this distribution, and is available at + http://www.eclipse.org/org/documents/edl-v10.php + + Contributors: + Igor Fedorenko - initial implementation +--> +<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"> + <modelVersion>4.0.0</modelVersion> + <parent> + <groupId>org.eclipse</groupId> + <artifactId>eclipse-platform-parent</artifactId> + <version>4.6.0-SNAPSHOT</version> + <relativePath>../eclipse-platform-parent</relativePath> + </parent> + <groupId>org.eclipse.pde.feature</groupId> + <artifactId>org.eclipse.pde</artifactId> + <version>3.12.0-SNAPSHOT</version> + <packaging>eclipse-feature</packaging> + + <build> + <plugins> + <plugin> + <groupId>org.eclipse.tycho.extras</groupId> + <artifactId>tycho-source-feature-plugin</artifactId> + <version>${tycho-extras.version}</version> + <executions> + <execution> + <phase>package</phase> + <id>source-feature</id> + <goals> + <goal>source-feature</goal> + </goals> + <configuration> + <excludes> + <plugin id="org.eclipse.pde"/> + <plugin id="org.eclipse.pde.doc.user"/> + </excludes> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <groupId>org.eclipse.tycho</groupId> + <artifactId>tycho-p2-plugin</artifactId> + <version>${tycho.version}</version> + <executions> + <execution> + <id>attached-p2-metadata</id> + <phase>package</phase> + <goals> + <goal>p2-metadata</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> +</project> diff --git a/features/org.eclipse.pde-feature/sourceTemplateFeature/feature.properties b/features/org.eclipse.pde-feature/sourceTemplateFeature/feature.properties new file mode 100644 index 0000000000..d8b7e6cf53 --- /dev/null +++ b/features/org.eclipse.pde-feature/sourceTemplateFeature/feature.properties @@ -0,0 +1,36 @@ +############################################################################### +# Copyright (c) 2004, 2014 IBM Corporation and others. +# 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: +# IBM Corporation - initial API and implementation +############################################################################### +# feature.properties +# contains externalized strings for feature.xml +# "%foo" in feature.xml corresponds to the key "foo" in this file +# java.io.Properties file (ISO 8859-1 with "\" escapes) +# This file should be translated. + +# "featureName" property - name of the feature +featureName=Eclipse PDE Plug-in Developer Resources + +# "providerName" property - name of the company that provides the feature +providerName=Eclipse.org + +# "description" property - description of the feature +description=Eclipse plug-in development environment, including documentation and source code zips. + +# "copyright" property - text of the "Feature Update Copyright" +copyright=\ +Copyright (c) 2000, 2015 IBM Corporation and others.\n\ +All rights reserved. This program and the accompanying materials\n\ +are made available under the terms of the Eclipse Public License v1.0\n\ +which accompanies this distribution, and is available at\n\ +http://www.eclipse.org/legal/epl-v10.html\n\ +\n\ +Contributors:\n\ + IBM Corporation - initial API and implementation\n +################ end of copyright property ####################################
\ No newline at end of file @@ -88,5 +88,6 @@ <module>ui/org.eclipse.pde.ui.tests</module> <module>ui/org.eclipse.ui.trace</module> <module>ui/org.eclipse.ui.views.log</module> + <module>features/org.eclipse.pde-feature</module> </modules> </project> |
