[ecj] 05/145: Import Debian changes 3.0.93-1

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Tue Mar 27 23:11:22 BST 2018


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository ecj.

commit afd5021c2b96e617afa8784bb7a992da48a01e3e
Merge: 4e69bc0 9ae5447
Author: Matthias Klose <doko at debian.org>
Date:   Wed Sep 14 12:54:56 2005 +0000

    Import Debian changes 3.0.93-1
    
    ecj-bootstrap (3.0.93-1) unstable; urgency=low
    
      * New upstream version (3.1rc3). Taken from the eclipse-3.1 package,
        file ecj.zip.

 com/sun/tools/javac/Config.java                    |    50 -
 com/sun/tools/javac/Main.java                      |   191 -
 debian/changelog                                   |    54 +-
 debian/control                                     |    20 +-
 debian/ecj-bootstrap-gcj.1                         |     1 +
 debian/ecj-bootstrap-gcj.install                   |     3 +
 debian/ecj-bootstrap-gcj.manpages                  |     1 +
 debian/ecj-bootstrap-gcj.postinst                  |    10 +
 debian/ecj-bootstrap-gcj.prerm                     |     5 +
 debian/ecj-bootstrap.1                             |    97 +
 debian/ecj-bootstrap.install                       |     2 +
 debian/ecj-bootstrap.manpages                      |     1 +
 debian/ecj-bootstrap.postinst                      |     3 +-
 debian/rules                                       |   140 +-
 ecj-bootstrap                                      |     7 +-
 .../internal/compiler/env/AccessRestriction.java   |   120 -
 .../jdt/internal/compiler/parser/parser1.rsc       |   Bin 25302 -> 0 bytes
 .../jdt/internal/compiler/parser/parser12.rsc      |   Bin 266 -> 0 bytes
 .../jdt/internal/compiler/parser/parser13.rsc      |   Bin 266 -> 0 bytes
 .../jdt/internal/compiler/parser/parser14.rsc      |   Bin 1228 -> 0 bytes
 .../jdt/internal/compiler/parser/parser15.rsc      |   Bin 992 -> 0 bytes
 .../jdt/internal/compiler/parser/parser16.rsc      |   Bin 1908 -> 0 bytes
 .../jdt/internal/compiler/parser/parser17.rsc      |   Bin 692 -> 0 bytes
 .../jdt/internal/compiler/parser/parser18.rsc      |   Bin 8098 -> 0 bytes
 .../jdt/internal/compiler/parser/parser19.rsc      |     1 -
 .../jdt/internal/compiler/parser/parser2.rsc       |   Bin 23918 -> 0 bytes
 .../jdt/internal/compiler/parser/parser3.rsc       |   Bin 1908 -> 0 bytes
 .../jdt/internal/compiler/parser/parser4.rsc       |   Bin 3410 -> 0 bytes
 .../jdt/internal/compiler/parser/parser5.rsc       |   Bin 1908 -> 0 bytes
 .../jdt/internal/compiler/parser/parser6.rsc       |   Bin 924 -> 0 bytes
 .../jdt/internal/compiler/parser/parser7.rsc       |   Bin 222 -> 0 bytes
 .../jdt/internal/compiler/parser/parser8.rsc       |   Bin 616 -> 0 bytes
 .../jdt/internal/compiler/parser/parser9.rsc       |   Bin 16032 -> 0 bytes
 .../jdt/internal/compiler/util/messages.properties |    66 -
 .../org/eclipse/jdt/core/JDTCompilerAdapter.java   |   805 +-
 .../eclipse/jdt/core/compiler/CharOperation.java   |  5620 +++---
 .../org/eclipse/jdt/core/compiler/IProblem.java    |  2239 +--
 .../jdt/core/compiler/InvalidInputException.java   |    68 +-
 .../org/eclipse/jdt/core/compiler/package.html     |    34 +-
 .../internal/antadapter/AntAdapterMessages.java    |   108 +-
 .../jdt/internal/antadapter/messages.properties    |    48 +-
 .../eclipse/jdt/internal/compiler/ASTVisitor.java  |  1614 +-
 .../eclipse/jdt/internal/compiler/ClassFile.java   |  7517 ++++----
 .../jdt/internal/compiler/CompilationResult.java   |   913 +-
 .../eclipse/jdt/internal/compiler/Compiler.java    |  1218 +-
 .../jdt/internal/compiler/ConfigurableOption.java  |   454 +-
 .../compiler/DefaultErrorHandlingPolicies.java     |   150 +-
 .../jdt/internal/compiler/ICompilerRequestor.java  |    44 +-
 .../jdt/internal/compiler/IDebugRequestor.java     |    84 +-
 .../internal/compiler/IErrorHandlingPolicy.java    |    56 +-
 .../jdt/internal/compiler/IProblemFactory.java     |    82 +-
 .../internal/compiler/ast/AND_AND_Expression.java  |   540 +-
 .../eclipse/jdt/internal/compiler/ast/ASTNode.java |   910 +-
 .../compiler/ast/AbstractMethodDeclaration.java    |   871 +-
 .../compiler/ast/AbstractVariableDeclaration.java  |   244 +-
 .../compiler/ast/AllocationExpression.java         |   701 +-
 .../jdt/internal/compiler/ast/Annotation.java      |   676 +-
 .../compiler/ast/AnnotationMethodDeclaration.java  |   331 +-
 .../jdt/internal/compiler/ast/Argument.java        |   291 +-
 .../compiler/ast/ArrayAllocationExpression.java    |   384 +-
 .../internal/compiler/ast/ArrayInitializer.java    |   442 +-
 .../compiler/ast/ArrayQualifiedTypeReference.java  |   186 +-
 .../jdt/internal/compiler/ast/ArrayReference.java  |   439 +-
 .../internal/compiler/ast/ArrayTypeReference.java  |   184 +-
 .../jdt/internal/compiler/ast/AssertStatement.java |   396 +-
 .../jdt/internal/compiler/ast/Assignment.java      |   465 +-
 .../internal/compiler/ast/BinaryExpression.java    |  3567 ++--
 .../eclipse/jdt/internal/compiler/ast/Block.java   |   284 +-
 .../jdt/internal/compiler/ast/BranchStatement.java |   124 +-
 .../jdt/internal/compiler/ast/BreakStatement.java  |   190 +-
 .../jdt/internal/compiler/ast/CaseStatement.java   |   284 +-
 .../jdt/internal/compiler/ast/CastExpression.java  |   906 +-
 .../jdt/internal/compiler/ast/CharLiteral.java     |   198 +-
 .../internal/compiler/ast/ClassLiteralAccess.java  |   230 +-
 .../eclipse/jdt/internal/compiler/ast/Clinit.java  |   616 +-
 .../compiler/ast/CompilationUnitDeclaration.java   |   672 +-
 .../internal/compiler/ast/CompoundAssignment.java  |   362 +-
 .../compiler/ast/ConditionalExpression.java        |   877 +-
 .../compiler/ast/ConstructorDeclaration.java       |   956 +-
 .../internal/compiler/ast/ContinueStatement.java   |   200 +-
 .../jdt/internal/compiler/ast/DoStatement.java     |   348 +-
 .../jdt/internal/compiler/ast/DoubleLiteral.java   |   226 +-
 .../jdt/internal/compiler/ast/EmptyStatement.java  |   128 +-
 .../jdt/internal/compiler/ast/EqualExpression.java |  1007 +-
 .../compiler/ast/ExplicitConstructorCall.java      |   749 +-
 .../jdt/internal/compiler/ast/Expression.java      |  1758 +-
 .../compiler/ast/ExtendedStringLiteral.java        |   158 +-
 .../jdt/internal/compiler/ast/FalseLiteral.java    |   136 +-
 .../internal/compiler/ast/FieldDeclaration.java    |   564 +-
 .../jdt/internal/compiler/ast/FieldReference.java  |  1150 +-
 .../jdt/internal/compiler/ast/FloatLiteral.java    |   230 +-
 .../jdt/internal/compiler/ast/ForStatement.java    |   662 +-
 .../internal/compiler/ast/ForeachStatement.java    |   939 +-
 .../jdt/internal/compiler/ast/IfStatement.java     |   486 +-
 .../jdt/internal/compiler/ast/ImportReference.java |   164 +-
 .../jdt/internal/compiler/ast/Initializer.java     |   248 +-
 .../compiler/ast/InstanceOfExpression.java         |   216 +-
 .../jdt/internal/compiler/ast/IntLiteral.java      |   296 +-
 .../internal/compiler/ast/IntLiteralMinValue.java  |    54 +-
 .../eclipse/jdt/internal/compiler/ast/Javadoc.java |  1240 +-
 .../compiler/ast/JavadocAllocationExpression.java  |   265 +-
 .../compiler/ast/JavadocArgumentExpression.java    |   193 +-
 .../ast/JavadocArrayQualifiedTypeReference.java    |    96 +-
 .../ast/JavadocArraySingleTypeReference.java       |    92 +-
 .../compiler/ast/JavadocFieldReference.java        |   277 +-
 .../compiler/ast/JavadocImplicitTypeReference.java |   211 +-
 .../compiler/ast/JavadocImportReference.java       |    64 +-
 .../internal/compiler/ast/JavadocMessageSend.java  |   407 +-
 .../ast/JavadocQualifiedTypeReference.java         |   174 +-
 .../compiler/ast/JavadocReturnStatement.java       |   126 +-
 .../compiler/ast/JavadocSingleNameReference.java   |   120 +-
 .../compiler/ast/JavadocSingleTypeReference.java   |   179 +-
 .../internal/compiler/ast/LabeledStatement.java    |   258 +-
 .../eclipse/jdt/internal/compiler/ast/Literal.java |   114 +-
 .../internal/compiler/ast/LocalDeclaration.java    |   493 +-
 .../jdt/internal/compiler/ast/LongLiteral.java     |   300 +-
 .../internal/compiler/ast/LongLiteralMinValue.java |    54 +-
 .../jdt/internal/compiler/ast/MagicLiteral.java    |    58 +-
 .../internal/compiler/ast/MarkerAnnotation.java    |    80 +-
 .../jdt/internal/compiler/ast/MemberValuePair.java |   325 +-
 .../jdt/internal/compiler/ast/MessageSend.java     |   869 +-
 .../internal/compiler/ast/MethodDeclaration.java   |   415 +-
 .../jdt/internal/compiler/ast/NameReference.java   |   127 +-
 .../internal/compiler/ast/NormalAnnotation.java    |   140 +-
 .../jdt/internal/compiler/ast/NullLiteral.java     |   132 +-
 .../jdt/internal/compiler/ast/NumberLiteral.java   |    72 +-
 .../internal/compiler/ast/OR_OR_Expression.java    |   546 +-
 .../internal/compiler/ast/OperatorExpression.java  |  3140 ++--
 .../jdt/internal/compiler/ast/OperatorIds.java     |    86 +-
 .../ast/ParameterizedQualifiedTypeReference.java   |   626 +-
 .../ast/ParameterizedSingleTypeReference.java      |   473 +-
 .../internal/compiler/ast/PostfixExpression.java   |   154 +-
 .../internal/compiler/ast/PrefixExpression.java    |   120 +-
 .../ast/QualifiedAllocationExpression.java         |   787 +-
 .../compiler/ast/QualifiedNameReference.java       |  1837 +-
 .../compiler/ast/QualifiedSuperReference.java      |   126 +-
 .../compiler/ast/QualifiedThisReference.java       |   238 +-
 .../compiler/ast/QualifiedTypeReference.java       |   237 +-
 .../jdt/internal/compiler/ast/Reference.java       |   172 +-
 .../jdt/internal/compiler/ast/ReturnStatement.java |   452 +-
 .../compiler/ast/SingleMemberAnnotation.java       |   129 +-
 .../internal/compiler/ast/SingleNameReference.java |  1470 +-
 .../internal/compiler/ast/SingleTypeReference.java |   156 +-
 .../jdt/internal/compiler/ast/Statement.java       |   280 +-
 .../jdt/internal/compiler/ast/StringLiteral.java   |   240 +-
 .../compiler/ast/StringLiteralConcatenation.java   |   158 +-
 .../internal/compiler/ast/SubRoutineStatement.java |   134 +-
 .../jdt/internal/compiler/ast/SuperReference.java  |   136 +-
 .../jdt/internal/compiler/ast/SwitchStatement.java |   699 +-
 .../compiler/ast/SynchronizedStatement.java        |   388 +-
 .../jdt/internal/compiler/ast/ThisReference.java   |   248 +-
 .../jdt/internal/compiler/ast/ThrowStatement.java  |   158 +-
 .../jdt/internal/compiler/ast/TrueLiteral.java     |   142 +-
 .../jdt/internal/compiler/ast/TryStatement.java    |  1128 +-
 .../jdt/internal/compiler/ast/TypeDeclaration.java |  2576 +--
 .../jdt/internal/compiler/ast/TypeParameter.java   |   206 +-
 .../jdt/internal/compiler/ast/TypeReference.java   |   338 +-
 .../jdt/internal/compiler/ast/UnaryExpression.java |   615 +-
 .../jdt/internal/compiler/ast/WhileStatement.java  |   476 +-
 .../jdt/internal/compiler/ast/Wildcard.java        |   226 +-
 .../compiler/batch/ClasspathDirectory.java         |   255 +-
 .../jdt/internal/compiler/batch/ClasspathJar.java  |   177 +-
 .../internal/compiler/batch/ClasspathLocation.java |    44 +
 .../internal/compiler/batch/CompilationUnit.java   |   156 +-
 .../jdt/internal/compiler/batch/FileFinder.java    |    96 +-
 .../jdt/internal/compiler/batch/FileSystem.java    |   369 +-
 .../eclipse/jdt/internal/compiler/batch/Main.java  |  5106 ++---
 .../internal/compiler/batch/messages.properties    |   390 +-
 .../compiler/classfmt/ClassFileConstants.java      |   144 +-
 .../compiler/classfmt/ClassFileReader.java         |  2119 +--
 .../compiler/classfmt/ClassFileStruct.java         |   376 +-
 .../compiler/classfmt/ClassFormatException.java    |   264 +-
 .../jdt/internal/compiler/classfmt/FieldInfo.java  |   808 +-
 .../internal/compiler/classfmt/InnerClassInfo.java |   284 +-
 .../jdt/internal/compiler/classfmt/MethodInfo.java |   682 +-
 .../compiler/codegen/AttributeNamesConstants.java  |    62 +-
 .../jdt/internal/compiler/codegen/CaseLabel.java   |   162 +-
 .../internal/compiler/codegen/CharArrayCache.java  |   368 +-
 .../jdt/internal/compiler/codegen/CodeStream.java  | 12229 ++++++------
 .../internal/compiler/codegen/ConstantPool.java    |  1873 +-
 .../jdt/internal/compiler/codegen/DoubleCache.java |   276 +-
 .../internal/compiler/codegen/ExceptionLabel.java  |    98 +-
 .../compiler/codegen/FieldNameAndTypeCache.java    |   322 +-
 .../jdt/internal/compiler/codegen/FloatCache.java  |   276 +-
 .../internal/compiler/codegen/IntegerCache.java    |   310 +-
 .../jdt/internal/compiler/codegen/Label.java       |   524 +-
 .../jdt/internal/compiler/codegen/LongCache.java   |   310 +-
 .../compiler/codegen/MethodNameAndTypeCache.java   |   324 +-
 .../jdt/internal/compiler/codegen/ObjectCache.java |   304 +-
 .../jdt/internal/compiler/codegen/Opcodes.java     |   432 +-
 .../internal/compiler/env/AccessRestriction.java   |    35 +
 .../jdt/internal/compiler/env/AccessRule.java      |    54 +
 .../jdt/internal/compiler/env/AccessRuleSet.java   |   101 +
 .../jdt/internal/compiler/env/IBinaryField.java    |    90 +-
 .../jdt/internal/compiler/env/IBinaryMethod.java   |   117 +-
 .../internal/compiler/env/IBinaryNestedType.java   |    76 +-
 .../jdt/internal/compiler/env/IBinaryType.java     |   234 +-
 .../internal/compiler/env/ICompilationUnit.java    |    72 +-
 .../jdt/internal/compiler/env/IConstants.java      |   106 +-
 .../jdt/internal/compiler/env/IDependent.java      |    88 +-
 .../jdt/internal/compiler/env/IGenericField.java   |    50 +-
 .../jdt/internal/compiler/env/IGenericMethod.java  |    65 +-
 .../jdt/internal/compiler/env/IGenericType.java    |    78 +-
 .../internal/compiler/env/INameEnvironment.java    |   142 +-
 .../jdt/internal/compiler/env/ISourceField.java    |    94 +-
 .../jdt/internal/compiler/env/ISourceImport.java   |    77 +-
 .../jdt/internal/compiler/env/ISourceMethod.java   |   135 +-
 .../jdt/internal/compiler/env/ISourceType.java     |   198 +-
 .../compiler/env/NameEnvironmentAnswer.java        |   176 +-
 .../compiler/flow/ConditionalFlowInfo.java         |   500 +-
 .../flow/ExceptionHandlingFlowContext.java         |   436 +-
 .../internal/compiler/flow/FinallyFlowContext.java |   330 +-
 .../jdt/internal/compiler/flow/FlowContext.java    |  1066 +-
 .../jdt/internal/compiler/flow/FlowInfo.java       |   372 +-
 .../compiler/flow/InitializationFlowContext.java   |   194 +-
 .../compiler/flow/InsideSubRoutineFlowContext.java |   118 +-
 .../internal/compiler/flow/LabelFlowContext.java   |   122 +-
 .../internal/compiler/flow/LoopingFlowContext.java |   394 +-
 .../internal/compiler/flow/SwitchFlowContext.java  |   108 +-
 .../compiler/flow/UnconditionalFlowInfo.java       |  1654 +-
 .../internal/compiler/impl/BooleanConstant.java    |    82 +-
 .../jdt/internal/compiler/impl/ByteConstant.java   |   104 +-
 .../jdt/internal/compiler/impl/CharConstant.java   |   110 +-
 .../internal/compiler/impl/CompilerOptions.java    |  1795 +-
 .../jdt/internal/compiler/impl/Constant.java       |  3224 ++--
 .../jdt/internal/compiler/impl/DoubleConstant.java |   128 +-
 .../jdt/internal/compiler/impl/FloatConstant.java  |   124 +-
 .../jdt/internal/compiler/impl/ITypeRequestor.java |    76 +-
 .../jdt/internal/compiler/impl/IntConstant.java    |   126 +-
 .../jdt/internal/compiler/impl/LongConstant.java   |   104 +-
 .../internal/compiler/impl/ReferenceContext.java   |    52 +-
 .../jdt/internal/compiler/impl/ShortConstant.java  |   104 +-
 .../jdt/internal/compiler/impl/StringConstant.java |    96 +-
 .../jdt/internal/compiler/lookup/ArrayBinding.java |   476 +-
 .../internal/compiler/lookup/BaseTypeBinding.java  |   390 +-
 .../jdt/internal/compiler/lookup/BaseTypes.java    |    48 +-
 .../compiler/lookup/BinaryTypeBinding.java         |  1743 +-
 .../jdt/internal/compiler/lookup/Binding.java      |   165 +-
 .../jdt/internal/compiler/lookup/BlockScope.java   |  1675 +-
 .../internal/compiler/lookup/CaptureBinding.java   |   176 +
 .../jdt/internal/compiler/lookup/ClassScope.java   |  2230 +--
 .../compiler/lookup/CompilationUnitScope.java      |  1421 +-
 .../compiler/lookup/CompilerModifiers.java         |    84 +-
 .../jdt/internal/compiler/lookup/FieldBinding.java |   596 +-
 .../internal/compiler/lookup/ImportBinding.java    |    96 +-
 .../compiler/lookup/ImportConflictBinding.java     |    29 +
 .../compiler/lookup/InnerEmulationDependency.java  |    44 +-
 .../internal/compiler/lookup/InvocationSite.java   |    56 +-
 .../internal/compiler/lookup/LocalTypeBinding.java |   404 +-
 .../compiler/lookup/LocalVariableBinding.java      |   316 +-
 .../compiler/lookup/LookupEnvironment.java         |  1935 +-
 .../compiler/lookup/MemberTypeBinding.java         |    78 +-
 .../internal/compiler/lookup/MethodBinding.java    |  1506 +-
 .../jdt/internal/compiler/lookup/MethodScope.java  |  1013 +-
 .../internal/compiler/lookup/MethodVerifier.java   |  1206 +-
 .../internal/compiler/lookup/MethodVerifier15.java |   832 +-
 .../compiler/lookup/NestedTypeBinding.java         |   434 +-
 .../internal/compiler/lookup/PackageBinding.java   |   410 +-
 .../compiler/lookup/ParameterizedFieldBinding.java |   124 +-
 .../lookup/ParameterizedGenericMethodBinding.java  |   905 +-
 .../lookup/ParameterizedMethodBinding.java         |   287 +-
 .../compiler/lookup/ParameterizedTypeBinding.java  |  1859 +-
 .../internal/compiler/lookup/ProblemBinding.java   |   110 +-
 .../compiler/lookup/ProblemFieldBinding.java       |    82 +-
 .../compiler/lookup/ProblemMethodBinding.java      |    84 +-
 .../compiler/lookup/ProblemPackageBinding.java     |    64 +-
 .../internal/compiler/lookup/ProblemReasons.java   |    58 +-
 .../compiler/lookup/ProblemReferenceBinding.java   |   100 +-
 .../internal/compiler/lookup/RawTypeBinding.java   |   320 +-
 .../internal/compiler/lookup/ReferenceBinding.java |  1824 +-
 .../jdt/internal/compiler/lookup/Scope.java        |  6553 +++----
 .../internal/compiler/lookup/SignatureWrapper.java |   136 +-
 .../compiler/lookup/SourceTypeBinding.java         |  2880 +--
 .../jdt/internal/compiler/lookup/Substitution.java |    66 +-
 .../compiler/lookup/SyntheticArgumentBinding.java  |   116 +-
 .../compiler/lookup/SyntheticFieldBinding.java     |    45 +-
 .../compiler/lookup/SyntheticMethodBinding.java    |   730 +-
 .../jdt/internal/compiler/lookup/TagBits.java      |   193 +-
 .../jdt/internal/compiler/lookup/TypeBinding.java  |  1086 +-
 .../internal/compiler/lookup/TypeConstants.java    |   303 +-
 .../jdt/internal/compiler/lookup/TypeIds.java      |   306 +-
 .../compiler/lookup/TypeVariableBinding.java       |   861 +-
 .../lookup/UnresolvedReferenceBinding.java         |   152 +-
 .../compiler/lookup/UpdatedMethodBinding.java      |    50 +-
 .../internal/compiler/lookup/VariableBinding.java  |   120 +-
 .../internal/compiler/lookup/WildcardBinding.java  |  1137 +-
 .../compiler/parser/AbstractCommentParser.java     |  2898 +--
 .../internal/compiler/parser/JavadocParser.java    |  1388 +-
 .../jdt/internal/compiler/parser/NLSLine.java      |   130 +-
 .../jdt/internal/compiler/parser/Parser.java       | 18707 ++++++++++---------
 .../compiler/parser/ParserBasicInformation.java    |    70 +-
 .../internal/compiler/parser/RecoveredBlock.java   |   660 +-
 .../internal/compiler/parser/RecoveredElement.java |   616 +-
 .../internal/compiler/parser/RecoveredField.java   |   392 +-
 .../internal/compiler/parser/RecoveredImport.java  |   114 +-
 .../compiler/parser/RecoveredInitializer.java      |   474 +-
 .../compiler/parser/RecoveredLocalVariable.java    |   216 +-
 .../internal/compiler/parser/RecoveredMethod.java  |   936 +-
 .../compiler/parser/RecoveredStatement.java        |   108 +-
 .../internal/compiler/parser/RecoveredType.java    |  1068 +-
 .../internal/compiler/parser/RecoveredUnit.java    |   434 +-
 .../jdt/internal/compiler/parser/Scanner.java      |  7270 +++----
 .../internal/compiler/parser/ScannerHelper.java    |   207 +
 .../internal/compiler/parser/TerminalTokens.java   |   292 +-
 .../compiler/parser/diagnose/DiagnoseParser.java   |  4590 ++---
 .../compiler/parser/diagnose/LexStream.java        |   540 +-
 .../compiler/parser/diagnose/RangeUtil.java        |   400 +-
 .../jdt/internal/compiler/parser/parser1.rsc       |   Bin 0 -> 25662 bytes
 .../jdt/internal/compiler/parser/parser10.rsc      |   Bin 266 -> 264 bytes
 .../jdt/internal/compiler/parser/parser11.rsc      |   Bin 266 -> 264 bytes
 .../jdt/internal/compiler/parser/parser12.rsc      |   Bin 0 -> 264 bytes
 .../jdt/internal/compiler/parser/parser13.rsc      |   Bin 0 -> 264 bytes
 .../jdt/internal/compiler/parser/parser14.rsc      |   Bin 0 -> 1228 bytes
 .../jdt/internal/compiler/parser/parser15.rsc      |   Bin 0 -> 946 bytes
 .../jdt/internal/compiler/parser/parser16.rsc      |   Bin 0 -> 1912 bytes
 .../jdt/internal/compiler/parser/parser17.rsc      |   Bin 0 -> 692 bytes
 .../jdt/internal/compiler/parser/parser18.rsc      |   Bin 0 -> 7914 bytes
 .../jdt/internal/compiler/parser/parser19.rsc      |     1 +
 .../jdt/internal/compiler/parser/parser2.rsc       |   Bin 0 -> 24278 bytes
 .../jdt/internal/compiler/parser/parser20.rsc      |   Bin 12958 -> 12834 bytes
 .../jdt/internal/compiler/parser/parser21.rsc      |   Bin 5536 -> 5536 bytes
 .../jdt/internal/compiler/parser/parser3.rsc       |   Bin 0 -> 1912 bytes
 .../jdt/internal/compiler/parser/parser4.rsc       |   Bin 0 -> 3420 bytes
 .../jdt/internal/compiler/parser/parser5.rsc       |   Bin 0 -> 1912 bytes
 .../jdt/internal/compiler/parser/parser6.rsc       |   Bin 0 -> 952 bytes
 .../jdt/internal/compiler/parser/parser7.rsc       |   Bin 0 -> 222 bytes
 .../jdt/internal/compiler/parser/parser8.rsc       |   Bin 0 -> 614 bytes
 .../jdt/internal/compiler/parser/parser9.rsc       |   Bin 0 -> 15806 bytes
 .../jdt/internal/compiler/parser/part1.rsc}        |   Bin 5536 -> 8192 bytes
 .../jdt/internal/compiler/parser/part14.rsc}       |   Bin 5536 -> 8192 bytes
 .../eclipse/jdt/internal/compiler/parser/part2.rsc |   Bin 0 -> 8192 bytes
 .../compiler/parser/readableNames.properties       |   611 +-
 .../jdt/internal/compiler/parser/start1.rsc}       |   Bin 5536 -> 8192 bytes
 .../jdt/internal/compiler/parser/start2.rsc        |   Bin 0 -> 8192 bytes
 .../compiler/problem/AbortCompilation.java         |   150 +-
 .../compiler/problem/AbortCompilationUnit.java     |    58 +-
 .../jdt/internal/compiler/problem/AbortMethod.java |    58 +-
 .../jdt/internal/compiler/problem/AbortType.java   |    58 +-
 .../internal/compiler/problem/DefaultProblem.java  |   453 +-
 .../compiler/problem/DefaultProblemFactory.java    |   394 +-
 .../internal/compiler/problem/ProblemHandler.java  |   366 +-
 .../internal/compiler/problem/ProblemReporter.java | 11274 +++++------
 .../compiler/problem/ProblemSeverities.java        |    50 +-
 .../compiler/problem/ShouldNotImplement.java       |    48 +-
 .../internal/compiler/problem/messages.properties  |  1090 +-
 .../internal/compiler/util/CompoundNameVector.java |   142 +-
 .../jdt/internal/compiler/util/FloatUtil.java      |   842 +-
 .../jdt/internal/compiler/util/HashtableOfInt.java |   184 +-
 .../compiler/util/HashtableOfIntValues.java        |   296 +-
 .../internal/compiler/util/HashtableOfLong.java    |   184 +-
 .../internal/compiler/util/HashtableOfObject.java  |   292 +-
 .../compiler/util/HashtableOfObjectToInt.java      |   294 +-
 .../internal/compiler/util/HashtableOfPackage.java |   192 +-
 .../internal/compiler/util/HashtableOfType.java    |   192 +-
 .../jdt/internal/compiler/util/Messages.java       |   244 +
 .../jdt/internal/compiler/util/ObjectVector.java   |   264 +-
 .../internal/compiler/util/SimpleLookupTable.java  |   312 +-
 .../internal/compiler/util/SimpleNameVector.java   |   192 +-
 .../internal/compiler/util/SuffixConstants.java    |    86 +-
 .../eclipse/jdt/internal/compiler/util/Util.java   |   976 +-
 .../jdt/internal/compiler/util/WeakHashSet.java    |   412 +-
 .../compiler/util/WeakHashSetOfCharArray.java}     |   415 +-
 .../jdt/internal/compiler/util/messages.properties |    62 +
 363 files changed, 109831 insertions(+), 105981 deletions(-)

