Merge branch 'david_williams/hp64'v20121019-184829

6 files changed, 19 insertions, 19 deletions

diff --git a/bundles/org.eclipse.releng.tests/compareoptions.properties b/bundles/org.eclipse.releng.tests/compareoptions.properties
index 92b258e2..b75d8387 100644
--- a/bundles/org.eclipse.releng.tests/compareoptions.properties
+++ b/bundles/org.eclipse.releng.tests/compareoptions.properties
@@ -8,5 +8,5 @@
 # Contributors:
 #     IBM Corporation - initial API and implementation
 ###############################################################################
-exclude.plugins=org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.jetty.source,com.ibm.icu,com.ibm.icu.source,org.eclipse.ui.carbon,org.eclipse.ui.carbon.source,org.eclipse.swt.gtk.solaris.x86,org.eclipse.swt.gtk.solaris.x86.source,org.eclipse.swt.gtk.linux.s390,org.eclipse.swt.gtk.linux.s390.source,org.eclipse.swt.gtk.linux.s390x,org.eclipse.swt.gtk.linux.s390x.source,org.eclipse.equinox.launcher.gtk.linux.s390,org.eclipse.equinox.launcher.gtk.linux.s390x,org.eclipse.ecf,org.eclipse.ecf.source,org.eclipse.ecf.filetransfer,org.eclipse.ecf.filetransfer.source,org.eclipse.ecf.identity,org.eclipse.ecf.identity.source,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.source,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.provider.filetransfer.ssl.source,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.source,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,org.eclipse.ecf.ssl,org.eclipse.ecf.ssl.source,org.junit,org.junit.source,org.eclipse.equinox.launcher.gtk.linux.ppc,org.eclipse.equinox.launcher.gtk.linux.ppc.source,org.eclipse.equinox.launcher.motif.solaris.sparc,org.eclipse.equinox.launcher.motif.hpux.ia64_32,org.eclipse.equinox.launcher.motif.linux.x86,org.eclipse.equinox.launcher.motif.aix.ppc,org.eclipse.equinox.launcher.motif.hpux.ia64_32,org.apache.lucene.analysis,org.apache.lucene.core,org.eclipse.equinox.launcher.carbon.macosx,javax.servlet,org.eclipse.jetty.continuation,org.eclipse.jetty.continuation.source,org.eclipse.jetty.http,org.eclipse.jetty.http.source,org.eclipse.jetty.io,org.eclipse.jetty.io.source,org.eclipse.jetty.security,org.eclipse.jetty.security.source,org.eclipse.jetty.server,org.eclipse.jetty.server.source,org.eclipse.jetty.servlet,org.eclipse.jetty.servlet.source,org.eclipse.jetty.util,org.eclipse.jetty.util.source
+exclude.plugins=org.eclipse.equinox.http.jetty,org.eclipse.equinox.http.jetty.source,com.ibm.icu,com.ibm.icu.source,org.eclipse.ui.carbon,org.eclipse.ui.carbon.source,org.eclipse.swt.gtk.solaris.x86,org.eclipse.swt.gtk.solaris.x86.source,org.eclipse.swt.gtk.linux.s390,org.eclipse.swt.gtk.linux.s390.source,org.eclipse.swt.gtk.linux.s390x,org.eclipse.swt.gtk.linux.s390x.source,org.eclipse.equinox.launcher.gtk.linux.s390,org.eclipse.equinox.launcher.gtk.linux.s390x,org.eclipse.ecf,org.eclipse.ecf.source,org.eclipse.ecf.filetransfer,org.eclipse.ecf.filetransfer.source,org.eclipse.ecf.identity,org.eclipse.ecf.identity.source,org.eclipse.ecf.provider.filetransfer,org.eclipse.ecf.provider.filetransfer.source,org.eclipse.ecf.provider.filetransfer.ssl,org.eclipse.ecf.provider.filetransfer.ssl.source,org.eclipse.ecf.provider.filetransfer.httpclient,org.eclipse.ecf.provider.filetransfer.httpclient.source,org.eclipse.ecf.provider.filetransfer.httpclient.ssl,org.eclipse.ecf.provider.filetransfer.httpclient.ssl.source,org.eclipse.ecf.ssl,org.eclipse.ecf.ssl.source,org.junit,org.junit.source,org.eclipse.equinox.launcher.gtk.linux.ppc,org.eclipse.equinox.launcher.gtk.linux.ppc.source,org.eclipse.equinox.launcher.motif.solaris.sparc,org.eclipse.equinox.launcher.gtk.hpux.ia64,org.eclipse.equinox.launcher.motif.linux.x86,org.eclipse.equinox.launcher.motif.aix.ppc,org.eclipse.equinox.launcher.gtk.hpux.ia64,org.apache.lucene.analysis,org.apache.lucene.core,org.eclipse.equinox.launcher.carbon.macosx,javax.servlet,org.eclipse.jetty.continuation,org.eclipse.jetty.continuation.source,org.eclipse.jetty.http,org.eclipse.jetty.http.source,org.eclipse.jetty.io,org.eclipse.jetty.io.source,org.eclipse.jetty.security,org.eclipse.jetty.security.source,org.eclipse.jetty.server,org.eclipse.jetty.server.source,org.eclipse.jetty.servlet,org.eclipse.jetty.servlet.source,org.eclipse.jetty.util,org.eclipse.jetty.util.source
 exclude.features=master-equinox,master-equinox-weaving,master-ecf,org.eclipse.pde.api.tools.ee.fragments,org.eclipse.cvs,org.eclipse.cvs.source,org.eclipse.help.source,org.eclipse.help,org.eclipse.equinox.jmx.server.feature,org.eclipse.equinox.jmx.client.feature,org.eclipse.equinox.jmx.common.feature,org.eclipse.equinox.serverside.sdk,org.eclipse.equinox.serverside.sdk,org.eclipse.equinox.sdk
