Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Bégaudeau2016-05-04 14:31:46 +0000
committerStéphane Bégaudeau2016-05-04 14:31:46 +0000
commit8988e553d6a7c70a54d0a0e8d003d5311c55e1d7 (patch)
treec0599d8d800c34bca3fdf023ac964f9e3e29ddbd
parent773c0da614ff4c33429106a8ba9be2087d938118 (diff)
downloadorg.eclipse.eef-8988e553d6a7c70a54d0a0e8d003d5311c55e1d7.tar.gz
org.eclipse.eef-8988e553d6a7c70a54d0a0e8d003d5311c55e1d7.tar.xz
org.eclipse.eef-8988e553d6a7c70a54d0a0e8d003d5311c55e1d7.zip
Fix releng issuesv1.6.0_M7
Change-Id: I7464c10737bde09546baded5e7bb99288a13c151 Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
-rw-r--r--doc/org.eclipse.eef.documentation.export/build.properties4
-rw-r--r--doc/org.eclipse.eef.documentation/build.properties2
-rw-r--r--features/org.eclipse.eef.sdk-feature/feature.properties28
-rw-r--r--features/org.eclipse.eef.sdk-feature/pom.xml26
-rw-r--r--plugins/org.eclipse.eef.common.ui/build.properties3
-rw-r--r--plugins/org.eclipse.eef.common/build.properties3
-rw-r--r--plugins/org.eclipse.eef.ide.ui.properties/build.properties3
-rw-r--r--releng/org.eclipse.eef.releng/pom.xml38
-rw-r--r--releng/org.eclipse.eef.update/category.xml11
-rw-r--r--releng/org.eclipse.eef.update/pom.xml1
10 files changed, 105 insertions, 14 deletions
diff --git a/doc/org.eclipse.eef.documentation.export/build.properties b/doc/org.eclipse.eef.documentation.export/build.properties
index 54f4d86cb..b8269e9b2 100644
--- a/doc/org.eclipse.eef.documentation.export/build.properties
+++ b/doc/org.eclipse.eef.documentation.export/build.properties
@@ -9,5 +9,7 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.properties
+ plugin.properties,\
+ about.html
javacProjectSettings = true
+src.includes = about.html
diff --git a/doc/org.eclipse.eef.documentation/build.properties b/doc/org.eclipse.eef.documentation/build.properties
index a32a9c142..c120858aa 100644
--- a/doc/org.eclipse.eef.documentation/build.properties
+++ b/doc/org.eclipse.eef.documentation/build.properties
@@ -14,3 +14,5 @@ bin.includes = META-INF/,\
plugin.properties,\
plugin.xml,\
pages/
+src.includes = pages/,\
+ about.html \ No newline at end of file
diff --git a/features/org.eclipse.eef.sdk-feature/feature.properties b/features/org.eclipse.eef.sdk-feature/feature.properties
index d3c4fabef..26e2a4ee8 100644
--- a/features/org.eclipse.eef.sdk-feature/feature.properties
+++ b/features/org.eclipse.eef.sdk-feature/feature.properties
@@ -1,15 +1,27 @@
-# Copyright (c) 2015 Obeo.
+# Copyright (c) 2015, 2016 Obeo.
# 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.htm
-featureName=EEF Feature
+featureName=EEF SDK Feature
featureProvider=Eclipse Modeling Project
-descriptionUrl=TODO
-description=TODO
-copyrightUrl=TODO
-copyright=TODO
-licenseUrl=TODO
-license=TODO \ No newline at end of file
+descriptionUrl=http://www.eclipse.org/eef
+description=Eclipse EEF is used to build Properties view easily thanks to a declarative approach
+copyrightUrl=http://www.eclipse.org/eef
+copyright=\
+Copyright (c) 2015, 2016 Obeo 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\
+ Obeo - initial API and implementation\n
+
+licenseUrl=https://www.eclipse.org/legal/epl-v10.html
+license=\
+Eclipse Public License v1.0\
+\n\
+THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS ECLIPSE PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.\n \ No newline at end of file
diff --git a/features/org.eclipse.eef.sdk-feature/pom.xml b/features/org.eclipse.eef.sdk-feature/pom.xml
index d177aca81..f52a03210 100644
--- a/features/org.eclipse.eef.sdk-feature/pom.xml
+++ b/features/org.eclipse.eef.sdk-feature/pom.xml
@@ -30,7 +30,33 @@ Contributors:
<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>package</phase>
+ <goals>
+ <goal>source-feature</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <reuseBrandingPlugin>false</reuseBrandingPlugin>
+ </configuration>
+ </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>
diff --git a/plugins/org.eclipse.eef.common.ui/build.properties b/plugins/org.eclipse.eef.common.ui/build.properties
index 54f4d86cb..c3bd7d34b 100644
--- a/plugins/org.eclipse.eef.common.ui/build.properties
+++ b/plugins/org.eclipse.eef.common.ui/build.properties
@@ -9,5 +9,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.properties
+ plugin.properties,\
+ about.html
javacProjectSettings = true
diff --git a/plugins/org.eclipse.eef.common/build.properties b/plugins/org.eclipse.eef.common/build.properties
index 30b3a6b0d..5314f8fe4 100644
--- a/plugins/org.eclipse.eef.common/build.properties
+++ b/plugins/org.eclipse.eef.common/build.properties
@@ -10,5 +10,6 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties,\
- plugin.xml
+ plugin.xml,\
+ about.html
javacProjectSettings = true
diff --git a/plugins/org.eclipse.eef.ide.ui.properties/build.properties b/plugins/org.eclipse.eef.ide.ui.properties/build.properties
index 54f4d86cb..c3bd7d34b 100644
--- a/plugins/org.eclipse.eef.ide.ui.properties/build.properties
+++ b/plugins/org.eclipse.eef.ide.ui.properties/build.properties
@@ -9,5 +9,6 @@ source.. = src/
output.. = bin/
bin.includes = META-INF/,\
.,\
- plugin.properties
+ plugin.properties,\
+ about.html
javacProjectSettings = true
diff --git a/releng/org.eclipse.eef.releng/pom.xml b/releng/org.eclipse.eef.releng/pom.xml
index f91432095..186ca383c 100644
--- a/releng/org.eclipse.eef.releng/pom.xml
+++ b/releng/org.eclipse.eef.releng/pom.xml
@@ -13,6 +13,7 @@
<properties>
<tycho-version>0.24.0</tycho-version>
+ <tycho-extras-version>0.24.0</tycho-extras-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<platform-version-name>neon</platform-version-name>
</properties>
@@ -52,6 +53,43 @@
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
+ <artifactId>tycho-source-plugin</artifactId>
+ <version>${tycho-version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <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>${tycho-extras-version}</version>
+ <configuration>
+ <archive>
+ <addMavenDescriptor>false</addMavenDescriptor>
+ </archive>
+ </configuration>
+ <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-maven-plugin</artifactId>
<version>${tycho-version}</version>
<extensions>true</extensions>
diff --git a/releng/org.eclipse.eef.update/category.xml b/releng/org.eclipse.eef.update/category.xml
index 67a426e64..a01781c32 100644
--- a/releng/org.eclipse.eef.update/category.xml
+++ b/releng/org.eclipse.eef.update/category.xml
@@ -4,7 +4,14 @@
To install these features, point Eclipse at this site.
</description>
<feature id="org.eclipse.eef.sdk.feature" version="0.0.0">
- <category name="EEF Incubation"/>
+ <category name="EEF"/>
</feature>
- <category-def name="EEF Incubation" label="EEF Incubation"/>
+ <feature id="org.eclipse.eef.sdk.feature.source" version="0.0.0">
+ <category name="EEF"/>
+ </feature>
+ <category-def name="EEF" label="EEF">
+ <description>
+ Update site of the Eclipse EEF project
+ </description>
+ </category-def>
</site>
diff --git a/releng/org.eclipse.eef.update/pom.xml b/releng/org.eclipse.eef.update/pom.xml
index 51486f9ed..30a21feeb 100644
--- a/releng/org.eclipse.eef.update/pom.xml
+++ b/releng/org.eclipse.eef.update/pom.xml
@@ -25,6 +25,7 @@
<packaging>eclipse-repository</packaging>
<name>EEF Update site</name>
+ <version>1.6.0-SNAPSHOT</version>
<build>
<plugins>

Back to the top