diff options
6 files changed, 14 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt index 56f1032a8..e7d87ffa4 100644 --- a/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt +++ b/bundles/org.eclipse.equinox.executable/forceQualifierUpdate.txt @@ -1,2 +1,2 @@ # 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/bundles/org.eclipse.equinox.executable/pom.xml b/bundles/org.eclipse.equinox.executable/pom.xml index 8b1ae141b..fac13bf3e 100644 --- a/bundles/org.eclipse.equinox.executable/pom.xml +++ b/bundles/org.eclipse.equinox.executable/pom.xml @@ -316,6 +316,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 --> diff --git a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt index 56f1032a8..5b10f3cf5 100644 --- a/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/forceQualifierUpdate.txt +++ b/bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64/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 407433 - eclipse launcher companion library requires execute permission on HPUX 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"> diff --git a/launcher-binary-parent/pom.xml b/launcher-binary-parent/pom.xml index 278a6e430..168108cc3 100644 --- a/launcher-binary-parent/pom.xml +++ b/launcher-binary-parent/pom.xml @@ -58,6 +58,7 @@ <include name="*.dll"/> </fileset> </copy> + <chmod file="./*.so" perm="755" verbose="true"/> </target> </configuration> <goals> |