\ No newline at end of file
diff --git a/features/master-root/build.properties b/features/master-root/build.properties
index 88d802dd..f6b6a829 100644
--- a/features/master-root/build.properties
+++ b/features/master-root/build.properties
@@ -19,7 +19,7 @@ configs=launcher-common,common,common&\
 	launcher-solaris, gtk, sparc & \
 	launcher-aix, motif, ppc & \
 	launcher-hpux, motif, PA_RISC & \
-	launcher-hpux, motif, ia64_32 & \
+	launcher-hpux, gtk, ia64 & \
 	launcher-macosx, carbon, ppc& \
 	launcher-macosx, cocoa, x86& \
 	launcher-macosx, cocoa, x86_64& \
@@ -35,7 +35,7 @@ configs=launcher-common,common,common&\
 	sdk-solaris, gtk, sparc & \
 	sdk-aix, motif, ppc & \
 	sdk-hpux, motif, PA_RISC & \
-	sdk-hpux, motif, ia64_32 & \
+	sdk-hpux, gtk, ia64 & \
 	sdk-macosx, carbon, ppc& \
 	sdk-macosx, cocoa, x86 & \
 	sdk-macosx, cocoa, x86_64 & \
@@ -51,7 +51,7 @@ configs=launcher-common,common,common&\
 	platform-solaris, gtk, sparc & \
 	platform-aix, motif, ppc & \
 	platform-hpux, motif, PA_RISC & \
-	platform-hpux, motif, ia64_32 & \
+	platform-hpux, gtk, ia64 & \
 	platform-macosx, carbon, ppc&\
 	platform-macosx, cocoa, x86 & \
 	platform-macosx, cocoa, x86_64 & \
@@ -108,8 +108,8 @@ root.launcher-linux.gtk.x86_64=\
 root.launcher-linux.gtk.ppc=\
 			../../features/org.eclipse.equinox.executable/bin/gtk/linux/ppc
 
-root.launcher-hpux.motif.ia64_32=\
-			../../features/org.eclipse.equinox.executable/bin/motif/hpux/ia64_32
+root.launcher-hpux.gtk.ia64=\
+			../../features/org.eclipse.equinox.executable/bin/gtk/hpux/ia64
 
 #root.launcher-linux.gtk.ia64=\
 #			../../features/org.eclipse.equinox.executable/bin/gtk/linux/ia64
@@ -180,9 +180,9 @@ root.sdk-linux.gtk.ia64=\
 			../../features/org.eclipse.sdk/gtk,\
 			file:../../features/org.eclipse.platform/gtk/eclipse.ini			
 
-root.sdk-hpux.motif.ia64_32=\
-			../../features/org.eclipse.sdk/motif,\
-			file:../../features/org.eclipse.platform/motif/eclipse.ini			
+root.sdk-hpux.gtk.ia64=\
+			../../features/org.eclipse.sdk/gtk,\
+			file:../../features/org.eclipse.platform/gtk/eclipse.ini			
 
 root.sdk-linux.motif.x86=\
 			../../features/org.eclipse.sdk/motif,\
@@ -234,8 +234,8 @@ root.platform-linux.gtk.ppc=\
 root.platform-linux.gtk.ia64=\
 			../../features/org.eclipse.platform/gtk
 			
