Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMat Booth2016-03-02 10:23:57 -0500
committerThomas Watson2016-03-24 11:34:45 -0400
commita9568529db5c5db6c74c959dafcac368d6041968 (patch)
tree4daf1a5ee3841b0d1dd3aa5a07da1065a02b8e11 /launcher-binary-parent/pom.xml
parent26f5398ecfaaf0aebd964522216c9fafc49d8ba4 (diff)
downloadrt.equinox.framework-a9568529db5c5db6c74c959dafcac368d6041968.tar.gz
rt.equinox.framework-a9568529db5c5db6c74c959dafcac368d6041968.tar.xz
rt.equinox.framework-a9568529db5c5db6c74c959dafcac368d6041968.zip
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>
Diffstat (limited to 'launcher-binary-parent/pom.xml')
-rw-r--r--launcher-binary-parent/pom.xml20
1 files changed, 18 insertions, 2 deletions
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>

Back to the top