Skip to main content
summaryrefslogtreecommitdiffstats
path: root/upc
diff options
context:
space:
mode:
authorMarc Khouzam2016-12-05 12:55:10 -0500
committerMarc Khouzam2017-01-25 15:14:03 -0500
commit8d0a0717e2930efc7bd15d83894120869aea6ae8 (patch)
tree992ab439f8a1122771b1bfcae194eb33325c905d /upc
parentb332cdaf75dcc5c2d6347e988af31f3ec07bf9c3 (diff)
downloadorg.eclipse.cdt-8d0a0717e2930efc7bd15d83894120869aea6ae8.tar.gz
org.eclipse.cdt-8d0a0717e2930efc7bd15d83894120869aea6ae8.tar.xz
org.eclipse.cdt-8d0a0717e2930efc7bd15d83894120869aea6ae8.zip
Auto-generate source features using tycho.
This commit removes explicit source features and has tycho create them automatically, along with all other source features that were not previously defined. The logic to auto-generate is in the root pom.xml For all pre-existing source feature, the name presented to the user has been changed to use the default name used by Tycho, which is "Developer Resources". This will provide a more standard user-experience with respect to other source features built by Tycho. Existing SDK features are kept for backwards compatibility. All the names of the auto-generated source features that replace an existing source feature have stayed the same except for the 'testsrunner' feature; for that one name change, a p2.inf file is added to allow upgrading from the old named feature to the new named feature. Change-Id: Ie632e798c93898fd828f88df4983fc43e2749d22
Diffstat (limited to 'upc')
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties33
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/p2.inf1
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml6
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml16
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.source.feature/.project17
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.source.feature/build.properties2
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.properties33
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml29
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml18
9 files changed, 18 insertions, 137 deletions
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
deleted file mode 100644
index b55dc4cbab..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 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=C/C++ UPC (Unified Parallel C) Support Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse CDT
-
-# "description" property - description of the feature
-description=Support for the Unified Parallel C variant of the C programming language. Source code.
-
-# copyright
-copyright=\
-Copyright (c) 2007, 2011 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
-
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/p2.inf b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/p2.inf
new file mode 100644
index 0000000000..91b75dae07
--- /dev/null
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/p2.inf
@@ -0,0 +1 @@
+update.matchExp=providedCapabilities.exists(pc | pc.namespace == 'org.eclipse.equinox.p2.iu' && (pc.name == 'org.eclipse.cdt.core.parser.upc.source.feature.group' || pc.name == 'org.eclipse.cdt.core.parser.upc.feature.source.feature.group'))
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
index d2e990e492..b9b63a8674 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
@@ -21,15 +21,11 @@
</license>
<includes
- id="org.eclipse.cdt.core.parser.upc.source"
+ id="org.eclipse.cdt.core.parser.upc.feature.source"
version="0.0.0"/>
<includes
id="org.eclipse.cdt.core.parser.upc.feature"
version="0.0.0"/>
- <includes
- id="org.eclipse.cdt.core.lrparser.sdk"
- version="0.0.0"/>
-
</feature>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
index 5c559ac461..930edcf669 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/pom.xml
@@ -15,4 +15,20 @@
<version>9.3.0-SNAPSHOT</version>
<artifactId>org.eclipse.cdt.core.parser.upc.sdk</artifactId>
<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>
+ <id>source-feature</id>
+ <phase>none</phase>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/.project b/upc/org.eclipse.cdt.core.parser.upc.source.feature/.project
deleted file mode 100644
index 77c267d643..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.cdt.core.parser.upc.source.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/upc/org.eclipse.cdt.core.parser.upc.source.feature/build.properties b/upc/org.eclipse.cdt.core.parser.upc.source.feature/build.properties
deleted file mode 100644
index b3a611b5c9..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-bin.includes = feature.xml,\
- feature.properties
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.properties b/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.properties
deleted file mode 100644
index b55dc4cbab..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-###############################################################################
-# Copyright (c) 2009, 2010 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=C/C++ UPC (Unified Parallel C) Support Source
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse CDT
-
-# "description" property - description of the feature
-description=Support for the Unified Parallel C variant of the C programming language. Source code.
-
-# copyright
-copyright=\
-Copyright (c) 2007, 2011 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
-
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
deleted file mode 100644
index c4e72990eb..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
- id="org.eclipse.cdt.core.parser.upc.source"
- label="%featureName"
- version="9.3.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>
-
- <plugin
- id="org.eclipse.cdt.core.parser.upc.source"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
-</feature>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml b/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
deleted file mode 100644
index 8a051c9707..0000000000
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/pom.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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>
- <groupId>org.eclipse.cdt</groupId>
- <artifactId>cdt-parent</artifactId>
- <version>9.3.0-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.eclipse.cdt.features</groupId>
- <version>9.3.0-SNAPSHOT</version>
- <artifactId>org.eclipse.cdt.core.parser.upc.source</artifactId>
- <packaging>eclipse-feature</packaging>
-</project>

Back to the top