rpms/eclipse/devel eclipse-s390ands390x.patch, 1.5, 1.6 eclipse.spec, 1.223, 1.224
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Jan 4 22:23:23 UTC 2006
Author: overholt
Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3083
Modified Files:
eclipse-s390ands390x.patch eclipse.spec
Log Message:
* Wed Jan 04 2006 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_14fc
- Update s390{,x} patches.
- Use natively-compiled ecj during build.
eclipse-s390ands390x.patch:
assemble.org.eclipse.sdk.all.xml | 6
assemble.org.eclipse.sdk.linux.gtk.s390.xml | 619 ++++++++++
assemble.org.eclipse.sdk.linux.gtk.s390x.xml | 619 ++++++++++
build | 4
build.xml | 12
features/org.eclipse.jdt.source/build.xml | 4
features/org.eclipse.jdt/build.xml | 12
features/org.eclipse.pde.source/build.xml | 4
features/org.eclipse.pde/build.xml | 4
features/org.eclipse.platform.launchers/build.xml | 4
features/org.eclipse.platform.launchers/feature.xml | 2
features/org.eclipse.platform.launchers/library/gtk/build.sh | 8
features/org.eclipse.platform.launchers/target.build.properties | 4
features/org.eclipse.platform.source/build.xml | 16
features/org.eclipse.platform.source/feature.xml | 2
features/org.eclipse.platform/build.properties | 2
features/org.eclipse.platform/build.xml | 20
features/org.eclipse.sdk/build.xml | 12
plugins/org.eclipse.jdt.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.jdt.source.linux.gtk.s390/build.properties | 3
plugins/org.eclipse.jdt.source.linux.gtk.s390/fragment.xml | 9
plugins/org.eclipse.jdt.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.jdt.source.linux.gtk.s390x/build.properties | 3
plugins/org.eclipse.jdt.source.linux.gtk.s390x/fragment.xml | 9
plugins/org.eclipse.osgi/core/framework/org/eclipse/osgi/framework/internal/core/processor.aliases | 1
plugins/org.eclipse.osgi/eclipseAdaptor/src/org/eclipse/osgi/service/environment/Constants.java | 16
plugins/org.eclipse.pde.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.pde.source.linux.gtk.s390/build.properties | 3
plugins/org.eclipse.pde.source.linux.gtk.s390/fragment.xml | 9
plugins/org.eclipse.pde.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.pde.source.linux.gtk.s390x/build.properties | 3
plugins/org.eclipse.pde.source.linux.gtk.s390x/fragment.xml | 9
plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.platform.source.linux.gtk.s390/about.html | 27
plugins/org.eclipse.platform.source.linux.gtk.s390/build.properties | 3
plugins/org.eclipse.platform.source.linux.gtk.s390/build.xml | 109 +
plugins/org.eclipse.platform.source.linux.gtk.s390/fragment.xml | 9
plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF | 7
plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html | 27
plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties | 3
plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml | 109 +
plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml | 9
42 files changed, 1731 insertions(+), 26 deletions(-)
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.5 -r 1.6 eclipse-s390ands390x.patch
Index: eclipse-s390ands390x.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse-s390ands390x.patch,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- eclipse-s390ands390x.patch 23 May 2005 17:01:40 -0000 1.5
+++ eclipse-s390ands390x.patch 4 Jan 2006 22:23:19 -0000 1.6
@@ -1,9 +1,9 @@
-diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.all.xml
---- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.all.xml 2005-04-01 16:54:41.000000000 -0500
-+++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.all.xml 2005-04-14 15:56:36.000000000 -0400
+diff -uNr orig/assemble.org.eclipse.sdk.all.xml patched/assemble.org.eclipse.sdk.all.xml
+--- orig/assemble.org.eclipse.sdk.all.xml 2006-01-03 17:40:22.000000000 -0500
++++ patched/assemble.org.eclipse.sdk.all.xml 2006-01-03 17:14:52.000000000 -0500
@@ -19,6 +19,12 @@
- <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.x86_64">
- <property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.x86_64.xml"/>
+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.ia64">
+ <property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.ia64.xml"/>
</ant>
+ <ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.gtk.s390">
+ <property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.gtk.s390.xml"/>
@@ -14,13 +14,13 @@
<ant antfile="${customTargets}" target="assemble.org.eclipse.sdk.linux.motif.x86">
<property name="assembleScriptName" value="assemble.org.eclipse.sdk.linux.motif.x86.xml"/>
</ant>
-diff -ruN eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390.xml
---- eclipse-3.1.0_fc/assemble.org.eclipse.sdk.linux.gtk.s390.xml 1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.with-s390/assemble.org.eclipse.sdk.linux.gtk.s390.xml 2005-04-14 15:56:36.000000000 -0400
-@@ -0,0 +1,336 @@
+diff -uNr orig/assemble.org.eclipse.sdk.linux.gtk.s390.xml patched/assemble.org.eclipse.sdk.linux.gtk.s390.xml
+--- orig/assemble.org.eclipse.sdk.linux.gtk.s390.xml 1969-12-31 19:00:00.000000000 -0500
++++ patched/assemble.org.eclipse.sdk.linux.gtk.s390.xml 2006-01-03 17:14:52.000000000 -0500
+@@ -0,0 +1,619 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="Assemble org.eclipse.sdk" default="main">
-+ <property name="archiveName" value="org.eclipse.sdk-${buildId}-linux.gtk.s390.zip"/>
++ <property name="archiveName" value="org.eclipse.sdk-${buildId}-linux.gtk.s390.tar.gz"/>
+ <property name="os" value="linux"/>
+ <property name="ws" value="gtk"/>
+ <property name="arch" value="s390"/>
@@ -29,6 +29,7 @@
+ <property name="eclipse.plugins" value="${eclipse.base}/plugins"/>
+ <property name="eclipse.features" value="${eclipse.base}/features"/>
+ <property name="archiveFullPath" value="${basedir}/${buildLabel}/${archiveName}"/>
++ <property name="tarargs" value=""/>
+ <!-- Beginning of the jarUp task -->
+ <target name="jarUp" description="Create a jar from the given location.">
+ <available property="${source}/${elementName}_exists" file="${source}/${elementName}"/>
@@ -38,10 +39,15 @@
+ </antcall>
+ </target>
+ <target name="jarIng" if="${source}/${elementName}_exists">
-+ <zip zipfile="${source}/${elementName}.jar" basedir="${source}/${elementName}" filesonly="false" whenempty="skip" update="false"/>
++ <zip destfile="${source}/${elementName}.jar" basedir="${source}/${elementName}" filesonly="false" whenempty="skip" update="false"/>
+ <delete dir="${source}/${elementName}"/>
+ </target>
+ <!-- End of the jarUp task -->
++ <!-- Beginning of the jar signing target -->
++ <target name="jarSigning" description="Sign a jar.">
++ <signjar jar="${source}/${elementName}.jar" alias="${sign.alias}" keystore="${sign.keystore}" storepass="${sign.storepass}"/>
++ </target>
++ <!-- End of the jarUp task -->
+ <target name="main">
+ <condition property="pluginArchivePrefix" value="plugins">
+ <equals arg1="${archivePrefix}" arg2="" trim="true"/>
@@ -53,314 +59,591 @@
+ </condition>
+ <property name="featureArchivePrefix" value="${archivePrefix}/features"/>
+
-+ <delete dir="${assemblyTempDir}"/>
+ <dirname property="archiveParentFolder" file="${archiveFullPath}"/>
+ <mkdir dir="${archiveParentFolder}"/>
+ <mkdir dir="${assemblyTempDir}"/>
+ <mkdir dir="${buildLabel}"/>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.boot" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.apache.ant" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.help.appserver" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.ant.ui" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.runtime" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.search" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.ui" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench.compatibility" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.source" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.source" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.debug.ui" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.swt" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.junit.runtime" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.junit.runtime" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.core.variables" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.ant.core" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.workbench.texteditor" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.debug" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.linux" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.console" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.help.webapp" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh2" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.core.expressions" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.build" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.update.core.linux" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.debug.core" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.osgi" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.team.cvs.ssh" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.core.boot" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.core.refactoring" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.ui" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.platform" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.swt" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.text" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.osgi.services" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jface.text" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.platform.source" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jface" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.rcp" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.ui" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.swt.gtk.linux.s390" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.doc.user" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.debug.ui" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.tomcat" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.core.commands" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.junit" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.pde.build" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.launching" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.team.ui" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.apache.lucene" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.update.scheduler" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.filebuffers" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.core.resources.compatibility" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.jdt.junit" target="gather.bin.parts">
+ <property name="destination.temp.folder" value="${eclipse.plugins}"/>
+ </ant>
-+ <ant antfile="build.xml" dir="plugins/org.eclipse.ui.cheatsheets" target="gather.bin.parts">
++ <ant antfile="build.xml" dir="plugins/org.eclipse.ltk.core.refactoring" target="gather.bin.parts">
[...2103 lines suppressed...]
+ <location path="src" />
+ </extension>
+
+</fragment>
-diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties
---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 2005-04-14 15:56:36.792485341 -0400
+diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF patched/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF
+--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500
++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500
+@@ -0,0 +1,7 @@
++Manifest-Version: 1.0
++Bundle-Name: %pluginName
++Bundle-SymbolicName: org.eclipse.platform.source.linux.gtk.s390; singleton=true
++Bundle-Version: 3.1.1
++Fragment-Host: org.eclipse.platform.source;bundle-version="3.1.1"
++Bundle-Localization: plugin
++Bundle-Vendor: %providerName
+diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html
+--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 1969-12-31 19:00:00.000000000 -0500
++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/about.html 2006-01-03 17:14:53.000000000 -0500
+@@ -0,0 +1,27 @@
++<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
++<html>
++<head>
++<title>About</title>
++<meta http-equiv=Content-Type content="text/html; charset=ISO-8859-1">
++</head>
++<body lang="EN-US">
++<h2>About This Content</h2>
++
++<p>February 24, 2005</p>
++<h3>License</h3>
++
++<p>The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the
++Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
++For purposes of the EPL, "Program" will mean the Content.</p>
++
++<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may
++apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
++indicated below, the terms and conditions of the EPL still apply to any source code in the Content.</p>
++
++<h3>Source Code</h3>
++<p>This plug-in contains source code zip files ("Source Zips") that correspond to binary content in other plug-ins. These Source Zips may be distributed under different license
++agreements and/or notices. Details about these license agreements and notices are contained in "about.html" files ("Abouts") located in sub-directories in the
++src/ directory of this plug-in. Such Abouts govern your use of the Source Zips in that directory, not the EPL.</p>
++
++</body>
++</html>
+\ No newline at end of file
+diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties
+--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 1969-12-31 19:00:00.000000000 -0500
++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.properties 2006-01-03 17:14:53.000000000 -0500
@@ -0,0 +1,3 @@
+#Sat Feb 19 15:09:09 EST 2005
-+bin.includes=fragment.xml,src/**
++bin.includes=fragment.xml,src/**,META-INF/MANIFEST.MF
+sourcePlugin=true
-diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml
---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 2005-04-14 15:56:36.793485149 -0400
-@@ -0,0 +1,105 @@
+diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml
+--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 1969-12-31 19:00:00.000000000 -0500
++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/build.xml 2006-01-03 17:14:53.000000000 -0500
+@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="org.eclipse.platform.source.linux.gtk.s390x" default="build.jars" basedir=".">
+
-+ <property name="bootclasspath" value=""/>
+ <property name="basews" value="${ws}"/>
+ <property name="baseos" value="${os}"/>
+ <property name="basearch" value="${arch}"/>
+ <property name="basenl" value="${nl}"/>
++
++ <!-- Compiler settings. -->
+ <property name="javacFailOnError" value="false"/>
+ <property name="javacDebugInfo" value="on"/>
+ <property name="javacVerbose" value="true"/>
+ <property name="javacSource" value="1.3"/>
+ <property name="javacTarget" value="1.2"/>
+ <property name="compilerArg" value=""/>
++ <path id="path_bootclasspath">
++ <fileset dir="${java.home}/lib">
++ <include name="*.jar"/>
++ </fileset>
++ </path>
++ <property name="bootclasspath" refid="path_bootclasspath"/>
+
+ <target name="init" depends="properties">
+ <condition property="pluginTemp" value="${buildTempFolder}/plugins">
@@ -1318,6 +1971,7 @@
+
+ <target name="properties" if="eclipse.running">
+ <property name="build.compiler" value="org.eclipse.jdt.core.JDTCompilerAdapter"/>
++
+ </target>
+
+ <target name="build.update.jar" depends="init" description="Build the plug-in: org.eclipse.platform.source.linux.gtk.s390x for an update site.">
@@ -1327,30 +1981,26 @@
+ <antcall target="gather.bin.parts">
+ <param name="destination.temp.folder" value="${temp.folder}/"/>
+ </antcall>
-+ <zip zipfile="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0.jar" basedir="${temp.folder}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0" filesonly="false" whenempty="skip" update="false"/>
++ <zip destfile="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.1.jar" basedir="${temp.folder}/org.eclipse.platform.source.linux.gtk.s390x_3.1.1" filesonly="false" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+ <target name="build.jars">
-+ <ant antfile="build.xml" dir="../org.eclipse.swt.gtk64" target="build.sources"/>
-+ <ant antfile="build.xml" dir="../org.eclipse.swt.gtk64" target="gather.sources">
++ <ant antfile="build.xml" dir="../org.eclipse.update.core.linux" target="build.sources"/>
++ <ant antfile="build.xml" dir="../org.eclipse.update.core.linux" target="gather.sources">
+ <property name="destination.temp.folder" value="${basedir}/src"/>
+ </ant>
+ <ant antfile="build.xml" dir="../org.eclipse.core.resources.linux" target="build.sources"/>
+ <ant antfile="build.xml" dir="../org.eclipse.core.resources.linux" target="gather.sources">
+ <property name="destination.temp.folder" value="${basedir}/src"/>
+ </ant>
-+ <ant antfile="build.xml" dir="../org.eclipse.update.core.linux" target="build.sources"/>
-+ <ant antfile="build.xml" dir="../org.eclipse.update.core.linux" target="gather.sources">
-+ <property name="destination.temp.folder" value="${basedir}/src"/>
-+ </ant>
+ </target>
+ <target name="build.sources">
+ </target>
+
+ <target name="gather.bin.parts" depends="init" if="destination.temp.folder">
+ <mkdir dir="${destination.temp.folder}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0"/>
-+ <copy todir="${destination.temp.folder}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0" failonerror="true">
-+ <fileset dir="${basedir}" includes="fragment.xml,src/**" />
++ <copy todir="${destination.temp.folder}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0" failonerror="true" overwrite="false">
++ <fileset dir="${basedir}" includes="about.html,fragment.xml,src/**,META-INF/" />
+ </copy>
+ </target>
+
@@ -1364,13 +2014,13 @@
+ </target>
+
+ <target name="clean" depends="init" description="Clean the plug-in: org.eclipse.platform.source.linux.gtk.s390x of all the zips, jars and logs created.">
-+ <delete file="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0.jar"/>
-+ <delete file="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0.zip"/>
++ <delete file="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.1.jar"/>
++ <delete file="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.1.zip"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+ <target name="refresh" depends="init" if="eclipse.running" description="Refresh this folder.">
-+ <eclipse.convertPath fileSystemPath="/builds/I/src/plugins/org.eclipse.platform.source.linux.gtk.s390x" property="resourcePath"/>
++ <eclipse.convertPath fileSystemPath="/builds/M200509290840/src/plugins/org.eclipse.platform.source.linux.gtk.s390x" property="resourcePath"/>
+ <eclipse.refreshLocal resource="${resourcePath}" depth="infinite"/>
+ </target>
+
@@ -1388,30 +2038,32 @@
+ <delete>
+ <fileset dir="${temp.folder}" includes="**/*.bin.log" />
+ </delete>
-+ <zip zipfile="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.0.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
++ <zip destfile="${plugin.destination}/org.eclipse.platform.source.linux.gtk.s390x_3.1.1.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
+ <delete dir="${temp.folder}"/>
+ </target>
+
+</project>
-diff -ruN eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml
---- eclipse-3.1.0_fc/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500
-+++ eclipse-3.1.0_fc.with-s390/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 2005-04-14 15:56:36.794484957 -0400
-@@ -0,0 +1,18 @@
+diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml
+--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 1969-12-31 19:00:00.000000000 -0500
++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/fragment.xml 2006-01-03 17:14:53.000000000 -0500
+@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
-+<fragment
-+ id="org.eclipse.platform.source.linux.gtk.s390x"
-+ name="%pluginName"
-+ version="3.1.0"
-+ provider-name="Eclipse.org"
-+ plugin-id="org.eclipse.platform.source"
-+ plugin-version="3.1.0">
-+
-+ <runtime>
-+ </runtime>
++<fragment>
+
+ <extension point = "org.eclipse.pde.core.source">
+ <location path="src" />
+ </extension>
+
+</fragment>
+diff -uNr orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF
+--- orig/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 1969-12-31 19:00:00.000000000 -0500
++++ patched/plugins/org.eclipse.platform.source.linux.gtk.s390x/META-INF/MANIFEST.MF 2006-01-03 17:14:53.000000000 -0500
+@@ -0,0 +1,7 @@
++Manifest-Version: 1.0
++Bundle-Name: %pluginName
++Bundle-SymbolicName: org.eclipse.platform.source.linux.gtk.s390x; singleton=true
++Bundle-Version: 3.1.1
++Fragment-Host: org.eclipse.platform.source;bundle-version="3.1.1"
++Bundle-Localization: plugin
++Bundle-Vendor: %providerName
Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.223
retrieving revision 1.224
diff -u -r1.223 -r1.224
--- eclipse.spec 4 Jan 2006 22:20:08 -0000 1.223
+++ eclipse.spec 4 Jan 2006 22:23:19 -0000 1.224
@@ -59,9 +59,9 @@
# We can't really commit to doing builds for these arches upstream, but we
# need at least eclipse-ecj to run on them as it's our bytecode compiler for
# Fedora.
-#Patch13: %{name}-s390ands390x.patch
+Patch13: %{name}-s390ands390x.patch
# Stupid spaces in directories ...
-#Patch14: %{name}-s390ands390x2.patch
+Patch14: %{name}-s390ands390x2.patch
# Make find work. See
# https://bugzilla.redhat.com/bugzilla/attachment.cgi?id=111736
#Patch16: %{name}-find.patch
@@ -327,14 +327,14 @@
%patch0 -p0
%patch11 -p0
%if %{gcj_support}
-#%patch14 -p0
+%patch14 -p0
%endif
popd
%patch2 -p0
%patch4 -p0
%patch5 -p0
%if %{gcj_support}
-#%patch13 -p1
+%patch13 -p1
%endif
%if %{gcj_support}
#%patch16 -p0
@@ -1264,7 +1264,7 @@
%{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.1
%changelog
-* Wed Jan 04 2005 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_14fc
+* Wed Jan 04 2006 Andrew Overholt <overholt at redhat.com> 3.1.1-1jpp_14fc
- Update s390{,x} patches.
- Use natively-compiled ecj during build.
More information about the fedora-cvs-commits
mailing list