Get ride of the need of the PLACEHOLDER file in the help folder

Change-Id: Id69fc22a95c1dca96f23a2edcf1f0028aefa38ce

4 files changed, 34 insertions, 12 deletions

diff --git a/plugins/org.eclipse.emf.compare.doc/build.properties b/plugins/org.eclipse.emf.compare.doc/build.properties
index 72f3ca9be..74cfcbb68 100644
--- a/plugins/org.eclipse.emf.compare.doc/build.properties
+++ b/plugins/org.eclipse.emf.compare.doc/build.properties
@@ -8,8 +8,8 @@
 # Contributors:
 #     Obeo - initial API and implementation
 #################################################################################
-src.includes = help/,\
-               plugin.xml
-bin.includes = help/,\
-               plugin.xml,\
-               META-INF/
+bin.includes = META-INF/,\
+               plugin.properties,\
+               about.html
+src.includes = src/,\
+               about.html
diff --git a/plugins/org.eclipse.emf.compare.doc/help/PLACEHOLDER b/plugins/org.eclipse.emf.compare.doc/help/PLACEHOLDER
deleted file mode 100644
index e69de29bb..000000000
--- a/plugins/org.eclipse.emf.compare.doc/help/PLACEHOLDER
+++ /dev/null
diff --git a/plugins/org.eclipse.emf.compare.doc/plugin.xml b/plugins/org.eclipse.emf.compare.doc/plugin.xml
deleted file mode 100644
index 034b0ea6d..000000000
--- a/plugins/org.eclipse.emf.compare.doc/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' ?>
-<?eclipse version="3.2"?>
-
-<plugin>
-</plugin>
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.compare.doc/pom.xml b/plugins/org.eclipse.emf.compare.doc/pom.xml
index 56034b108..45744e455 100644
--- a/plugins/org.eclipse.emf.compare.doc/pom.xml
+++ b/plugins/org.eclipse.emf.compare.doc/pom.xml
@@ -25,12 +25,39 @@
   <packaging>eclipse-plugin</packaging>
   
   <build>
-   <plugins>
+    <plugins>
       <plugin>
         <groupId>org.eclipse.tycho</groupId>
-        <artifactId>tycho-source-plugin</artifactId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <configuration>
+          <!-- 
+          As the the help folder and the plugin.xml will be generated @ build time 
+          by the o.e.e.c.gendoc WikitexToHTML tool, we can not use the build.properties 
+          file to specify its  inclusion, it would lead to warnings during the PDE build 
+          in the Eclipse workspace. We better include it with the following directive.
+           -->
+          <additionalFileSets>
+            <fileSet>
+              <directory>${project.basedir}/help</directory>
+              <prefix>help/</prefix>
+              <includes>
+                <include>**/*</include>
+              </includes>
+            </fileSet>
+            <fileSet>
+              <directory>${project.basedir}</directory>
+              <includes>
+                <include>plugin.xml</include>
+              </includes>
+            </fileSet>
+          </additionalFileSets>
+        </configuration>
       </plugin>
       <plugin>
+        <!--
+        Run the org.e.e.c.gendoc WikitTextToHTML tool to generate Eclipse help and
+        website HTML documentation.
+        -->
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>exec-maven-plugin</artifactId>
         <version>1.2.1</version>