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

rpms/eclipse/devel eclipse-ecj-gcj.patch, 1.4, 1.5 eclipse.spec, 1.430, 1.431



Author: bkonrath

Update of /cvs/pkgs/rpms/eclipse/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17353

Modified Files:
	eclipse-ecj-gcj.patch eclipse.spec 
Log Message:
- Disable org.eclipse.jdt.compiler.apt, fix ecj-gcj patch

eclipse-ecj-gcj.patch:

Index: eclipse-ecj-gcj.patch
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse-ecj-gcj.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- eclipse-ecj-gcj.patch	3 Mar 2007 02:39:41 -0000	1.4
+++ eclipse-ecj-gcj.patch	24 May 2007 10:18:27 -0000	1.5
@@ -367,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$


Index: eclipse.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.430
retrieving revision 1.431
diff -u -r1.430 -r1.431
--- eclipse.spec	24 May 2007 06:11:03 -0000	1.430
+++ eclipse.spec	24 May 2007 10:18:27 -0000	1.431
@@ -531,7 +531,7 @@
                                                       assemble.org.eclipse.sdk.linux.gtk.ia64.xml \
                                                       features/org.eclipse.rcp/build.xml
 
-# remove jdt.compiler.tool as it requires a JVM that supports Java 1.6
+# remove jdt.compiler.tool and org.eclipse.jdt.compiler.apt as they require a JVM that supports Java 1.6
 sed --in-place "s/org.eclipse.jdt.compiler.tool:0.0.0,1.0.0.v_763,//" features/org.eclipse.jdt/build.xml
 linenum=$(grep -no jdt.compiler.tool features/org.eclipse.jdt/build.xml | cut -d : -f 1)
 sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
@@ -541,6 +541,17 @@
 sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
 linenum=$(grep -no "value=\"org.eclipse.jdt.compiler.tool" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
 sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+# --
+sed --in-place "s/org.eclipse.jdt.compiler.apt:0.0.0,1.0.0.v20070510-2000,//" features/org.eclipse.jdt/build.xml
+linenum=$(grep -no jdt.compiler.apt features/org.eclipse.jdt/build.xml | cut -d : -f 1)
+sed --in-place -e "$linenum,$(expr $linenum + 4)d" features/org.eclipse.jdt/build.xml
+linenum=$(grep -no jdt.compiler.apt features/org.eclipse.jdt/feature.xml | cut -d : -f 1)
+sed --in-place -e "$(expr $linenum - 1),$(expr $linenum + 5)d" features/org.eclipse.jdt/feature.xml
+linenum=$(grep -no "dir=\"plugins/org.eclipse.jdt.compiler.apt" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+sed --in-place -e "$linenum,$(expr $linenum + 2)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+linenum=$(grep -no "value=\"org.eclipse.jdt.compiler.apt" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml | cut -d : -f 1)
+sed --in-place -e "$(expr $linenum - 2),$(expr $linenum + 1)d" assemble.org.eclipse.sdk.linux.gtk.%{eclipse_arch}.xml
+
 
 # link to the jsch jar
 rm plugins/com.jcraft.jsch_0.1.28.jar


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