From a9568529db5c5db6c74c959dafcac368d6041968 Mon Sep 17 00:00:00 2001
From: Mat Booth
Date: Wed, 2 Mar 2016 15:23:57 +0000
Subject: 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>
---
 launcher-binary-parent/pom.xml | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

(limited to 'launcher-binary-parent')

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>
-- 
cgit v1.2.3