diff --cc debian/changelog
index 2e13bf0,0000000..bec1e8b
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,80 -1,0 +1,122 @@@
- ecj-bootstrap (3.0.1-5) unstable; urgency=low
++ecj-bootstrap (3.0.93-1) unstable; urgency=low
 +
-   * Add a /usr/bin/ecj binary.
++  * New upstream version (3.1rc3). Taken from the eclipse-3.1 package,
++    file ecj.zip.
++
++ -- Matthias Klose <doko at debian.org>  Wed, 14 Sep 2005 12:54:56 +0000
++
++ecj-bootstrap (3.0.1-4ubuntu6) breezy; urgency=low
++
++  * Only build one java file per gcj call, ignore errors on first
++    build. Closes: #327161, Ubuntu 14938.
++  * Add more error checking in debian/rules.
++  * Install manual page for ecj alternative as well.
++
++ -- Matthias Klose <doko at ubuntu.com>  Wed, 14 Sep 2005 14:19:57 +0200
++
++ecj-bootstrap (3.0.1-4ubuntu5) breezy; urgency=low
++
++  * Reenable ecj-bootstrap-gcj. (Build-)depend on fixed gcj-4.0.
++
++ -- Matthias Klose <doko at ubuntu.com>  Sat,  2 Jul 2005 08:25:02 +0000
++
++ecj-bootstrap (3.0.1-4ubuntu4) breezy; urgency=low
 +