-root.platform-hpux.motif.ia64_32=\
-			../../features/org.eclipse.platform/motif
+root.platform-hpux.gtk.ia64=\
+			../../features/org.eclipse.platform/gtk
 			
 root.platform-linux.motif.x86=\
 			../../features/org.eclipse.platform/motif
@@ -280,8 +280,8 @@ root.equinox-launcher-aix.motif.ppc=\
 #			../../features/org.eclipse.equinox.executable/bin/motif/hpux/PA_RISC,\
 #			../../features/org.eclipse.rcp/rootfiles
 			
-root.equinox-launcher-hpux.motif.ia64_32=\
-		../../features/org.eclipse.equinox.executable/bin/motif/hpux/ia64_32,\
+root.equinox-launcher-hpux.gtk.ia64=\
+		../../features/org.eclipse.equinox.executable/bin/gtk/hpux/ia64,\
 		../../features/org.eclipse.rcp/rootfiles
 						
 #root.equinox-launcher-solaris.motif.sparc=\
@@ -330,7 +330,7 @@ root.examples-common.common.common=\
 root.permissions.755=eclipse
 root.launcher-aix.motif.ppc.permissions.755=*.so*,eclipse
 root.launcher-hpux.motif.PA_RISC.permissions.755=*.sl,eclipse
-root.launcher-hpux.motif.ia64_32.permissions.755=*.sl,eclipse
+root.launcher-hpux.gtk.ia64.permissions.755=*.sl,eclipse
 root.launcher-solaris.motif.sparc.permissions.755=*.so*,eclipse
 root.launcher-solaris.gtk.sparc.permissions.755=*.so*,eclipse
 root.launcher-linux.gtk.x86.permissions.755=*.so*,eclipse
diff --git a/features/org.eclipse.platform-feature/feature.xml b/features/org.eclipse.platform-feature/feature.xml
index e8fab277..fbe6d512 100644
--- a/features/org.eclipse.platform-feature/feature.xml
+++ b/features/org.eclipse.platform-feature/feature.xml
@@ -377,9 +377,9 @@
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.core.filesystem.hpux.ia64_32"
+         id="org.eclipse.core.filesystem.hpux.ia64"
          os="hpux"
-         arch="ia64_32"
+         arch="ia64"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/features/org.eclipse.platform-feature/pom.xml b/features/org.eclipse.platform-feature/pom.xml
index dea1872b..7f4630f9 100644
--- a/features/org.eclipse.platform-feature/pom.xml
+++ b/features/org.eclipse.platform-feature/pom.xml
@@ -45,7 +45,7 @@
                 <plugin id="org.eclipse.platform.doc.user"/>
 
                 <plugin id="org.eclipse.core.filesystem.aix.ppc"/>
-                <plugin id="org.eclipse.core.filesystem.hpux.ia64_32"/>
+                <plugin id="org.eclipse.core.filesystem.hpux.ia64"/>
                 <plugin id="org.eclipse.core.filesystem.linux.x86"/>
                 <plugin id="org.eclipse.core.filesystem.linux.x86_64"/>
                 <plugin id="org.eclipse.core.filesystem.solaris.sparc"/>
diff --git a/features/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html b/features/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html
index 99113248..62dfd7c9 100644
--- a/features/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html
+++ b/features/org.eclipse.platform-feature/rootfiles/readme/readme_eclipse.html
@@ -169,7 +169,7 @@ OSI Certified is a certification mark of the Open Source Initiative.&nbsp;</stro
 		<tr class="c1">
 			<td rowspan="1">HP-UX</td>
 			<td rowspan="1">11i v3</td>
-			<td rowspan="1">ia64 32-bit</td>
+			<td rowspan="1">ia64 64-bit</td>
 			<td rowspan="1">HP-UX Java 6 Update 10</td>
 			<td rowspan="1">GTK</td>
 		</tr>
diff --git a/features/org.eclipse.rcp/pom.xml b/features/org.eclipse.rcp/pom.xml
index 0290d92e..cfcbc757 100644
--- a/features/org.eclipse.rcp/pom.xml
+++ b/features/org.eclipse.rcp/pom.xml
@@ -53,7 +53,7 @@
                 <plugin id="org.eclipse.swt.cocoa.macosx" />
                 <plugin id="org.eclipse.swt.gtk.aix.ppc" />
                 <plugin id="org.eclipse.swt.gtk.aix.ppc64" />
-                <plugin id="org.eclipse.swt.gtk.hpux.ia64_32" />
+                <plugin id="org.eclipse.swt.gtk.hpux.ia64" />
 
                 <plugin id="org.eclipse.equinox.launcher.gtk.solaris.sparc" />
                 <plugin id="org.eclipse.equinox.launcher.gtk.solaris.x86" />