Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=6c82feee581b3f9cd1775400cb18473937acc057
commit 6c82feee581b3f9cd1775400cb18473937acc057 Author: Miklos Vajna <[email protected]> Date: Mon Aug 23 16:45:29 2010 +0200 ecj-3.6-1-i686 - version bump - drop no longer needed ecj-gcj.patch diff --git a/source/devel-extra/ecj/FrugalBuild b/source/devel-extra/ecj/FrugalBuild index e4c7cd1..092efbf 100644 --- a/source/devel-extra/ecj/FrugalBuild +++ b/source/devel-extra/ecj/FrugalBuild @@ -2,9 +2,9 @@ # Maintainer: Miklos Vajna <[email protected]> pkgname=ecj -pkgver=3.5.1 -pkgextraver=200909170800 -pkgrel=2 +pkgver=3.6 +pkgextraver=201006080911 +pkgrel=1 pkgdesc="Ecj is the Java bytecode compiler of the Eclipse Project." url="http://www.eclipse.org/" Finclude java @@ -12,24 +12,21 @@ makedepends=('gcc-gcj>=4.5.0' 'fastjar>=0.95-2') groups=('devel-extra') archs=('i686' 'x86_64' 'ppc') up2date="lynx -dump http://download.eclipse.org/eclipse/downloads/|grep 'Latest Release'|sed 's/.*]\([0-9\.]\+\) .*/\1/;q'" -source=(http://eclipse.gabriel.co.hu/eclipse/downloads/drops/R-$pkgver-$pkgextraver/ecj{src-$pkgver.zip,-$pkgver.jar} \ - ecj-gcj.patch) -sha1sums=('83b14c20a82079ff9dd3c42c4eee56db4c175723' \ - 'eba10a38162466bb1efc9f45a4d35e9703550d2d' \ - 'b41abc97eab9dc1cd588f5239511d9d618da4a51') +source=(http://eclipse.gabriel.co.hu/eclipse/downloads/drops/R-$pkgver-$pkgextraver/ecj{src-$pkgver.zip,-$pkgver.jar}) +sha1sums=('9bfda69c7c8528ecfe1b6cbcbe976b642069ca9c' \ + '5618cc694d1e1ce8956fa441b551c8b690547fab') _F_cd_path="." ecj() { jar=$1 shift - echo gij -cp $jar org.eclipse.jdt.internal.compiler.batch.Main $@ || Fdie - gij -cp $jar org.eclipse.jdt.internal.compiler.batch.Main $@ || Fdie + Fexec gij -cp $jar org.eclipse.jdt.internal.compiler.batch.Main "$@" } build() { - Fpatchall + Fcd # this will be a separete package rm -f org/eclipse/jdt/core/JDTCompilerAdapter.java rm -rf org/eclipse/jdt/internal/antadapter \ @@ -37,8 +34,6 @@ build() org/eclipse/jdt/internal/compiler/apt Fjavacleanup org - cat gcc.properties \ - >> org/eclipse/jdt/internal/compiler/batch/messages.properties ecj ecj-$pkgver.jar `find org/ -name '*.java'` || return 1 find -name '*.class' -o -name '*.properties' -o -name '*.rsc' | \ xargs fastjar cf eclipse-ecj-bootstrap.jar @@ -51,9 +46,6 @@ build() Ffilerel /usr/share/java/eclipse-ecj.jar - # oom would just kill it - [ "$CARCH" == "ppc" ] && _F_java_no_gcj=1 - Fgcj org.eclipse.jdt.internal.compiler.batch.Main $Fdestdir/usr/bin/ecj \ $Fdestdir/usr/share/java/eclipse-ecj.jar } diff --git a/source/devel-extra/ecj/ecj-gcj.patch b/source/devel-extra/ecj/ecj-gcj.patch deleted file mode 100644 index 8a3ca1b..0000000 --- a/source/devel-extra/ecj/ecj-gcj.patch +++ /dev/null @@ -1,644 +0,0 @@ ---- gcc.properties -+++ gcc.properties -@@ -0,0 +1,5 @@ -+ -+# GCCMain messages. -+gcc.zipArg=-fzip-target requires argument -+gcc.zipDepArg=-fzip-dependency requires argument -+gcc.noClasspath=no classpath specified ---- org/eclipse/jdt/internal/compiler/lookup/Scope.java -+++ org/eclipse/jdt/internal/compiler/lookup/Scope.java -@@ -3593,12 +3593,21 @@ - } - - // caveat: this is not a direct implementation of JLS -- protected final MethodBinding mostSpecificMethodBinding(MethodBinding[] visible, int visibleSize, TypeBinding[] argumentTypes, InvocationSite invocationSite, ReferenceBinding receiverType) { -+ protected final MethodBinding mostSpecificMethodBinding(MethodBinding[] visible, int visibleSize, TypeBinding[] argumentTypes, final InvocationSite invocationSite, ReferenceBinding receiverType) { - int[] compatibilityLevels = new int[visibleSize]; - for (int i = 0; i < visibleSize; i++) - compatibilityLevels[i] = parameterCompatibilityLevel(visible[i], argumentTypes); - -- boolean useTiebreakMethod = invocationSite.genericTypeArguments() == null; -+ InvocationSite tieBreakInvocationSite = new InvocationSite() { -+ public TypeBinding[] genericTypeArguments() { return null; } // ignore genericTypeArgs -+ public boolean isSuperAccess() { return invocationSite.isSuperAccess(); } -+ public boolean isTypeAccess() { return invocationSite.isTypeAccess(); } -+ public void setActualReceiverType(ReferenceBinding actualReceiverType) { /* ignore */} -+ public void setDepth(int depth) { /* ignore */} -+ public void setFieldIndex(int depth) { /* ignore */} -+ public int sourceStart() { return invocationSite.sourceStart(); } -+ public int sourceEnd() { return invocationSite.sourceStart(); } -+ }; - MethodBinding[] moreSpecific = new MethodBinding[visibleSize]; - int count = 0; - for (int level = 0, max = VARARGS_COMPATIBLE; level <= max; level++) { -@@ -3607,7 +3616,7 @@ - max = level; // do not examine further categories, will either return mostSpecific or report ambiguous case - MethodBinding current = visible[i]; - MethodBinding original = current.original(); -- MethodBinding tiebreakMethod = useTiebreakMethod ? current.tiebreakMethod() : current; -+ MethodBinding tiebreakMethod = current.tiebreakMethod(); - for (int j = 0; j < visibleSize; j++) { - if (i == j || compatibilityLevels[j] != level) continue; - MethodBinding next = visible[j]; -@@ -3626,7 +3635,7 @@ - methodToTest = pNext.originalMethod; - } - } -- MethodBinding acceptable = computeCompatibleMethod(methodToTest, tiebreakMethod.parameters, invocationSite); -+ MethodBinding acceptable = computeCompatibleMethod(methodToTest, tiebreakMethod.parameters, tieBreakInvocationSite); - /* There are 4 choices to consider with current & next : - foo(B) & foo(A) where B extends A - 1. the 2 methods are equal (both accept each others parameters) -> want to continue ---- org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java -+++ org/eclipse/jdt/internal/compiler/lookup/BinaryTypeBinding.java -@@ -325,6 +325,21 @@ - if (needFieldsAndMethods) { - createFields(binaryType.getFields(), sourceLevel, missingTypeNames); - createMethods(binaryType.getMethods(), sourceLevel, missingTypeNames); -+ boolean isViewedAsDeprecated = isViewedAsDeprecated(); -+ if (isViewedAsDeprecated) { -+ for (int i = 0, max = this.fields.length; i < max; i++) { -+ FieldBinding field = this.fields[i]; -+ if (!field.isDeprecated()) { -+ field.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly; -+ } -+ } -+ for (int i = 0, max = this.methods.length; i < max; i++) { -+ MethodBinding method = this.methods[i]; -+ if (!method.isDeprecated()) { -+ method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly; -+ } -+ } -+ } - } - if (this.environment.globalOptions.storeAnnotations) - setAnnotations(createAnnotations(binaryType.getAnnotations(), this.environment, missingTypeNames)); -@@ -344,7 +359,6 @@ - if (size > 0) { - this.fields = new FieldBinding[size]; - boolean use15specifics = sourceLevel >= ClassFileConstants.JDK1_5; -- boolean isViewedAsDeprecated = isViewedAsDeprecated(); - boolean hasRestrictedAccess = hasRestrictedAccess(); - int firstAnnotatedFieldIndex = -1; - for (int i = 0; i < size; i++) { -@@ -368,8 +382,6 @@ - field.id = i; // ordinal - if (use15specifics) - field.tagBits |= binaryField.getTagBits(); -- if (isViewedAsDeprecated && !field.isDeprecated()) -- field.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly; - if (hasRestrictedAccess) - field.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess; - if (fieldSignature != null) -@@ -569,14 +581,11 @@ - return; - } - -- boolean isViewedAsDeprecated = isViewedAsDeprecated(); - boolean hasRestrictedAccess = hasRestrictedAccess(); - this.methods = new MethodBinding[total]; - if (total == initialTotal) { - for (int i = 0; i < initialTotal; i++) { - MethodBinding method = createMethod(iMethods[i], sourceLevel, missingTypeNames); -- if (isViewedAsDeprecated && !method.isDeprecated()) -- method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly; - if (hasRestrictedAccess) - method.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess; - this.methods[i] = method; -@@ -585,8 +594,6 @@ - for (int i = 0, index = 0; i < initialTotal; i++) { - if (iClinit != i && (toSkip == null || toSkip[i] != -1)) { - MethodBinding method = createMethod(iMethods[i], sourceLevel, missingTypeNames); -- if (isViewedAsDeprecated && !method.isDeprecated()) -- method.modifiers |= ExtraCompilerModifiers.AccDeprecatedImplicitly; - if (hasRestrictedAccess) - method.modifiers |= ExtraCompilerModifiers.AccRestrictedAccess; - this.methods[index++] = method; ---- org/eclipse/jdt/internal/compiler/ast/EqualExpression.java -+++ org/eclipse/jdt/internal/compiler/ast/EqualExpression.java -@@ -811,7 +811,8 @@ - - // check whether comparing identical expressions - Binding leftDirect = Expression.getDirectBinding(this.left); -- if (leftDirect != null && leftDirect == Expression.getDirectBinding(this.right)) { -+ if (leftDirect != null && leftDirect == Expression.getDirectBinding(this.right) -+ && !(this.right instanceof Assignment)) { - scope.problemReporter().comparingIdenticalExpressions(this); - } - return this.resolvedType = TypeBinding.BOOLEAN; -@@ -848,7 +849,9 @@ - // check whether comparing identical expressions - Binding leftDirect = Expression.getDirectBinding(this.left); - if (leftDirect != null && leftDirect == Expression.getDirectBinding(this.right)) { -- scope.problemReporter().comparingIdenticalExpressions(this); -+ if (!(this.right instanceof Assignment)) { -+ scope.problemReporter().comparingIdenticalExpressions(this); -+ } - } - return this.resolvedType = TypeBinding.BOOLEAN; - } ---- org/eclipse/jdt/internal/compiler/batch/GCCMain.java -+++ org/eclipse/jdt/internal/compiler/batch/GCCMain.java -@@ -0,0 +1,501 @@ -+/** -+ * -+ */ -+package org.eclipse.jdt.internal.compiler.batch; -+ -+import java.io.BufferedOutputStream; -+import java.io.BufferedReader; -+import java.io.ByteArrayInputStream; -+import java.io.File; -+import java.io.FileOutputStream; -+import java.io.FileReader; -+import java.io.IOException; -+import java.io.InputStreamReader; -+import java.io.OutputStream; -+import java.io.PrintWriter; -+import java.io.UnsupportedEncodingException; -+import java.util.ArrayList; -+import java.util.HashSet; -+import java.util.Iterator; -+import java.util.Map; -+import java.util.StringTokenizer; -+import java.util.zip.CRC32; -+import java.util.zip.ZipEntry; -+import java.util.zip.ZipOutputStream; -+ -+import org.eclipse.jdt.internal.compiler.ClassFile; -+import org.eclipse.jdt.internal.compiler.CompilationResult; -+import org.eclipse.jdt.internal.compiler.env.AccessRestriction; -+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.util.Messages; -+import org.eclipse.jdt.internal.compiler.util.SuffixConstants; -+ -+/** -+ * This is an alternate entry point for the command-line compiler which -+ * is simpler to integrate into GCC. In particular the option processing -+ * is more GNU-like and the recognized options are similar to those supported -+ * by other GCC front ends. -+ */ -+public class GCCMain extends Main { -+ -+ // All the compilation units specified on the command line. -+ private HashSet commandLineCompilationUnits = new HashSet(); -+ // True if we are only checking syntax. -+ private boolean syntaxOnly; -+ // If not null, the name of the output zip file. -+ // If null, we are generating class files in the file system, -+ // not a zip file. -+ private String zipDestination; -+ // The zip stream to which we're writing, or null if it hasn't been opened. -+ private ZipOutputStream zipStream; -+ -+ // If not null, the name of the zip file to which dependency class files -+ // should be written. -+ private String zipDependencyDestination; -+ // The zip stream to which dependency files should be written. -+ private ZipOutputStream zipDependencyStream; -+ -+ public GCCMain(PrintWriter outWriter, PrintWriter errWriter, -+ boolean systemExitWhenFinished) { -+ super(outWriter, errWriter, systemExitWhenFinished); -+ this.logger.setEmacs(); -+ } -+ -+ public GCCMain(PrintWriter outWriter, PrintWriter errWriter, -+ boolean systemExitWhenFinished, Map customDefaultOptions) { -+ super(outWriter, errWriter, systemExitWhenFinished, -+ customDefaultOptions); -+ this.logger.setEmacs(); -+ } -+ -+ private void fail(Exception t) { -+ t.printStackTrace(); -+ this.logger.logException(t); -+ System.exit(1); -+ } -+ -+ public CompilationUnit[] getCompilationUnits() { -+ CompilationUnit[] units = super.getCompilationUnits(); -+ for (int i = 0; i < units.length; ++i) -+ this.commandLineCompilationUnits.add(units[i]); -+ return units; -+ } -+ -+ private String combine(char[] one, char[] two) { -+ StringBuffer b = new StringBuffer(); -+ b.append(one); -+ b.append(two); -+ return b.toString(); -+ } -+ -+ private ZipOutputStream getZipOutput() throws IOException { -+ if (this.zipDestination != null && this.zipStream == null) { -+ OutputStream os; -+ if ("-".equals(this.zipDestination)) { //$NON-NLS-1$ -+ os = System.out; -+ } else { -+ os = new FileOutputStream(this.zipDestination); -+ } -+ zipStream = new ZipOutputStream(new BufferedOutputStream(os)); -+ zipStream.setMethod(ZipOutputStream.STORED); -+ // Sun/OpenJDK require at least one entry in the zip file. -+ ZipEntry entry = new ZipEntry(".dummy"); -+ byte[] contents = new byte[0]; -+ CRC32 crc = new CRC32(); -+ crc.update(contents); -+ entry.setSize(contents.length); -+ entry.setCrc(crc.getValue()); -+ zipStream.putNextEntry(entry); -+ zipStream.write(contents); -+ zipStream.closeEntry(); -+ } -+ return zipStream; -+ } -+ -+ private ZipOutputStream getDependencyOutput() throws IOException { -+ if (this.zipDependencyDestination != null && this.zipDependencyStream == null) { -+ OutputStream os = new FileOutputStream(zipDependencyDestination); -+ zipDependencyStream = new ZipOutputStream(new BufferedOutputStream(os)); -+ zipDependencyStream.setMethod(ZipOutputStream.STORED); -+ // Sun/OpenJDK require at least one entry in the zip file. -+ ZipEntry entry = new ZipEntry(".dummy"); -+ byte[] contents = new byte[0]; -+ CRC32 crc = new CRC32(); -+ crc.update(contents); -+ entry.setSize(contents.length); -+ entry.setCrc(crc.getValue()); -+ zipDependencyStream.putNextEntry(entry); -+ zipDependencyStream.write(contents); -+ zipDependencyStream.closeEntry(); -+ } -+ return zipDependencyStream; -+ } -+ -+ public void outputClassFiles(CompilationResult unitResult) { -+ if (this.syntaxOnly) { -+ return; -+ } -+ if (this.zipDestination == null) { -+ // Nothing special to do here. -+ super.outputClassFiles(unitResult); -+ return; -+ } -+ if (unitResult == null || unitResult.hasErrors()) { -+ return; -+ } -+ -+ // If we are compiling with indirect dispatch, we don't need -+ // any dependent classes. If we are using the C++ ABI, then we -+ // do need the dependencies in order to do proper layout. -+ boolean gcjCompile = this.commandLineCompilationUnits.contains(unitResult.getCompilationUnit()); -+ if (this.zipDependencyDestination == null && !gcjCompile) { -+ return; -+ } -+ -+ try { -+ ZipOutputStream dest = gcjCompile ? getZipOutput() : getDependencyOutput(); -+ ClassFile[] classFiles = unitResult.getClassFiles(); -+ for (int i = 0; i < classFiles.length; ++i) { -+ ClassFile classFile = classFiles[i]; -+ String filename = combine(classFile.fileName(), SuffixConstants.SUFFIX_class); -+ if (this.verbose) -+ this.out.println( -+ Messages.bind( -+ Messages.compilation_write, -+ new String[] { -+ String.valueOf(this.exportedClassFilesCounter+1), -+ filename -+ })); -+ ZipEntry entry = new ZipEntry(filename); -+ byte[] contents = classFile.getBytes(); -+ CRC32 crc = new CRC32(); -+ crc.update(contents); -+ entry.setSize(contents.length); -+ entry.setCrc(crc.getValue()); -+ dest.putNextEntry(entry); -+ dest.write(contents); -+ dest.closeEntry(); -+ } -+ } catch (IOException err) { -+ fail(err); -+ } -+ } -+ -+ private String getArgument(String option) { -+ int index = option.indexOf('='); -+ return option.substring(index + 1); -+ } -+ -+ private void addPath(ArrayList result, String currentClasspathName) { -+ String customEncoding = null; -+ AccessRule[] accessRules = new AccessRule[0]; -+ AccessRuleSet accessRuleSet = new AccessRuleSet(accessRules, AccessRestriction.COMMAND_LINE, currentClasspathName); -+ FileSystem.Classpath currentClasspath = FileSystem -+ .getClasspath(currentClasspathName, -+ customEncoding, accessRuleSet); -+ if (currentClasspath != null) { -+ result.add(currentClasspath); -+ } -+ } -+ -+ private void parsePath(ArrayList result, String path) { -+ StringTokenizer iter = new StringTokenizer(path, File.pathSeparator); -+ while (iter.hasMoreTokens()) { -+ addPath(result, iter.nextToken()); -+ } -+ } -+ -+ protected void handleWarningToken(String token, boolean isEnabling) { -+ // Recognize this for compatibility with older versions of gcj. -+ if ("deprecated".equals(token)) //$NON-NLS-1$ -+ token = "deprecation"; //$NON-NLS-1$ -+ else if ("static-access".equals(token) //$NON-NLS-1$ -+ || "dep-ann".equals(token) //$NON-NLS-1$ -+ || "over-ann".equals(token)) { //$NON-NLS-1$ -+ // Some exceptions to the warning naming rule. -+ } else if ("extraneous-semicolon".equals(token)) { //$NON-NLS-1$ -+ // Compatibility with earlier versions of gcj. -+ token = "semicolon"; //$NON-NLS-1$ -+ } else { -+ // Turn "foo-bar-baz" into eclipse-style "fooBarBaz". -+ StringBuffer newToken = new StringBuffer(token.length()); -+ StringTokenizer t = new StringTokenizer(token, "-"); //$NON-NLS-1$ -+ boolean first = true; -+ while (t.hasMoreTokens()) { -+ String next = t.nextToken(); -+ if (first) { -+ newToken.append(next); -+ first = false; -+ } else { -+ newToken.append(Character.toUpperCase(next.charAt(0))); -+ newToken.append(next.substring(1)); -+ } -+ } -+ token = newToken.toString(); -+ } -+ super.handleWarningToken(token, isEnabling); -+ } -+ -+ private void turnWarningsToErrors() { -+ Object[] entries = this.options.entrySet().toArray(); -+ for (int i = 0, max = entries.length; i < max; i++) { -+ Map.Entry entry = (Map.Entry) entries[i]; -+ if (!(entry.getKey() instanceof String)) -+ continue; -+ if (!(entry.getValue() instanceof String)) -+ continue; -+ if (((String) entry.getValue()).equals(CompilerOptions.WARNING)) { -+ this.options.put(entry.getKey(), CompilerOptions.ERROR); -+ } -+ } -+ } -+ -+ /** -+ * Set the debug level to the indicated value. The level should be -+ * between 0 and 2, inclusive, but this is not checked. -+ * @param level the debug level -+ */ -+ private void setDebugLevel(int level) { -+ this.options.put( -+ CompilerOptions.OPTION_LocalVariableAttribute, -+ level > 1 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE); -+ this.options.put( -+ CompilerOptions.OPTION_LineNumberAttribute, -+ level > 0 ? CompilerOptions.GENERATE : CompilerOptions.DO_NOT_GENERATE); -+ this.options.put( -+ CompilerOptions.OPTION_SourceFileAttribute, -+ CompilerOptions.GENERATE); -+ } -+ -+ private void readFileList(String file, ArrayList result) { -+ try { -+ BufferedReader b = new BufferedReader(new FileReader(file)); -+ String line; -+ while ((line = b.readLine()) != null) { -+ if (line.endsWith(SUFFIX_STRING_java)) -+ result.add(line); -+ } -+ b.close(); -+ } catch (IOException err) { -+ fail(err); -+ } -+ } -+ -+ private void readAllFileListFiles(ArrayList fileList, ArrayList result) { -+ Iterator it = fileList.iterator(); -+ while (it.hasNext()) { -+ readFileList((String) it.next(), result); -+ } -+ } -+ -+ private void handleWall(boolean enable) { -+ // A somewhat arbitrary list. We use the GCC names -+ // here, and the local handleWarningToken translates -+ // for us. -+ handleWarningToken("constructor-name", enable); -+ handleWarningToken("pkg-default-method", enable); -+ handleWarningToken("masked-catch-block", enable); -+ handleWarningToken("all-deprecation", enable); -+ handleWarningToken("unused-local", enable); -+ handleWarningToken("unused-label", enable); -+ handleWarningToken("static-receiver", enable); -+ handleWarningToken("indirect-static", enable); -+ handleWarningToken("no-effect-assign", enable); -+ handleWarningToken("char-concat", enable); -+ handleWarningToken("useless-type-check", enable); -+ handleWarningToken("final-bound", enable); -+ handleWarningToken("assert-identifier", enable); -+ handleWarningToken("enum-identifier", enable); -+ handleWarningToken("finally", enable); -+ handleWarningToken("varargs-cast", enable); -+ handleWarningToken("unused", enable); -+ handleWarningToken("forbidden", enable); -+ } -+ -+ public void configure(String[] argv) { -+ if ((argv == null) || (argv.length == 0)) { -+ // This is a "can't happen". -+ System.exit(1); -+ } -+ -+ ArrayList files = new ArrayList(); -+ ArrayList otherFiles = new ArrayList(); -+ String classpath = null; -+ boolean haveFileList = false; -+ boolean inhibitAllWarnings = false; -+ boolean treatWarningsAsErrors = false; -+ -+ for (int i = 0; i < argv.length; ++i) { -+ String currentArg = argv[i]; -+ -+ if (currentArg.startsWith("-fencoding=")) { //$NON-NLS-1$ -+ // Simply accept the last one. -+ String encoding = getArgument(currentArg); -+ try { // ensure encoding is supported -+ new InputStreamReader(new ByteArrayInputStream(new byte[0]), encoding); -+ } catch (UnsupportedEncodingException e) { -+ throw new IllegalArgumentException( -+ this.bind("configure.unsupportedEncoding", encoding)); //$NON-NLS-1$ -+ } -+ this.options.put(CompilerOptions.OPTION_Encoding, encoding); -+ } else if (currentArg.startsWith("-foutput-class-dir=")) { //$NON-NLS-1$ -+ String arg = getArgument(currentArg); -+ if (this.destinationPath != null) { -+ StringBuffer errorMessage = new StringBuffer(); -+ errorMessage.append("-d"); //$NON-NLS-1$ -+ errorMessage.append(' '); -+ errorMessage.append(arg); -+ throw new IllegalArgumentException( -+ this.bind("configure.duplicateOutputPath", errorMessage.toString())); //$NON-NLS-1$ -+ } -+ this.setDestinationPath(arg); -+ } else if (currentArg.startsWith("-fbootclasspath=")) { //$NON-NLS-1$ -+ classpath = getArgument(currentArg); -+ } else if (currentArg.equals("-fzip-target")) { //$NON-NLS-1$ -+ ++i; -+ if (i >= argv.length) -+ throw new IllegalArgumentException(this.bind("gcc.zipArg")); //$NON-NLS-1$ -+ this.zipDestination = argv[i]; -+ } else if (currentArg.equals("-fzip-dependency")) { //$NON-NLS-1$ -+ ++i; -+ if (i >= argv.length) -+ throw new IllegalArgumentException(this.bind("gcc.zipDepArg")); //$NON-NLS-1$ -+ this.zipDependencyDestination = argv[i]; -+ } else if (currentArg.startsWith("-g")) { //$NON-NLS-1$ -+ if (currentArg.equals("-g0")) { //$NON-NLS-1$ -+ setDebugLevel(0); -+ } else if (currentArg.equals("-g2") || currentArg.equals("-g3") //$NON-NLS-1$ //$NON-NLS-2$ -+ || currentArg.equals("-g")) { //$NON-NLS-1$ -+ setDebugLevel(2); -+ } else { -+ // Handle -g1 but also things like -gstabs. -+ setDebugLevel(1); -+ } -+ } else if (currentArg.equals("-Werror")) { //$NON-NLS-1$ -+ treatWarningsAsErrors = true; -+ } else if (currentArg.equals("-Wno-error")) { //$NON-NLS-1$ -+ treatWarningsAsErrors = false; -+ } else if (currentArg.equals("-Wall")) { //$NON-NLS-1$ -+ handleWall(true); -+ } else if (currentArg.equals("-Wno-all")) { //$NON-NLS-1$ -+ handleWall(false); -+ } else if (currentArg.startsWith("-Wno-")) { //$NON-NLS-1$ -+ handleWarningToken(currentArg.substring(5), false); -+ } else if (currentArg.startsWith("-W")) { //$NON-NLS-1$ -+ handleWarningToken(currentArg.substring(2), true); -+ } else if (currentArg.equals("-w")) { //$NON-NLS-1$ -+ inhibitAllWarnings = true; -+ } else if (currentArg.startsWith("-O")) { //$NON-NLS-1$ -+ // Ignore. -+ } else if (currentArg.equals("-v")) { //$NON-NLS-1$ -+ this.verbose = true; -+ } else if (currentArg.equals("-fsyntax-only")) { //$NON-NLS-1$ -+ this.syntaxOnly = true; -+ } else if (currentArg.startsWith("-fsource=")) { //$NON-NLS-1$ -+ currentArg = getArgument(currentArg); -+ if (currentArg.equals("1.3")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_3); -+ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_4); -+ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ -+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_5); -+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ -+ this.options.put(CompilerOptions.OPTION_Source, CompilerOptions.VERSION_1_6); -+ } else { -+ throw new IllegalArgumentException(this.bind("configure.source", currentArg)); //$NON-NLS-1$ -+ } -+ } else if (currentArg.startsWith("-ftarget=")) { //$NON-NLS-1$ -+ currentArg = getArgument(currentArg); -+ if (currentArg.equals("1.1")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_1); -+ } else if (currentArg.equals("1.2")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_2); -+ } else if (currentArg.equals("1.3")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_3); -+ } else if (currentArg.equals("1.4")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_4); -+ } else if (currentArg.equals("1.5") || currentArg.equals("5") || currentArg.equals("5.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_5); -+ } else if (currentArg.equals("1.6") || currentArg.equals("6") || currentArg.equals("6.0")) { //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_1_6); -+ } else if (currentArg.equals("jsr14")) { //$NON-NLS-1$ -+ this.options.put(CompilerOptions.OPTION_TargetPlatform, CompilerOptions.VERSION_JSR14); -+ } else { -+ throw new IllegalArgumentException(this.bind("configure.targetJDK", currentArg)); //$NON-NLS-1$ -+ } -+ } else if (currentArg.equals("-ffilelist-file")) { //$NON-NLS-1$ -+ haveFileList = true; -+ } else if (currentArg.endsWith(SuffixConstants.SUFFIX_STRING_java)) { -+ files.add(currentArg); -+ } else if (currentArg.charAt(0) == '-'){ -+ // FIXME: error if not a file? -+ } else { -+ otherFiles.add(currentArg); -+ } -+ } -+ -+ // Read the file list file. We read them all, but really there -+ // will only be one. -+ if (haveFileList) -+ readAllFileListFiles(otherFiles, files); -+ -+ this.filenames = (String[]) files.toArray(new String[0]); -+ this.encodings = new String[this.filenames.length]; -+ this.destinationPaths = new String[this.filenames.length]; -+ for (int i = 0; i < this.filenames.length; ++i) -+ this.destinationPaths[i] = this.destinationPath; -+ -+ // Classpath processing. -+ ArrayList result = new ArrayList(); -+ if (classpath == null) -+ throw new IllegalArgumentException(this.bind("gcc.noClasspath")); //$NON-NLS-1$ -+ parsePath(result, classpath); -+ -+ // We must always create both output files, even if one is not used. -+ // That way we will always pass valid zip file on to jc1. -+ try { -+ getZipOutput(); -+ getDependencyOutput(); -+ } catch (IOException err) { -+ fail(err); -+ } -+ -+ if (inhibitAllWarnings) -+ disableWarnings(); -+ if (treatWarningsAsErrors) -+ turnWarningsToErrors(); -+ -+ this.checkedClasspaths = new FileSystem.Classpath[result.size()]; -+ result.toArray(this.checkedClasspaths); -+ -+ this.logger.logCommandLineArguments(argv); -+ this.logger.logOptions(this.options); -+ this.logger.logClasspath(this.checkedClasspaths); -+ -+ this.maxRepetition = 1; -+ } -+ -+ public boolean compile(String[] argv) { -+ boolean result = super.compile(argv); -+ try { -+ if (zipStream != null) { -+ zipStream.finish(); -+ zipStream.close(); -+ } -+ if (zipDependencyStream != null) { -+ zipDependencyStream.finish(); -+ zipDependencyStream.close(); -+ } -+ } catch (IOException err) { -+ fail(err); -+ } -+ return result; -+ } -+ -+ public static void main(String[] argv) { -+ boolean result = new GCCMain(new PrintWriter(System.out), new PrintWriter(System.err), false).compile(argv); -+ System.exit(result ? 0 : 1); -+ } -+} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