-  -- Matthias Klose <doko at debian.org>  Sat, 11 Jun 2005 17:57:46 +0000
++  * Temporarily disable building ecj-bootstrap-gcj. FTBFS on amd64. Unbreak
++    ant's dependency on ecj (>= 3.0.1-4ubuntu2).
 +
- ecj-bootstrap (3.0.1-4) unstable; urgency=low
++ -- Matthias Klose <doko at ubuntu.com>  Thu, 30 Jun 2005 09:59:20 +0000
 +
-   * Upload to unstable.
++ecj-bootstrap (3.0.1-4ubuntu3) breezy; urgency=low
++
++  * Include manpages for ecj-bootstrap and ecj-bootstrap-gcj (closes: #316641).
++
++ -- Jeff Bailey <jbailey at ubuntu.com>  Wed, 29 Jun 2005 14:52:57 +0000
++
++ecj-bootstrap (3.0.1-4ubuntu2) breezy; urgency=low
++
++  * Merged ecj-adapter.jar into ecj.jar in preparation for Eclipse 3.1
++    upgrade. Upstream has laid out ecj in this fashion.
++  * Removed java-gcj-compat bits which were unneccassary.
++  * Added native versions of the ecj binary and ecj.jar in a new package
++    named ecj-bootstrap-gcj. This increases the compilation speed of
++    packages built with this copy of ecj.
++  * Added new alternatives for /usr/bin/ecj for the native version.
++  * First package successfully creating a classmap.db.
++
++ -- Jerry Haltom <wasabi at larvalstage.net>  Tue, 14 Jun 2005 21:38:29 -0500
++
++ecj-bootstrap (3.0.1-4ubuntu1) breezy; urgency=low
++
++  * Add a /usr/bin/ecj binary.
 +
-  -- Matthias Klose <doko at debian.org>  Tue,  7 Jun 2005 17:25:12 +0200
++ -- Matthias Klose <doko at ubuntu.com>  Sat, 11 Jun 2005 16:57:27 +0000
 +
 +ecj-bootstrap (3.0.1-3) experimental; urgency=low
 +
 +  * Synchronize.
 +
 + -- Matthias Klose <doko at debian.org>  Wed,  1 Jun 2005 23:24:48 +0200
 +
 +ecj-bootstrap (3.0.1-1ubuntu6) breezy; urgency=low
 +
 +  * Now provides 'ecj' which will also be provided by the future
 +    eclipse-ecj package built from full Eclipse source.
 +  * Removed universe/ from Section.
 +  * Now refering to libgcj-4.0.jar instead of 4.0.0.jar to handle
 +    changing versions better.
 +
 + -- Jerry Haltom <wasabi at larvalstage.net>  Wed,  1 Jun 2005 14:12:16 -0500
 +
 +ecj-bootstrap (3.0.1-2) experimental; urgency=low
 +
 +  * Upload to experimental, set maintainer to Debian Java Matainers,
 +    request by Michael Koch.
 +
 + -- Matthias Klose <doko at debian.org>  Sun, 22 May 2005 15:53:07 +0000
 +
 +ecj-bootstrap (3.0.1-1ubuntu5) hoary; urgency=low
 +
 +  * Fixed path to ant.jar.
 +
 + -- Jerry Haltom <wasabi at larvalstage.net>  Mon, 28 Mar 2005 20:17:03 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu4) hoary; urgency=low
 +
 +  * Added build of Ant adapter. This introduces a circular dependency
 +    on ecj-bootstrap and Ant.
 +
 + -- Jerry Haltom <wasabi at larvalstage.net>  Sun, 27 Mar 2005 22:51:13 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu3) hoary; urgency=low
 +
 +  * Added missing dependency on libgcj6-common.
 +
 + -- Jerry Haltom <wasabi at larvalstage.net>  Wed, 23 Feb 2005 22:45:00 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu2) hoary; urgency=low
 +
 +  * Removed argument modification from ecj and moved it to ecj-wrapper in the
 +    style of gcj-wrapper.
 +  * Jeff Bailey corrected the Posix-compliant argument expansion in
 +    ecj-wrapper with the help of David Weinehall.
 +  * ecj now rebuilds with itself as a sanity test.
 +
 + -- Jerry Haltom <wasabi at larvalstage.net>  Mon, 14 Feb 2005 20:34:25 -0600
 +
 +ecj-bootstrap (3.0.1-1ubuntu1) hoary; urgency=low
 +
 +  * First upload to Ubuntu.
 +
 +  * Tighten build deps.  Use "ecj" instead of "ecj-bootstrap" to
 +    allow ant to depend on ecj | ecj-bootstrap.
 +
 +  * Posixify wrapper
 +
 + -- Jeff Bailey <jbailey at ubuntu.com>  Fri, 11 Feb 2005 20:37:21 +0000
 +
 +ecj-bootstrap (3.0.1-0) unstable; urgency=low
 +
 +  * Initial release.
 +
 + -- Jerry Haltom <wasabi at larvalstage.net>  Wed, 09 Feb 2005 19:36:07 -0600
