[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse/FC-6 eclipse-ecj-gcj.patch, 1.2, 1.3 eclipse-pde.build-add-package-build.patch, 1.2, 1.3 eclipse.spec, 1.353, 1.354 eclipse-javadoclinks.patch, 1.5, NONE eclipse-searchindexlucene.patch, 1.1, NONE



Author: bkonrath

Update of /cvs/dist/rpms/eclipse/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv4364

Modified Files:
	eclipse-ecj-gcj.patch 
	eclipse-pde.build-add-package-build.patch eclipse.spec 
Removed Files:
	eclipse-javadoclinks.patch eclipse-searchindexlucene.patch 
Log Message:
* Wed Apr 11 2007 Ben Konrath <bkonrath redhat com> 3.2.2-2.fc6
- Fix links to system-installed javadocs.
- Update package-build releng script to work with 3.2 plugins.
- Update ecj-gcj patch.
- Resolves: 237835. 


eclipse-ecj-gcj.patch:
 GCCMain.java        |  495 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 messages.properties |    5 
 2 files changed, 500 insertions(+)

Index: eclipse-ecj-gcj.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-ecj-gcj.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-ecj-gcj.patch	21 Feb 2007 05:25:12 -0000	1.2
+++ eclipse-ecj-gcj.patch	25 Apr 2007 16:53:32 -0000	1.3
@@ -1,3 +1,19 @@
+Index: batch/org/eclipse/jdt/internal/compiler/batch/messages.properties
+===================================================================
+RCS file: /cvsroot/eclipse/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/messages.properties,v
+retrieving revision 1.546.2.23
+diff -u -r1.546.2.23 messages.properties
+--- batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	8 Feb 2007 15:04:43 -0000	1.546.2.23
++++ batch/org/eclipse/jdt/internal/compiler/batch/messages.properties	26 Feb 2007 18:21:06 -0000
+@@ -249,3 +249,8 @@
+ template.restrictedAccess.constructor = The constructor {0} is not accessible due to restriction on classpath entry {1}
+ template.restrictedAccess.field = The field {0} from the type {1} is not accessible due to restriction on classpath entry {2}
+ template.restrictedAccess.method = The method {0} from the type {1} is not accessible due to restriction on classpath entry {2}
++
++# GCCMain messages.
++gcc.zipArg=-fzip-target requires argument
++gcc.zipDepArg=-fzip-dependency requires argument
++gcc.noClasspath=no classpath specified
 Index: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
 ===================================================================
 RCS file: batch/org/eclipse/jdt/internal/compiler/batch/GCCMain.java
@@ -351,7 +367,7 @@
 +						this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$
 +				}
 +				this.destinationPath = arg;
-+				// this.generatePackagesStructure = true;
++				this.generatePackagesStructure = true;
 +			} else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$
 +				classpath = getArgument(currentArg);
 +			} else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$

eclipse-pde.build-add-package-build.patch:
 build.properties                  |   12 +++
 customTargets-assemble-target.xml |   12 +++
 customTargets.xml                 |  144 ++++++++++++++++++++++++++++++++++++++
 prepare-build-dir.sh              |   77 ++++++++++++++++++++
 4 files changed, 245 insertions(+)

Index: eclipse-pde.build-add-package-build.patch
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse-pde.build-add-package-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-pde.build-add-package-build.patch	30 Jan 2007 00:09:14 -0000	1.2
+++ eclipse-pde.build-add-package-build.patch	25 Apr 2007 16:53:32 -0000	1.3
@@ -193,42 +193,9 @@
 diff -N templates/package-build/prepare-build-dir.sh
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ templates/package-build/prepare-build-dir.sh	1 Jan 1970 00:00:00 -0000
-@@ -0,0 +1,83 @@
+@@ -0,0 +1,77 @@
 +#!/bin/sh
 +
