2013-04-13  Matthias Klose  <doko@ubuntu.com>

	* Makefile (TAG): Set to R3_8_2 (cvsroot, login): Remove,
	(checkout): Download from git repository.
	(compile): Compile for 1.5, catch errors copying resource files,
	don't include the META-INF file.
	* org/eclipse/jdt/internal/compiler/batch/GCCMain.java: Adopt to
	new API.
	
Index: Makefile
===================================================================
RCS file: /cvs/rhug/eclipse-gcj/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile	28 Sep 2009 17:38:31 -0000	1.10
+++ Makefile	13 Apr 2013 16:03:28 -0000
@@ -1,4 +1,4 @@
-TAG = R3_5_1
+TAG = R3_8_2
 
 cvsroot = :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse
 
@@ -11,13 +11,27 @@
 	$(MAKE) compile
 	$(MAKE) ecj.jar ecj-source.tar.bz2
 
-login:
-	cvs -d $(cvsroot) login
-
 checkout:
-	cvs -d $(cvsroot) co -r$(TAG) org.eclipse.jdt.core
+#	git clone -b R3_8_maintenance git://git.eclipse.org/gitroot/jdt/eclipse.jdt.core.git
+#	wget http://git.eclipse.org/c/jdt/eclipse.jdt.core.git/snapshot/$(TAG).tar.gz
+	tar xf $(TAG).tar.gz
+	rm -rf org.eclipse.jdt.core
+	mkdir org.eclipse.jdt.core
+	cp $(TAG)/org.eclipse.jdt.core/scripts/about.html \
+	  org.eclipse.jdt.core/.
+	cp $(TAG)/org.eclipse.jdt.core/scripts/build.xml \
+	  org.eclipse.jdt.core/.
+	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/compiler org \
+	  | tar -x -f - -C org.eclipse.jdt.core/
+	find org.eclipse.jdt.core -name CheckDebugAttributes.java | xargs -r rm -f
+	find org.eclipse.jdt.core -name BuildJarIndex.java | xargs -r rm -f
+	tar -c -f - -C $(TAG)/org.eclipse.jdt.core/batch org \
+	  | tar -x -f - -C org.eclipse.jdt.core/
+	mkdir -p org.eclipse.jdt.core/META-INF/services
+	printf 'org.eclipse.jdt.internal.compiler.tool.EclipseCompiler #Eclipse compiler' \
+	  > org.eclipse.jdt.core/META-INF/services/javax.tools.JavaCompiler
 
-SOURCES = org org.eclipse.jdt.core/batch org.eclipse.jdt.core/compiler
+SOURCES = org org.eclipse.jdt.core
 
 OUTPUT = bin
 
@@ -31,17 +45,19 @@
 compile:
 	@mkdir -p $(OUTPUT)
 	find $(SOURCES) -name '*.java' > List
-	ecj -d $(OUTPUT) -1.4 -nowarn -g @List
+	ecj -d $(OUTPUT) -1.5 -nowarn -g @List
+	set -e; \
 	here=`pwd`; for dir in $(SOURCES); do \
-	  (cd $$dir; find . -name '*.properties' -o -name '*.rsc' | \
+	  (cd $$dir; find . -name '*.properties' -o -name '*.props' -o -name '*.rsc' | \
 	   while read x; do \
 	     echo "cp $$x $$here/$(OUTPUT)/$$x"; \
+	     mkdir -p $$(dirname $$here/$(OUTPUT)/$$x); \
 	     cp $$x $$here/$(OUTPUT)/$$x; \
 	   done); \
 	done
 	cat gcc.properties >> $(OUTPUT)/org/eclipse/jdt/internal/compiler/batch/messages.properties
 	mkdir -p $(OUTPUT)/META-INF
-	cp org.eclipse.jdt.core/META-INF/MANIFEST.MF $(OUTPUT)/META-INF
+#	cp org.eclipse.jdt.core/META-INF/MANIFEST.MF $(OUTPUT)/META-INF
 
 # Once per GCC release you should upload an appropriate jar.
 # Don't change these once the release is out.
Index: org/eclipse/jdt/internal/compiler/batch/GCCMain.java
===================================================================
RCS file: /cvs/rhug/eclipse-gcj/org/eclipse/jdt/internal/compiler/batch/GCCMain.java,v
retrieving revision 1.8
diff -u -r1.8 GCCMain.java
--- org/eclipse/jdt/internal/compiler/batch/GCCMain.java	11 Sep 2009 10:59:21 -0000	1.8
+++ org/eclipse/jdt/internal/compiler/batch/GCCMain.java	13 Apr 2013 16:03:29 -0000
@@ -29,6 +29,7 @@
 import org.eclipse.jdt.internal.compiler.env.AccessRule;
 import org.eclipse.jdt.internal.compiler.env.AccessRuleSet;
 import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+import org.eclipse.jdt.internal.compiler.problem.ProblemSeverities;
 import org.eclipse.jdt.internal.compiler.util.Messages;
 import org.eclipse.jdt.internal.compiler.util.SuffixConstants;
 
@@ -463,7 +464,7 @@
 		}
 
 		if (inhibitAllWarnings)
-			disableWarnings();
+			disableAll(ProblemSeverities.Warning);
 		if (treatWarningsAsErrors)
 			turnWarningsToErrors();