diff --cc debian/control
index 392da28,0000000..7997f92
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,21 -1,0 +1,35 @@@
 +Source: ecj-bootstrap
 +Section: devel
 +Priority: optional
 +Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 +Uploaders: Jerry Haltom <wasabi at larvalstage.net>, Michael Koch <konqueror at gmx.de>, Matthias Klose <doko at debian.org>
- Build-Depends-Indep: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gij-4.0 (>= 4.0.0-7), gcj-4.0 (>= 4.0.0-7), libgcj6-common, fastjar, libant1.6-java
++Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gij-4.0 (>= 4.0.1-7), gcj-4.0 (>= 4.0.1-7), libgcj6-common, libgcj6-dev, fastjar, libant1.6-java
 +Standards-Version: 3.6.1.1
 +
 +Package: ecj-bootstrap
 +Architecture: all
- Depends: gij-4.0 (>= 4.0.0-7), libgcj6-common
- Suggests: libant1.6-java
++Depends: gij-4.0 (>= 4.0.1-7), libgcj6-common, java-common (>= 0.22ubuntu1)
++Recommends: ecj-bootstrap-gcj
++Suggests: libant1.6-java | ant
 +Provides: ecj
 +Conflicts: ecj
 +Description: bootstrap version of the Eclipse Java compiler
 + This package provides a bootstrap version of the Eclipse JDT compiler which is
 + distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit) and
 + is compatible with Java 1.3 and 1.4.
 + .
 + This bootstrap version should be used for uploading initial versions of
 + packages which are a dependency of Eclipse and build with ECJ.