-+
-+make_links()
-+{
-+  TYPE=$1
-+  TYPEDIR=$2
-+  shift; shift;
-+  XMLFILES=$@
-+  
-+  CURBUILDFILE=$BUILDDIR/tmp/$TYPE-build.xml
-+  cat $BUILDFILE | sed "s|@type@|$TYPE|" > $CURBUILDFILE
-+
-+  for f in $XMLFILES; do
-+    PROJECTDIR=$(dirname $f)
-+    PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $CURBUILDFILE 2>&1 | grep echo | cut --delimiter=' ' -f 7)
-+    if [ -z $PROJECTNAME ]; then
-+      if [ ! -e $PROJECTDIR/META-INF/MANIFEST.MF ]; then
-+        echo "ERROR: could not determine the feature id for $PROJECTDIR"
-+        exit 1
-+      fi
-+      PROJECTNAME=$(grep Bundle-SymbolicName $PROJECTDIR/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
-+      if [ -z $PROJECTNAME  ]; then
-+        echo "ERROR: could not determine the feature id for $PROJECTDIR"
-+        exit 1
-+      fi
-+    fi
-+    
-+    echo "  making symlink: $BUILDDIR/$TYPEDIR/$PROJECTNAME -> $PROJECTDIR"
-+    ln -sf $PROJECTDIR $BUILDDIR/$TYPEDIR/$PROJECTNAME 
-+
-+  done
-+}
-+
-+
 +if [ $# -ne 2 ]; then 
 +  echo "usage: $0 <path to source dir> <path to build dir>"
 +  exit 1
@@ -257,23 +224,50 @@
 +        </target>
 +</project>" > $BUILDFILE
 +
-+# find the feature.xml, plugin.xml and fragment.xml files
-+FEATURES=$(find $SOURCEDIR -name feature.xml)
-+PLUGINS=$(find $SOURCEDIR -name plugin.xml) 
-+FRAGMENTS=$(find $SOURCEDIR -name fragment.xml) 
++for type in feature plugin fragment; do
++  CURBUILDFILE=$BUILDDIR/tmp/$type-build.xml
++  cat $BUILDFILE | sed "s|@type@|$type|" > $CURBUILDFILE
++done
 +
 +# make the directories eclipse is expecting 
 +echo "  making the 'features' and 'plugins' directories"
 +mkdir -p $BUILDDIR/features $BUILDDIR/plugins
 +
 +# make symlinks for the features
-+make_links feature features $FEATURES
++FEATURES=$(find $SOURCEDIR -name feature.xml)
++for f in $FEATURES; do
++  PROJECTDIR=$(dirname $f)
++  PROJECTNAME=$(ant -Dbasedir=$PROJECTDIR -f $BUILDDIR/tmp/feature-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++  if [ -z $PROJECTNAME ]; then
++    echo "ERROR: could not determine the feature id for $PROJECTDIR"
++    exit 1
++  fi
++
++  echo "  making symlink: $BUILDDIR/features/$PROJECTNAME -> $PROJECTDIR"
++  ln -sf $PROJECTDIR $BUILDDIR/features/$PROJECTNAME
++done
++
++# make symlinks for plugins and fragments
++PLUGINDIRS=$(find $SOURCEDIR -name plugin.xml -o -name fragment.xml -o -name MANIFEST.MF | sed "s/plugin.xml//g" | sed "s/fragment.xml//g" | sed "s/META-INF\/MANIFEST.MF//" | sort | uniq)
++for dir in $PLUGINDIRS; do
++  PROJECTNAME=""
++  if [ -e $dir/META-INF/MANIFEST.MF ]; then
++    PROJECTNAME=$(grep Bundle-SymbolicName $dir/META-INF/MANIFEST.MF | cut --delimiter=';' -f 1 | cut --delimiter=' ' -f 2)
++  elif [ -e $dir/plugin.xml ]; then
++    PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/plugin-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++  elif [ -e $dir/fragment.xml ]; then
++    PROJECTNAME=$(ant -Dbasedir=$dir -f $BUILDDIR/tmp/fragment-build.xml 2>&1 | grep echo | cut --delimiter=' ' -f 7)
++  fi
++
++  if [ -z $PROJECTNAME  ]; then
++    echo "ERROR: could not determine the plugin or fragment id for $dir"
++    exit 1
++  fi
 +
-+# make the symlinks for plugins
-+make_links plugin plugins $PLUGINS
++  echo "  making symlink: $BUILDDIR/plugins/$PROJECTNAME -> $dir"
++  ln -sf $dir $BUILDDIR/plugins/$PROJECTNAME
 +
-+# make the symlinks for fragments - they go in the plugins directory as well
-+make_links fragment plugins $FRAGMENTS
++done 
 +
 +rm -rf $BUILDDIR/tmp
 +echo done 


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/FC-6/eclipse.spec,v
retrieving revision 1.353
retrieving revision 1.354
diff -u -r1.353 -r1.354
--- eclipse.spec	21 Feb 2007 05:25:12 -0000	1.353
+++ eclipse.spec	25 Apr 2007 16:53:32 -0000	1.354
@@ -19,11 +19,11 @@
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        1%{?dist} 
+Release:        2%{?dist} 
 License:        Eclipse Public License
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
-Source0:	http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-sourceBuild-srcIncluded-3.2.2.zip
+Source0:        http://download.eclipse.org/eclipse/downloads/drops/R-3.2.2-200702121330/eclipse-sourceBuild-srcIncluded-3.2.2.zip
 Source2:        %{name}.desktop
 # The icu4j bits will be moved out into their own package for Fedora 7.  See:
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=199504
@@ -59,9 +59,6 @@
 #    (which contains the JNI .sos) is in %{_libdir}
 # We should investigate whether or not this can go upstream
 Patch12:        %{name}-launcher-set-install-dir-and-shared-config.patch
-# Don't attempt to link to Sun's javadocs
-# FIXME:  could use sed instead
-Patch13:        %{name}-javadoclinks.patch
 # Always generate debug info when building RPMs (Andrew Haley)
 # This needs to be investigated for getEnv changes
 Patch14:        %{name}-ecj-rpmdebuginfo.patch
@@ -406,6 +403,7 @@
 sed --in-place "s/4.1.130/5.5.17/g"                      \
                 features/org.eclipse.platform/build.xml \
                 plugins/org.eclipse.tomcat/build.xml    \
+                plugins/org.eclipse.tomcat/META-INF/MANIFEST.MF   \
                 assemble.*.xml
 pushd plugins/org.eclipse.help.webapp
 %patch8 -p0
@@ -444,15 +442,16 @@
 sed --in-place "s:/usr/share/eclipse:%{_datadir}/%{name}:" library/eclipse.c
 popd
 
-# Link against our system-installed javadocs
-%patch13 -p0
-sed --in-place "s:/usr/share/:%{_datadir}/:g"           \
-        plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt  \
-        plugins/org.eclipse.pde.doc.user/pdeOptions.txt \
-        plugins/org.eclipse.pde.doc.user/pdeOptions     \
-        plugins/org.eclipse.platform.doc.isv/platformOptions.txt 
+# use our system-installed javadocs
+sed --in-place "s|http://java.sun.com/j2se/1.4.2/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.platform.doc.isv/platformOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.5/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.jdt.doc.isv/jdtaptOptions.txt                     \
+   plugins/org.eclipse.jdt.doc.isv/jdtOptions.txt
+sed --in-place "s|http://java.sun.com/j2se/1.4/docs/api|%{_datadir}/javadocs/java|" \
+   plugins/org.eclipse.pde.doc.user/pdeOptions.txt                       \
+   plugins/org.eclipse.pde.doc.user/pdeOptions
 %patch14 -p0
-pwd
 
 pushd plugins/org.eclipse.pde.build
 %patch15
@@ -760,7 +759,6 @@
 tar jxf %{SOURCE20}
 
 %build
-env
 ORIGCLASSPATH=$CLASSPATH
 
 # Build jsch
@@ -1765,6 +1763,12 @@
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Wed Apr 11 2007 Ben Konrath <bkonrath redhat com> 3.2.2-2.fc6
+- Fix links to system-installed javadocs.
+- Update package-build releng script to work with 3.2 plugins.
+- Update ecj-gcj patch.
+- Resolves: 237835. 
+
 * Mon Feb 19 2007 Ben Konrath <bkonrath redhat com> 3.2.2-1.fc6
 - 3.2.2.
 


--- eclipse-javadoclinks.patch DELETED ---


--- eclipse-searchindexlucene.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]