Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Watson2013-05-15 15:12:05 +0000
committerThomas Watson2013-05-15 15:12:05 +0000
commit8e1302f8ce2a3426c57ff3a653f8734ec7ff399e (patch)
treee1d06d2c2f058b3150676b83e5fba4051b3f5855 /features
parent4c7977c3d3cdd7425b1d5f2ccc92ff10567efcad (diff)
parentd7c2f610b0da867bdc943a276dae6a1067cbbcee (diff)
downloadrt.equinox.framework-8e1302f8ce2a3426c57ff3a653f8734ec7ff399e.tar.gz
rt.equinox.framework-8e1302f8ce2a3426c57ff3a653f8734ec7ff399e.tar.xz
rt.equinox.framework-8e1302f8ce2a3426c57ff3a653f8734ec7ff399e.zip
Merge branch 'master' into twatson/container
Conflicts: bundles/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/core/runtime/internal/adaptor/EclipseStorageHook.java
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt1
-rw-r--r--features/org.eclipse.equinox.executable.feature/pom.xml5
2 files changed, 6 insertions, 0 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt b/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt
index 56f1032a8..f80e66f70 100644
--- a/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt
+++ b/features/org.eclipse.equinox.executable.feature/forceQualifierUpdate.txt
@@ -1,2 +1,3 @@
# To force a version qualifier update add the bug here
Bug 403352 - Update all parent versions to match our build stream
+Bug 407109 - Launcher executable is missing from s390/s390x builds
diff --git a/features/org.eclipse.equinox.executable.feature/pom.xml b/features/org.eclipse.equinox.executable.feature/pom.xml
index 3a8eb5074..939c8b57d 100644
--- a/features/org.eclipse.equinox.executable.feature/pom.xml
+++ b/features/org.eclipse.equinox.executable.feature/pom.xml
@@ -394,6 +394,11 @@
<include name="**/*"/>
</fileset>
</copy>
+ <copy todir="contributed">
+ <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.executable/contributed/">
+ <include name="**/*"/>
+ </fileset>
+ </copy>
<!-- Things below were copied from custombuildCallbacks.xml, as
Tycho does not support that -->
<copy includeEmptyDirs="false" todir="tempBin">

Back to the top