++
++Package: ecj-bootstrap-gcj
++Architecture: any
++Depends: ecj-bootstrap (= ${Source-Version}), ${shlibs:Depends}
++Description: bootstrap version of the Eclipse Java compiler (native version)
++ This package provides a bootstrap version of the Eclipse JDT compiler which is
++ distributed as part of Eclipse. It passes the JCK (Java Compatibility Kit) and
++ is compatible with Java 1.3 and 1.4.
++ .
++ This bootstrap version should be used for uploading initial versions of
++ packages which are a dependency of Eclipse and build with ECJ.
++ .
++ This package contains a native version of ecj built using gcj.
diff --cc debian/ecj-bootstrap-gcj.1
index 0000000,0000000..1cd54ca
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap-gcj.1
@@@ -1,0 -1,0 +1,1 @@@
++ecj-bootstrap-gcj.1.so man1/ecj-bootstrap.1
diff --cc debian/ecj-bootstrap-gcj.install
index 0000000,0000000..b67c5f2
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap-gcj.install
@@@ -1,0 -1,0 +1,3 @@@
++debian/tmp/usr/bin/ecj-bootstrap-gcj
++debian/tmp/usr/lib/java/ecj.jar.so
++debian/tmp/usr/share/gcj-*
diff --cc debian/ecj-bootstrap-gcj.manpages
index 0000000,0000000..beb274e
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap-gcj.manpages
@@@ -1,0 -1,0 +1,1 @@@
++debian/ecj-bootstrap-gcj.1
diff --cc debian/ecj-bootstrap-gcj.postinst
index 0000000,0000000..83119cc
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap-gcj.postinst
@@@ -1,0 -1,0 +1,10 @@@
++#! /bin/sh -e
++
++update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-bootstrap-gcj 4
++
++find /usr/share/gcj-4.0/classmap.d -name '*.db' -print0 \
++	| /usr/bin/gcj-dbtool-4.0 -0 -m /var/lib/gcj-4.0/classmap.db.tmp || exit 1
++
++mv /var/lib/gcj-4.0/classmap.db.tmp /var/lib/gcj-4.0/classmap.db
++
++#DEBHELPER#
diff --cc debian/ecj-bootstrap-gcj.prerm
index 0000000,0000000..31d36e8
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap-gcj.prerm
@@@ -1,0 -1,0 +1,5 @@@
++#! /bin/sh -e
++
++update-alternatives --quiet --remove ecj /usr/bin/ecj-bootstrap-gcj
++
++#DEBHELPER#
diff --cc debian/ecj-bootstrap.1
index 0000000,0000000..94de309
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap.1
@@@ -1,0 -1,0 +1,97 @@@
++.TH JDTC "1" "October 2002" 
++.SH NAME
++ejdtc \- manual page for JDT Compiler
++.SH SYNOPSIS
++.B jdtc <options> <source files>\fR
++.SH DESCRIPTION
++JDT Compiler is command version of Java compiler for eclipse. jdtc 
++has basic java compiler options like SUN's javac.
++.SH OPTIONS
++.TP
++\fB\-help\fR                   display a help message
++.TP
++\fB\-version\fR                compiler version number
++.TP
++\fB\-classpath\fR              <dir 1>;<dir 2>;...;<dir P>
++.TP
++\fB\-d\fR <dir>                destination directory (if omitted no package directory structure is created)
++.TP
++\fB\-d\fR none
++no classfile is generated
++.PP
++\fB\-target\fR <ver>           classfile target setting (1.1 or 1.2, default is 1.1)
++.TP
++\fB\-1.3\fR                    set compliance level to 1.3 (default)
++.TP
++\fB\-1.4\fR                    set compliance level to 1.4
++.TP
++\fB\-source\fR <ver>           assertions toggle (1.3 or 1.4, default is 1.3 in -1.3 mode and 1.4 in -1.4 mode)
++.TP
++\fB\-nowarn\fR                 no warning (equivalent to '\-warn:none')
++.TP
++\fB\-warn\fR: <level>          set warning level (e.g. '\-warn:unusedLocals,deprecation')
++.TP
++constructorName
++warn method with constructor name
++.TP
++packageDefaultMethod
++warn attempt to override package-default method
++.TP
++deprecation
++warn usage of deprecated type or member
++.TP
++maskedCatchBlocks
++warn hidden catch block
++.TP
++unusedLocals
++warn on unused local variable (never read)
++.TP
++unusedArguments
++warn on unused method argument (never read)
++.TP
++unusedImports
++warn on unused imports
++.TP
++syntheticAccess
++warn when performing synthetic access for innerclass
++.TP
++assertIdentifier
++warn occurrence of 'assert' used as identifier
++.PP
++\fB\-deprecation\fR            equivalent to \fB\-warn\fR:deprecation.
++\fB\-g[\fR:<level>]            debug attributes level
++.TP
++\fB\-g\fR
++all debug info ('\-g:lines,vars,source')
++.TP
++\fB\-g\fR:none
++no debug info
++.TP
++\fB\-g\fR:[lines,vars,source]
++selective debug info
++.PP
++\fB\-preserveAllLocals\fR      code gen preserve all local variables (for debug purpose)
++.TP
++\fB\-noImportError\fR          no errors for unresolved imports
++.TP
++\fB\-encoding\fR               specify default source encoding format (custom encoding can also be specifed on a per file basis by suffixing each input source file/folder name with '[encoding]')
++.PP
++\fB\-log\fR <filename>         specify a log file
++.TP
++\fB\-proceedOnError\fR         keep compiling when error, dumping class files with problem methods
++.TP
++\fB\-verbose\fR                print accessed\/processed compilation units
++.TP
++\fB\-referenceInfo\fR          compute reference info
++.TP
++\fB\-progress\fR               show progress (only in \fB\-log\fR mode)
++.TP
++\fB\-time\fR                   display speed information
++.TP
++\fB\-noExit\fR                 do not call System.exit(n) at end of compilation (n=0 if no error)
++.TP
++\fB\-repeat\fR <n>             repeat compilation process <n> times (perf analysis)
++.PP
++.SH AUTHOR
++This manual page was written by Takshi Okamoto and Jan Schulz
++<debian at katzien.de>.
diff --cc debian/ecj-bootstrap.install
index 0000000,0000000..b0e5415
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap.install
@@@ -1,0 -1,0 +1,2 @@@
++debian/tmp/usr/bin/ecj-bootstrap
++debian/tmp/usr/share/java/ecj.jar
diff --cc debian/ecj-bootstrap.manpages
index 0000000,0000000..017e5db
new file mode 100644
--- /dev/null
+++ b/debian/ecj-bootstrap.manpages
@@@ -1,0 -1,0 +1,1 @@@
++debian/ecj-bootstrap.1
diff --cc debian/ecj-bootstrap.postinst
index 3dbf24d,0000000..db7cd26
mode 100644,000000..100644
--- a/debian/ecj-bootstrap.postinst
+++ b/debian/ecj-bootstrap.postinst
@@@ -1,7 -1,0 +1,6 @@@
 +#! /bin/sh -e
 +
 +update-alternatives --quiet --install /usr/bin/ecj ecj /usr/bin/ecj-bootstrap 3 \
