Attachment 240407 Details for Bug 429335 – Patch for replacing x86 with x86_64

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] Patch for replacing x86 with x86_64

rt.equinox.framework.patch2 (text/plain), 15.35 KB, created by Thorsten Heit

on 2014-02-28 12:29:20 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Thorsten Heit

Created: 2014-02-28 12:29:20 EST

Size: 15.35 KB

patch

obsolete

>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/.project rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/.project	Mi. Feb 26 11:45:53 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/.project	Fr. Feb 28 12:24:39 2014
>@@ -1,6 +1,6 @@
> <?xml version="1.0" encoding="UTF-8"?>
> <projectDescription>
>-	<name>org.eclipse.equinox.launcher.gtk.solaris.x86</name>
>+	<name>org.eclipse.equinox.launcher.gtk.solaris.x86_64</name>
> 	<comment></comment>
> 	<projects>
> 	</projects>
>Gemeinsame Unterverzeichnisse: rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF und rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/build.properties	Mi. Feb 26 11:45:53 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/build.properties	Fr. Feb 28 12:24:17 2014
>@@ -10,7 +10,7 @@
> ###############################################################################
> bin.includes = META-INF/,\
>                eclipse_*.so,\
>-               launcher.gtk.solaris.x86.properties,\
>+               launcher.gtk.solaris.x86_64.properties,\
>                about.html
>                
> customBuildCallbacks=customBuildCallbacks.xml
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/customBuildCallbacks.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/customBuildCallbacks.xml	Mi. Feb 26 11:45:53 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/customBuildCallbacks.xml	Mi. Feb 26 11:45:53 2014
>@@ -43,7 +43,7 @@
> 	<target name="post.build.sources">
> 	</target>
> 	
>-	<target name="pre.gather.bin.parts">
>+	<target name="pre.gather.bin.parts" unless="dontFetchBinaries">
> 		<property file="${basedir}/build.properties" />
> 		<basename file="${basedir}" property="fragmentName" />
> 		<available file="/gitroot/equinox/rt.equinox.binaries.git" type="dir" property="gitRepo" value="/gitroot/equinox/rt.equinox.binaries.git" />
>BinÃ¤rdateien rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/eclipse_1601.so und rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/eclipse_1601.so sind unterschiedlich
>Nur in rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86: launcher.gtk.solaris.x86.properties
>Nur in rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64: launcher.gtk.solaris.x86_64.properties
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/pom.xml	Mi. Feb 26 11:45:53 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/pom.xml	Fr. Feb 28 12:24:01 2014
>@@ -18,7 +18,7 @@
>     <relativePath>../../launcher-binary-parent</relativePath>
>   </parent>
>   <groupId>org.eclipse.equinox</groupId>
>-  <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86</artifactId>
>+  <artifactId>org.eclipse.equinox.launcher.gtk.solaris.x86_64</artifactId>
>   <version>1.1.200-SNAPSHOT</version>
>   <packaging>eclipse-plugin</packaging>
> 
>@@ -26,6 +26,6 @@
>     <launcher-binary.version>1500</launcher-binary.version>
>     <os>solaris</os>
>     <ws>gtk</ws>
>-    <arch>x86</arch>
>+    <arch>x86_64</arch>
>   </properties>
> </project>
>Gemeinsame Unterverzeichnisse: rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target und rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF/MANIFEST.MF
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/META-INF/MANIFEST.MF	Mi. Feb 26 11:45:53 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/META-INF/MANIFEST.MF	Fr. Feb 28 12:24:34 2014
>@@ -2,9 +2,9 @@
> Bundle-ManifestVersion: 2
> Bundle-Name: %pluginName
> Bundle-Vendor: %providerName
>-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86;singleton:=true
>+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86_64;singleton:=true
> Bundle-Version: 1.1.200.qualifier
> Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4.0)"
>-Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86))
>-Bundle-Localization: launcher.gtk.solaris.x86
>+Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=x86_64))
>+Bundle-Localization: launcher.gtk.solaris.x86_64
> Eclipse-BundleShape: dir
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/MANIFEST.MF rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/MANIFEST.MF
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/MANIFEST.MF	Fr. Feb 28 18:22:51 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/MANIFEST.MF	Fr. Feb 28 18:22:52 2014
>@@ -1,17 +1,18 @@
> Manifest-Version: 1.0
> Eclipse-SourceReferences: scm:git:http://git.eclipse.org/gitroot/equin
>  ox/rt.equinox.framework.git;path="bundles/org.eclipse.equinox.launche
>- r.gtk.solaris.x86";commitId=ddf0ae7a62c82abbfaf695c1dfccbbb0bb49f547
>+ r.gtk.solaris.x86_64";commitId=ddf0ae7a62c82abbfaf695c1dfccbbb0bb49f5
>+ 47
> Bundle-Vendor: %providerName
> Fragment-Host: org.eclipse.equinox.launcher;bundle-version="[1.0.0,1.4
>  .0)"
> Eclipse-BundleShape: dir
>-Bundle-Version: 1.1.200.v20140225-1619
>+Bundle-Version: 1.1.200.v20140228-1356
> Eclipse-PlatformFilter: (& (osgi.ws=gtk) (osgi.os=solaris) (osgi.arch=
>- x86))
>-Bundle-Localization: launcher.gtk.solaris.x86
>+ x86_64))
>+Bundle-Localization: launcher.gtk.solaris.x86_64
> Bundle-Name: %pluginName
> Bundle-ManifestVersion: 2
>-Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86;sing
>- leton:=true
>+Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86_64;s
>+ ingleton:=true
> 
>Gemeinsame Unterverzeichnisse: rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/antrun und rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/antrun
>Nur in rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target: baseline
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/local-artifacts.properties rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/local-artifacts.properties
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/local-artifacts.properties	Fr. Feb 28 18:22:51 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/local-artifacts.properties	Fr. Feb 28 18:22:52 2014
>@@ -1,4 +1,4 @@
>-#Fri Feb 28 18:22:51 CET 2014
>-artifact.attached.p2metadata=/home/h2841/git/eclipse/eclipse.platform.releng.aggregator/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/p2content.xml
>-artifact.main=/home/h2841/git/eclipse/eclipse.platform.releng.aggregator/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/org.eclipse.equinox.launcher.gtk.solaris.x86-1.1.200-SNAPSHOT.jar
>-artifact.attached.p2artifacts=/home/h2841/git/eclipse/eclipse.platform.releng.aggregator/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/p2artifacts.xml
>+#Fri Feb 28 18:22:52 CET 2014
>+artifact.attached.p2metadata=/home/h2841/git/eclipse/eclipse.platform.releng.aggregator/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/p2content.xml
>+artifact.main=/home/h2841/git/eclipse/eclipse.platform.releng.aggregator/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/org.eclipse.equinox.launcher.gtk.solaris.x86_64-1.1.200-SNAPSHOT.jar
>+artifact.attached.p2artifacts=/home/h2841/git/eclipse/eclipse.platform.releng.aggregator/rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/p2artifacts.xml
>Nur in rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target: org.eclipse.equinox.launcher.gtk.solaris.x86-1.1.200-SNAPSHOT.jar
>Nur in rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target: org.eclipse.equinox.launcher.gtk.solaris.x86_64-1.1.200-SNAPSHOT.jar
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/p2artifacts.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/p2artifacts.xml
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/p2artifacts.xml	Fr. Feb 28 18:22:51 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/p2artifacts.xml	Fr. Feb 28 18:22:52 2014
>@@ -1,12 +1,12 @@
> <?xml version='1.0' encoding='UTF-8'?>
> <?artifactRepository version='1.1.0'?>
> <artifacts size='1'>
>-  <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.gtk.solaris.x86' version='1.1.200.v20140225-1619'>
>+  <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.gtk.solaris.x86_64' version='1.1.200.v20140228-1356'>
>     <properties size='5'>
>-      <property name='artifact.size' value='31494'/>
>-      <property name='download.size' value='31494'/>
>+      <property name='artifact.size' value='38192'/>
>+      <property name='download.size' value='38192'/>
>       <property name='maven-groupId' value='org.eclipse.equinox'/>
>-      <property name='maven-artifactId' value='org.eclipse.equinox.launcher.gtk.solaris.x86'/>
>+      <property name='maven-artifactId' value='org.eclipse.equinox.launcher.gtk.solaris.x86_64'/>
>       <property name='maven-version' value='1.1.200-SNAPSHOT'/>
>     </properties>
>   </artifact>
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/p2content.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/p2content.xml
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/p2content.xml	Fr. Feb 28 18:22:51 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/p2content.xml	Fr. Feb 28 18:22:52 2014
>@@ -1,22 +1,22 @@
> <?xml version='1.0' encoding='UTF-8'?>
> <units size='1'>
>-  <unit id='org.eclipse.equinox.launcher.gtk.solaris.x86' version='1.1.200.v20140225-1619'>
>-    <update id='org.eclipse.equinox.launcher.gtk.solaris.x86' range='[0.0.0,1.1.200.v20140225-1619)' severity='0'/>
>+  <unit id='org.eclipse.equinox.launcher.gtk.solaris.x86_64' version='1.1.200.v20140228-1356'>
>+    <update id='org.eclipse.equinox.launcher.gtk.solaris.x86_64' range='[0.0.0,1.1.200.v20140228-1356)' severity='0'/>
>     <properties size='8'>
>       <property name='df_LT.providerName' value='Eclipse.org - Equinox'/>
>-      <property name='df_LT.pluginName' value='Equinox Launcher Solaris X86 Fragment'/>
>+      <property name='df_LT.pluginName' value='Equinox Launcher Solaris X86_64 Fragment'/>
>       <property name='org.eclipse.equinox.p2.name' value='%pluginName'/>
>       <property name='org.eclipse.equinox.p2.provider' value='%providerName'/>
>-      <property name='org.eclipse.equinox.p2.bundle.localization' value='launcher.gtk.solaris.x86'/>
>+      <property name='org.eclipse.equinox.p2.bundle.localization' value='launcher.gtk.solaris.x86_64'/>
>       <property name='maven-groupId' value='org.eclipse.equinox'/>
>-      <property name='maven-artifactId' value='org.eclipse.equinox.launcher.gtk.solaris.x86'/>
>+      <property name='maven-artifactId' value='org.eclipse.equinox.launcher.gtk.solaris.x86_64'/>
>       <property name='maven-version' value='1.1.200-SNAPSHOT'/>
>     </properties>
>     <provides size='5'>
>-      <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.launcher.gtk.solaris.x86' version='1.1.200.v20140225-1619'/>
>-      <provided namespace='osgi.bundle' name='org.eclipse.equinox.launcher.gtk.solaris.x86' version='1.1.200.v20140225-1619'/>
>+      <provided namespace='org.eclipse.equinox.p2.iu' name='org.eclipse.equinox.launcher.gtk.solaris.x86_64' version='1.1.200.v20140228-1356'/>
>+      <provided namespace='osgi.bundle' name='org.eclipse.equinox.launcher.gtk.solaris.x86_64' version='1.1.200.v20140228-1356'/>
>       <provided namespace='org.eclipse.equinox.p2.eclipse.type' name='bundle' version='1.0.0'/>
>-      <provided namespace='osgi.fragment' name='org.eclipse.equinox.launcher' version='1.1.200.v20140225-1619'/>
>+      <provided namespace='osgi.fragment' name='org.eclipse.equinox.launcher' version='1.1.200.v20140228-1356'/>
>       <provided namespace='org.eclipse.equinox.p2.localization' name='df_LT' version='1.0.0'/>
>     </provides>
>     <requires size='1'>
>@@ -23,16 +23,16 @@
>       <required namespace='osgi.bundle' name='org.eclipse.equinox.launcher' range='[1.0.0,1.4.0)'/>
>     </requires>
>     <filter>
>-      (&amp;(osgi.arch=x86)(osgi.os=solaris)(osgi.ws=gtk))
>+      (&amp;(osgi.arch=x86_64)(osgi.os=solaris)(osgi.ws=gtk))
>     </filter>
>     <artifacts size='1'>
>-      <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.gtk.solaris.x86' version='1.1.200.v20140225-1619'/>
>+      <artifact classifier='osgi.bundle' id='org.eclipse.equinox.launcher.gtk.solaris.x86_64' version='1.1.200.v20140228-1356'/>
>     </artifacts>
>     <touchpoint id='org.eclipse.equinox.p2.osgi' version='1.0.0'/>
>     <touchpointData size='1'>
>       <instructions size='2'>
>         <instruction key='manifest'>
>-          Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86;singleton:=true&#xA;Bundle-Version: 1.1.200.v20140225-1619&#xA;Fragment-Host: org.eclipse.equinox.launcher;bundle-version=&quot;[1.0.0,1.4.0)&quot;
>+          Bundle-SymbolicName: org.eclipse.equinox.launcher.gtk.solaris.x86_64;singleton:=true&#xA;Bundle-Version: 1.1.200.v20140228-1356&#xA;Fragment-Host: org.eclipse.equinox.launcher;bundle-version=&quot;[1.0.0,1.4.0)&quot;&#xA;
>         </instruction>
>         <instruction key='zipped'>
>           true
>diff -ur rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/antrun/build-main.xml rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/antrun/build-main.xml
>--- rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86/target/antrun/build-main.xml	Fr. Feb 28 18:22:50 2014
>+++ rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.solaris.x86_64/target/antrun/build-main.xml	Fr. Feb 28 18:22:51 2014
>@@ -2,7 +2,7 @@
> <project name="maven-antrun-" default="main"  >
> <target name="main">
>   <copy todir="." overwrite="true">
>-    <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.x86/">
>+    <fileset dir="../../../rt.equinox.binaries/org.eclipse.equinox.launcher.gtk.solaris.x86_64/">
>       <include name="*.so"/>
>       <include name="*.dll"/>
>     </fileset>

Actions: View | Diff

Attachments on bug 429335: 240406 | 240407 | 240408 | 240452 | 240453 | 246085 | 246086 | 246088 | 246125