Bug 488935 - Avoid "workspace dirt" in the launcher bundles

Change the ant task to copy the artifacts in the maven "target"
directory and include them in the bundle via tycho-packaging-plugin
instead of build.properties. This is the idiomatic way to include
dynamic or generated artifacts.

Change-Id: Ib60544a804b2e1d4b93627a9360e7ee6ffdfe4f1
Signed-off-by: Mat Booth <mat.booth@redhat.com>

20 files changed, 23 insertions, 26 deletions

diff --git a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
index 514dfb435..019e28d25 100644
--- a/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.cocoa.macosx.x86_64/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.cocoa.macosx.x86_64.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
index e85fd54de..e3d04b9df 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.aix.ppc.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
index cced3aceb..0cf392851 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64/build.properties
@@ -9,10 +9,9 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.aix.ppc64.properties,\
                about.html
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20160316-1045
\ No newline at end of file
+binaryTag=v20160316-1045
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
index 3eac51fa4..a0fff513b 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.hpux.ia64.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
index 94b5eb772..ec462354d 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64_32/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.hpux.ia64_32.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties
index 43492722a..0a04a9999 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64/build.properties
@@ -9,7 +9,6 @@
 #     Red Hat Inc. - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.aarch64.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties
index a7f44aae3..790104000 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.arm/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.arm.properties,\
                about.html
 
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
index 77ddc5b2b..ae265ddae 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.ppc.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
index 0313b917f..32cb556c6 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.ppc64.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
index 2a36ec390..c3d8035da 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le/build.properties
@@ -9,7 +9,6 @@
 #     Alexander Kurtatkov - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.ppc64le.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
index 94bdfe939..0947eca62 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390/build.properties
@@ -9,10 +9,9 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.s390.properties,\
                about.html
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20160316-1045
\ No newline at end of file
+binaryTag=v20160316-1045
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
index c93aad319..cec3b0267 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.s390x/build.properties
@@ -9,10 +9,9 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.s390x.properties,\
                about.html
                
 customBuildCallbacks=customBuildCallbacks.xml
 generateSourceBundle=false
-binaryTag=v20160316-1045
\ No newline at end of file
+binaryTag=v20160316-1045
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
index 865c3add2..ba1b242b6 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.x86.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
index 94aab5868..9c5fd2030 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.linux.x86_64/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.linux.x86_64.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
index 2deed9666..a309ae12e 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.solaris.sparc.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
index e99fc71c0..0f1ffcecc 100644
--- a/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.so,\
                launcher.gtk.solaris.x86.properties,\
                about.html
                
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
index a1710c054..8142a7336 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.ia64/build.properties
@@ -9,9 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.dll,\
                launcher.win32.win32.ia64.properties,\
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20160316-1045
\ No newline at end of file
+binaryTag=v20160316-1045
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
index 02836f2e7..6f98fb2fa 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86/build.properties
@@ -9,9 +9,8 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.dll,\
                launcher.win32.win32.x86.properties,\
                about.html
 generateSourceBundle=false
 customBuildCallbacks=customBuildCallbacks.xml
-binaryTag=v20160316-1045
\ No newline at end of file
+binaryTag=v20160316-1045
diff --git a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
index d6ebf66d6..83176a3d8 100644
--- a/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
+++ b/bundles/org.eclipse.equinox.launcher.win32.win32.x86_64/build.properties
@@ -9,7 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = META-INF/,\
-               eclipse_*.dll,\
                launcher.win32.win32.x86_64.properties,\
                about.html
 generateSourceBundle=false
diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml
index 23cf09831..f9c60ca67 100644
--- a/launcher-binary-parent/pom.xml
+++ b/launcher-binary-parent/pom.xml
@@ -46,13 +46,13 @@
             <configuration>
               <property name="feature.base" value="."/>
               <target>
-                <copy todir="." overwrite="true">
+                <copy todir="${project.build.directory}" overwrite="true">
                   <fileset dir="../../../rt.equinox.binaries/${project.artifactId}/">
                     <include name="*.so"/>
                     <include name="*.dll"/>
                   </fileset>
                 </copy>
-                <chmod file="./*.so" perm="755" verbose="true"/>
+                <chmod file="${project.build.directory}/*.so" perm="755" verbose="true"/>
               </target>
             </configuration>
             <goals>
@@ -61,6 +61,22 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.eclipse.tycho</groupId>
+        <artifactId>tycho-packaging-plugin</artifactId>
+        <version>${tycho.version}</version>
+        <configuration>
+          <additionalFileSets>
+            <fileSet>
+              <directory>${project.build.directory}</directory>
+              <includes>
+                <include>*.so</include>
+                <include>*.dll</include>
+              </includes>
+            </fileSet>
+          </additionalFileSets>
+        </configuration>
+      </plugin>
     </plugins>
   </build>
 </project>