Attachment 246126 Details for Bug 429343 – patch for eclipse.platform.releng.aggregator to enable native builds for Solaris x86/x86_64 (master branch)

[patch] patch for eclipse.platform.releng.aggregator to enable native builds for Solaris x86/x86_64 (master branch)

master-eclipse.platform.releng.aggregator.patch (text/plain), 13.20 KB, created by Thorsten Heit

on 2014-08-19 05:44:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Thorsten Heit

Created: 2014-08-19 05:44:30 EDT

Size: 13.20 KB

patch

obsolete

>diff --git a/eclipse-platform-parent/pom.xml b/eclipse-platform-parent/pom.xml
>index ec3dcf6..397dcd8 100644
>--- a/eclipse-platform-parent/pom.xml
>+++ b/eclipse-platform-parent/pom.xml
>@@ -258,6 +258,11 @@
>               <arch>x86</arch>
>             </environment>
>             <environment>
>+              <os>solaris</os>
>+              <ws>gtk</ws>
>+              <arch>x86_64</arch>
>+            </environment>
>+            <environment>
>               <os>hpux</os>
>               <ws>gtk</ws>
>               <arch>ia64</arch>
>diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
>index a3ba698..623256f 100644
>--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/test.xml
>@@ -639,6 +639,21 @@
>     </condition>
>     <condition
>       property="runtimeArchive"
>+      value="eclipse-SDK-${buildId}-solaris-gtk-x86_64.zip">
>+      <and>
>+        <equals
>+          arg1="${os}"
>+          arg2="solaris" />
>+        <equals
>+          arg1="${ws}"
>+          arg2="gtk" />
>+        <equals
>+          arg1="${arch}"
>+          arg2="x86_64" />
>+      </and>
>+    </condition>
>+    <condition
>+      property="runtimeArchive"
>       value="eclipse-SDK-${buildId}-aix-gtk-ppc.zip">
>       <and>
>         <equals
>diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
>index e8b0962..02ffc8a 100644
>--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/helper.xml
>@@ -115,6 +115,17 @@
>                 <antcall target="packageSwtStandalone">
>                     <param
>                         name="os"
>+                        value="solaris" />
>+                    <param
>+                        name="ws"
>+                        value="gtk" />
>+                    <param
>+                        name="arch"
>+                        value="x86_64" />
>+                </antcall>
>+                <antcall target="packageSwtStandalone">
>+                    <param
>+                        name="os"
>                         value="hpux" />
>                     <param
>                         name="ws"
>diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
>index 13e897c..213c72e 100644
>--- a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/testManifest.xml
>@@ -12,6 +12,7 @@
>       <platform id="SLG2S390" name="Linux (s390/GTK+)" fileName="eclipse-SDK-@build@-linux-gtk-s390.tar.gz"></platform>
>       <platform id="SSG" name="Solaris 10 (SPARC/GTK+)" fileName="eclipse-SDK-@build@-solaris-gtk.zip"></platform>
>       <platform id="SSGX" name="Solaris 10 (x86/GTK+)" fileName="eclipse-SDK-@build@-solaris-gtk-x86.zip"></platform>
>+      <platform id="SSGX64" name="Solaris 10 (x86_64/GTK+)" fileName="eclipse-SDK-@build@-solaris-gtk-x86_64.zip"></platform>
>       <platform id="SSHPUX" name="HP-UX (ia64/GTK+)" fileName="eclipse-SDK-@build@-hpux-gtk-ia64.zip"></platform>
>       <platform id="SAG" name="AIX (PPC/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc.zip"></platform>
>       <platform id="SAGPPC64" name="AIX (PPC64/GTK+)" fileName="eclipse-SDK-@build@-aix-gtk-ppc64.zip"></platform>
>@@ -55,6 +56,7 @@
>       <platform id="PLG2S390" name="Linux (s390/GTK+)" fileName="eclipse-platform-@build@-linux-gtk-s390.tar.gz"></platform>
>       <platform id="PSG" name="Solaris 10 (SPARC/GTK+)" fileName="eclipse-platform-@build@-solaris-gtk.zip"></platform>
>       <platform id="PSGX" name="Solaris 10 (x86/GTK+)" fileName="eclipse-platform-@build@-solaris-gtk-x86.zip"></platform>
>+      <platform id="PSGX64" name="Solaris 10 (x86_64/GTK+)" fileName="eclipse-platform-@build@-solaris-gtk-x86_64.zip"></platform>
>       <platform id="PHPUX" name="HPUX (ia64/GTK+)" fileName="eclipse-platform-@build@-hpux-gtk-ia64.zip"></platform>
>       <platform id="PAG" name="AIX (PPC/GTK)" fileName="eclipse-platform-@build@-aix-gtk-ppc.zip"></platform>
>       <platform id="PAGPPC64" name="AIX (PPC64/GTK)" fileName="eclipse-platform-@build@-aix-gtk-ppc64.zip"></platform>
>@@ -102,6 +104,7 @@
>       <platform id="SWTLG2PPC64" name="Linux (PPC64/GTK+)" fileName="swt-@build@-gtk-linux-ppc64.zip"></platform>
>       <platform id="SWTSG" name="Solaris 10 (SPARC/GTK+)" fileName="swt-@build@-gtk-solaris-sparc.zip"></platform>
>       <platform id="SWTSGX" name="Solaris 10 (x86/GTK+)" fileName="swt-@build@-gtk-solaris-x86.zip"></platform>
>+      <platform id="SWTSGX64" name="Solaris 10 (x86_64/GTK+)" fileName="swt-@build@-gtk-solaris-x86_64.zip"></platform>
>       <platform id="SWTHP" name="HPUX (ia64/GTK+)" fileName="swt-@build@-gtk-hpux-ia64.zip"></platform>
>       <platform id="SWTAG" name="AIX (PPC/GTK+)" fileName="swt-@build@-gtk-aix-ppc.zip"></platform>
>       <platform id="SWTAGPPC64" name="AIX (PPC64/GTK+)" fileName="swt-@build@-gtk-aix-ppc64.zip"></platform>
>diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
>index 2bc2ddf..ad10484 100644
>--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/buildConfigs/equinox-launchers/build.xml
>@@ -21,6 +21,7 @@
>     <buildRepos os="linux" ws="gtk" arch="ppc64" archiveName="${archiveRoot}-linux.gtk.ppc64.${buildId}.tar.gz" />
>     <buildRepos os="solaris" ws="gtk" arch="sparc" archiveName="${archiveRoot}-solaris.gtk.sparc.${buildId}.zip" />
>     <buildRepos os="solaris" ws="gtk" arch="x86" archiveName="${archiveRoot}-solaris.gtk.x86.${buildId}.zip" />
>+    <buildRepos os="solaris" ws="gtk" arch="x86_64" archiveName="${archiveRoot}-solaris.gtk.x86_64.${buildId}.zip" />
> 
>       <!--
>            for master, kepler, hpux,gtk is provided for ia64 (only).
>diff --git a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
>index 4b524fa..926a02f 100644
>--- a/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/equinox/publishingFiles/testManifest.xml
>@@ -308,6 +308,11 @@
>                 fileName="launchers-solaris.gtk.x86.${BUILD_ID}.zip" />
>             <platform
>                 format="equinox"
>+                id="SSGX64"
>+                name="Solaris 10 (x86_64/GTK+)"
>+                fileName="launchers-solaris.gtk.x86_64.${BUILD_ID}.zip" />
>+            <platform
>+                format="equinox"
>                 id="SHPUX"
>                 name="HP-UX (ia64/GTK+)"
>                 fileName="launchers-hpux.gtk.ia64.${BUILD_ID}.zip" />
>diff --git a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
>index 3abb95b..620752a 100644
>--- a/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
>+++ b/eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
>@@ -31,6 +31,8 @@ root.solaris.gtk.sparc=../../rt.equinox.binaries/org.eclipse.equinox.executable/
> root.solaris.gtk.sparc.permissions.755=eclipse
> root.solaris.gtk.x86=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86
> root.solaris.gtk.x86.permissions.755=eclipse
>+root.solaris.gtk.x86_64=../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/solaris/x86_64
>+root.solaris.gtk.x86_64.permissions.755=eclipse
> 
> root.linux.gtk.x86=rootfiles/linux.gtk.x86,../../rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/x86
> root.linux.gtk.x86.permissions.755=libcairo-swt.so,eclipse
>diff --git a/production/build-functions.shsource b/production/build-functions.shsource
>index 5c13a9a..13e159d 100755
>--- a/production/build-functions.shsource
>+++ b/production/build-functions.shsource
>@@ -636,6 +636,7 @@
>     #tar cfz "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.sdk.ide/macosx/cocoa/x86 eclipse
>     cp org.eclipse.sdk.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk.zip
>     cp org.eclipse.sdk.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk-x86.zip
>+    cp org.eclipse.sdk.ide-solaris.gtk.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-solaris-gtk-x86_64.zip
>     cp org.eclipse.sdk.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32-x86_64.zip
>     cp org.eclipse.sdk.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-SDK-${BUILD_ID}-win32.zip
>     popd
>@@ -674,6 +675,7 @@
>     #tar cfz "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-macosx-cocoa.tar.gz -C org.eclipse.platform.ide/macosx/cocoa/x86 eclipse
>     cp org.eclipse.platform.ide-solaris.gtk.sparc.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk.zip
>     cp org.eclipse.platform.ide-solaris.gtk.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk-x86.zip
>+    cp org.eclipse.platform.ide-solaris.gtk.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-solaris-gtk-x86_64.zip
>     cp org.eclipse.platform.ide-win32.win32.x86_64.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32-x86_64.zip
>     cp org.eclipse.platform.ide-win32.win32.x86.zip "$BUILD_DIR"/eclipse-platform-${BUILD_ID}-win32.zip
>     popd
>diff --git a/production/doc_options_dirs.txt b/production/doc_options_dirs.txt
>index 3c33f8e..5f8ee2c 100644
>--- a/production/doc_options_dirs.txt
>+++ b/production/doc_options_dirs.txt
>@@ -2711,6 +2711,14 @@ eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86/org
> eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86/src
> eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86/target
> eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86/temp.folder
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/about_files
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/@dot
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/META-INF
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/org
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/src
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/target
>+eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.solaris.x86_64/temp.folder
> eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc
> eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc/about_files
> eclipse.platform.swt.binaries/bundles/org.eclipse.swt.motif.aix.ppc/@dot
>@@ -4313,6 +4321,7 @@ rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x86
> rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.linux.x86_64
> rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.sparc
> rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.x86
>+rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.x86_64
> rt.equinox.binaries/org.eclipse.equinox.launcher.motif.aix.ppc
> rt.equinox.binaries/org.eclipse.equinox.launcher.motif.hpux.ia64
> rt.equinox.binaries/org.eclipse.equinox.launcher.motif.hpux.PA_RISC
>@@ -4851,6 +4860,9 @@ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.sparc/targ
> rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86
> rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF
> rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target
>+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64
>+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF
>+rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target
> rt.equinox.framework/bundles/org.eclipse.equinox.launcher/META-INF
> rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.aix.ppc
> rt.equinox.framework/bundles/org.eclipse.equinox.launcher.motif.aix.ppc/META-INF
>diff --git a/production/publish-equinox.sh b/production/publish-equinox.sh
>index 541e94d..16ce631 100644
>--- a/production/publish-equinox.sh
>+++ b/production/publish-equinox.sh
>@@ -89,6 +89,7 @@ fn-eq-gather-starterkit ()
> 
>     #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.sparc.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-sparc.zip
>     #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-x86.zip
>+    #cp -v org.eclipse.rt.osgistarterkit.product-solaris.gtk.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-solaris-gtk-x86_64.zip
> 
>     cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86_64.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86_64.zip
>     cp -v org.eclipse.rt.osgistarterkit.product-win32.win32.x86.zip "$DROP_DIR"/EclipseRT-OSGi-StarterKit-${BUILD_ID}-win32-win32-x86.zip
>

Actions: View | Diff

Attachments on bug 429343: 240410 | 240411 | 240455 | 240457 | 240458 | 240459 | 246091 | 246092 | 246094 | 246095 | 246096 | 246097 | 246098 | 246099 | 246100 | 246101 | 246102 | 246126 | 260962 | 260963 | 260964 | 260965