- 
- #  --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
++  --slave /usr/share/man/man1/ecj.1.gz ecj.1.gz /usr/share/man/man1/ecj-bootstrap.1.gz
 +
 +#DEBHELPER#
diff --cc debian/rules
index 136bdaf,0000000..375aba2
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,83 -1,0 +1,145 @@@
 +#!/usr/bin/make -f
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/rules/simple-patchsys.mk
 +
 +gcc_version = 4.0
 +ant_version = 1.6
++GCJ = gcj-$(gcc_version)
++
++#DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
++#ifeq ($(DEB_HOST_ARCH),amd64)
++#  DH_OPTIONS = -Necj-bootstrap-ecj
++#  export DH_OPTIONS
++#else
++#  with_native := yes
++#endif
++
++with_native := yes
 +
 +build/ecj-bootstrap:: build/stamp
 +build/stamp:
 +	mkdir -p build/bin
 +
++ifeq (0,1)
 +	for i in compiler batch antadapter; do \
 +	    mkdir build/bin/$$i; \
 +	    cp -r src/org.eclipse.jdt.core/$$i/* build/bin/$$i; \
- 	    /usr/bin/gcj-$(gcc_version) -d build/bin/$$i -C \
++	    echo "byte-compiling $$i (using gcj) ..."; \
++	    $(GCJ) -d build/bin/$$i -C \
++	        -I/usr/share/ant$(ant_version)/lib/ant.jar \
++		-Ibuild/bin/compiler -Ibuild/bin/batch \
++	        $$(find build/bin/$$i -name '*.java'); \
++	done
++	for i in compiler batch antadapter; do \
++	    echo "byte-compiling (2nd run) $$i (using gcj) ..."; \
++	    $(GCJ) -d build/bin/$$i -C \
 +	        -I/usr/share/ant$(ant_version)/lib/ant.jar \
 +		-Ibuild/bin/compiler -Ibuild/bin/batch \
 +	        $$(find build/bin/$$i -name '*.java'); \
 +	done
++endif
++ifeq (1,1)
++	: # ignore errors on the first run
++	cp -r src/org.eclipse.jdt.core/org build/bin/
++	echo "byte-compiling (using gcj) ..."
++	for f in $$(find build/bin -name '*.java'); do \
++	    /usr/bin/$(GCJ) -d build/bin -C \
++	        -I/usr/share/ant$(ant_version)/lib/ant.jar \
++		-Ibuild/bin \
++	        $$f; \
++	done
++
++	: # second run
++	echo "byte-compiling (2nd run using gcj) ..."
++	set -e; \
++	for f in $$(find build/bin -name '*.java'); do \
++	    /usr/bin/$(GCJ) -d build/bin -C \
++	        -I/usr/share/ant$(ant_version)/lib/ant.jar \
++		-Ibuild/bin \
++	        $$f; \
++	done
++
++endif
++
++	set -e; \
++	rv=0; \
++	for f in $$(find build/bin -name '*.java'); do \
++	  f2=$${f%*.java}.class; \
++	  if [ ! -f $$f2 ]; then \
++	    echo not found: $$f2; \
++	    rv=1; \
++	  fi; \
++	done; \
++	exit $$rv
 +
 +	find build/bin -name '*.java' -exec rm -f {} \;
 +	find build/bin -name '*.html' -exec rm -f {} \;
 +
 +	mkdir -p build/bootstrap
- 	/usr/bin/fastjar -c -C build/bin/compiler   . -f build/bootstrap/ecj.jar
- 	/usr/bin/fastjar -u -C build/bin/batch      . -f build/bootstrap/ecj.jar
- 	/usr/bin/fastjar -c -C build/bin/antadapter . -f build/bootstrap/ecj-adapter.jar
++	/usr/bin/fastjar -c -C build/bin . -f build/bootstrap/ecj.jar
 +	rm -rf build/bin
 +
- 
 +	mkdir -p build/bin
- 	cp -r src/org.eclipse.jdt.core/{compiler,batch}/* build/bin
++	cp -r src/org.eclipse.jdt.core/org build/bin/
 +
- 	for i in compiler batch antadapter; do \
- 	    mkdir build/bin/$$i; \
- 	    cp -r src/org.eclipse.jdt.core/$$i/* build/bin/$$i; \
- 	    /usr/bin/gij-$(gcc_version) \
- 	        -classpath build/bootstrap/ecj.jar:/usr/share/ant$(ant_version)/lib/ant.jar \
- 	        org.eclipse.jdt.internal.compiler.batch.Main \
- 	        -bootclasspath /usr/share/java/libgcj-$(gcc_version).jar \
- 	        build/bin/$$i; \
- 	done
++	/usr/bin/gij-$(gcc_version) \
++	    -classpath build/bootstrap/ecj.jar:/usr/share/ant$(ant_version)/lib/ant.jar \
++	    org.eclipse.jdt.internal.compiler.batch.Main \
++	    -bootclasspath /usr/share/java/libgcj-$(gcc_version).jar \
++	    build/bin
 +
 +	find build/bin -name '*.java' -exec rm -f {} \;
 +	find build/bin -name '*.html' -exec rm -f {} \;
 +
 +	mkdir -p build/dist
- 	/usr/bin/fastjar -c -C build/bin/compiler   . -f build/dist/ecj.jar
- 	/usr/bin/fastjar -u -C build/bin/batch      . -f build/dist/ecj.jar
- 	/usr/bin/fastjar -c -C build/bin/antadapter . -f build/dist/ecj-adapter.jar
++	/usr/bin/fastjar -c -C build/bin . -f build/dist/ecj.jar
 +	rm -rf build/bin
 +
- 	gcj-4.0 -C -d . -I . com/sun/tools/javac/Config.java
- 	gcj-4.0 -C -d . -I . com/sun/tools/javac/Main.java
- 	fastjar cMf ecj-bootstrap-tools.jar ./com/sun/tools/javac/Config.class com/sun/tools/javac/Main.class
- 
- 	#/usr/bin/gcj-$(gcc_version) \
- 	#    -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
- 	#    -o build/dist/ecj.jar.so build/dist/ecj.jar
++ifeq ($(with_native),yes)
++	/usr/bin/gcj-$(gcc_version) \
++	    -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
++	    -o build/dist/ecj.jar.so build/dist/ecj.jar
 +
- 	#/usr/bin/gcj-$(gcc_version) \
- 	#    -Wl,-Bsymbolic -fPIC -fjni \
- 	#    --main=org.eclipse.jdt.internal.compiler.batch.Main \
- 	#    -o build/dist/ecj build/dist/ecj.jar
++	/usr/bin/gcj-$(gcc_version) \
++	    -Wl,-Bsymbolic -fPIC -fjni -findirect-dispatch \
++	    --main=org.eclipse.jdt.internal.compiler.batch.Main \
++	    -o build/dist/ecj-bootstrap-gcj build/dist/ecj.jar
++endif
 +
 +	touch build/stamp
 +
- install/ecj-bootstrap::
- 	mkdir -p debian/ecj-bootstrap/usr/share/java
- 	install -m 644 build/dist/ecj.jar debian/ecj-bootstrap/usr/share/java/
++install-ecj-bootstrap:
++	# Install pieces into proper hierarchy.
++	mkdir -p debian/tmp/usr/share/java
++	install -m 644 build/dist/ecj.jar debian/tmp/usr/share/java/
++
++	mkdir -p debian/tmp/usr/bin
++	install -m 755 ecj-bootstrap debian/tmp/usr/bin/
++
++ifeq ($(with_native),yes)
++	mkdir -p debian/tmp/usr/lib/java
++	install -m 644 build/dist/ecj.jar.so debian/tmp/usr/lib/java
++
++	# Native GCJ version.
++	mkdir -p debian/tmp/usr/bin
++	install -m 755 build/dist/ecj-bootstrap-gcj debian/tmp/usr/bin/
++
++	mkdir -p debian/tmp/usr/share/gcj-$(gcc_version)/classmap.d
++	gcj-dbtool-$(gcc_version) -n debian/tmp/usr/share/gcj-$(gcc_version)/classmap.d/ecj-bootstrap.db
++
++	cd debian/tmp && \
++	for jar in $$(find usr/share/java -name '*.jar'); do \
++		echo $$jar '->' usr/lib/java/$$(basename $$jar).so; \
++		gcj-dbtool-$(gcc_version) -f usr/share/gcj-$(gcc_version)/classmap.d/ecj-bootstrap.db \
++			$$jar /usr/lib/java/$$(basename $$jar).so || exit 1; \
++	done
++endif
++
 +
- 	mkdir -p debian/ecj-bootstrap/usr/share/ant1.6/lib
- 	install -m 644 build/dist/ecj-adapter.jar debian/ecj-bootstrap/usr/share/ant$(ant_version)/lib/
- 	dh_link usr/share/ant$(ant_version)/lib/ecj-adapter.jar usr/share/ant/lib/ecj-adapter.jar
++install/ecj-bootstrap:: install-ecj-bootstrap
++install/ecj-bootstrap-gcj:: install-ecj-bootstrap
 +
- 	mkdir -p debian/ecj-bootstrap/usr/bin
- 	install -m 644 ecj-bootstrap-tools.jar debian/ecj-bootstrap/usr/share/java/
- 	install -m 755 ecj-bootstrap debian/ecj-bootstrap/usr/bin/
 +
 +clean::
 +	rm -rf build
- 	rm -f com/sun/tools/javac/*.class ecj-bootstrap-tools.jar
diff --cc ecj-bootstrap
index 458d5b5,0000000..761fb65
mode 100644,000000..100644
--- a/ecj-bootstrap
+++ b/ecj-bootstrap
@@@ -1,18 -1,0 +1,13 @@@
 +#!/bin/sh
 +
 +case $CLASSPATH in
- */usr/share/java/ecj-bootstrap-tools.jar*) ;;
- *) CLASSPATH=$CLASSPATH${CLASSPATH:+:}/usr/share/java/ecj-bootstrap-tools.jar
- esac
- 
- case $CLASSPATH in
 +*/usr/share/java/ecj.jar*) ;;
 +*) CLASSPATH=$CLASSPATH:/usr/share/java/ecj.jar
 +esac
 +
 +export CLASSPATH
 +
 +exec /usr/bin/gij-4.0 \
 +    -Dgnu.gcj.precompiled.db.path=/var/lib/gcj-4.0/classmap.db \
 +    -Djava.ext.dirs=/usr/lib/java-ext:/usr/share/java-ext \
-     com.sun.tools.javac.Main ${1+"$@"}
++    org.eclipse.jdt.internal.compiler.batch.Main ${1+"$@"}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ecj.git



More information about the pkg-java-commits mailing list