[ecj] 06/145: Import Debian changes 3.1.1-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 4517522ba65ab7074a15b725ec3914a2530190db
Merge: afd5021 7924057
Author: Matthias Klose <doko at debian.org>
Date:   Sat Oct 1 18:32:05 2005 +0200

    Import Debian changes 3.1.1-1
    
    ecj-bootstrap (3.1.1-1) unstable; urgency=low
    
      * New upstream version.
      * Remove bootstrap workaround, tighten build dependency to gcj-4.0.2.
      * Fix symlink to manpage (closes: #330080).

 debian/changelog                                   |     8 +
 debian/control                                     |     6 +-
 debian/copyright                                   |    41 -
 debian/ecj-bootstrap-gcj.1                         |     1 -
 debian/ecj-bootstrap-gcj.manpages                  |     1 -
 debian/rules                                       |    69 +-
 .../org/eclipse/jdt/core/JDTCompilerAdapter.java   |   810 +-
 .../eclipse/jdt/core/compiler/CharOperation.java   |  5618 +++---
 .../org/eclipse/jdt/core/compiler/IProblem.java    |  2273 +--
 .../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   |  7581 ++++----
 .../jdt/internal/compiler/CompilationResult.java   |   965 +-
 .../eclipse/jdt/internal/compiler/Compiler.java    |  1220 +-
 .../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 |   942 +-
 .../compiler/ast/AbstractMethodDeclaration.java    |   878 +-
 .../compiler/ast/AbstractVariableDeclaration.java  |   244 +-
 .../compiler/ast/AllocationExpression.java         |   700 +-
 .../jdt/internal/compiler/ast/Annotation.java      |   747 +-
 .../compiler/ast/AnnotationMethodDeclaration.java  |   324 +-
 .../jdt/internal/compiler/ast/Argument.java        |   288 +-
 .../compiler/ast/ArrayAllocationExpression.java    |   384 +-
 .../internal/compiler/ast/ArrayInitializer.java    |   444 +-
 .../compiler/ast/ArrayQualifiedTypeReference.java  |   186 +-
 .../jdt/internal/compiler/ast/ArrayReference.java  |   440 +-
 .../internal/compiler/ast/ArrayTypeReference.java  |   184 +-
 .../jdt/internal/compiler/ast/AssertStatement.java |   396 +-
 .../jdt/internal/compiler/ast/Assignment.java      |   470 +-
 .../internal/compiler/ast/BinaryExpression.java    |  3566 ++--
 .../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  |   930 +-
 .../jdt/internal/compiler/ast/CharLiteral.java     |   198 +-
 .../internal/compiler/ast/ClassLiteralAccess.java  |   230 +-
 .../eclipse/jdt/internal/compiler/ast/Clinit.java  |   644 +-
 .../compiler/ast/CompilationUnitDeclaration.java   |   696 +-
 .../internal/compiler/ast/CompoundAssignment.java  |   361 +-
 .../compiler/ast/ConditionalExpression.java        |   913 +-
 .../compiler/ast/ConstructorDeclaration.java       |   959 +-
 .../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 |  1006 +-
 .../compiler/ast/ExplicitConstructorCall.java      |   748 +-
 .../jdt/internal/compiler/ast/Expression.java      |  1814 +-
 .../compiler/ast/ExtendedStringLiteral.java        |   158 +-
 .../jdt/internal/compiler/ast/FalseLiteral.java    |   136 +-
 .../internal/compiler/ast/FieldDeclaration.java    |   560 +-
 .../jdt/internal/compiler/ast/FieldReference.java  |  1190 +-
 .../jdt/internal/compiler/ast/FloatLiteral.java    |   230 +-
 .../jdt/internal/compiler/ast/ForStatement.java    |   662 +-
 .../internal/compiler/ast/ForeachStatement.java    |   948 +-
 .../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         |   218 +-
 .../jdt/internal/compiler/ast/IntLiteral.java      |   296 +-
 .../internal/compiler/ast/IntLiteralMinValue.java  |    54 +-
 .../eclipse/jdt/internal/compiler/ast/Javadoc.java |  1256 +-
 .../compiler/ast/JavadocAllocationExpression.java  |   280 +-
 .../compiler/ast/JavadocArgumentExpression.java    |   190 +-
 .../ast/JavadocArrayQualifiedTypeReference.java    |    96 +-
 .../ast/JavadocArraySingleTypeReference.java       |    92 +-
 .../compiler/ast/JavadocFieldReference.java        |   272 +-
 .../compiler/ast/JavadocImplicitTypeReference.java |   192 +-
 .../compiler/ast/JavadocImportReference.java       |    64 +-
 .../internal/compiler/ast/JavadocMessageSend.java  |   442 +-
 .../ast/JavadocQualifiedTypeReference.java         |   166 +-
 .../compiler/ast/JavadocReturnStatement.java       |   124 +-
 .../compiler/ast/JavadocSingleNameReference.java   |   120 +-
 .../compiler/ast/JavadocSingleTypeReference.java   |   185 +-
 .../internal/compiler/ast/LabeledStatement.java    |   261 +-
 .../eclipse/jdt/internal/compiler/ast/Literal.java |   114 +-
 .../internal/compiler/ast/LocalDeclaration.java    |   493 +-
 .../jdt/internal/compiler/ast/LongLiteral.java     |   322 +-
 .../internal/compiler/ast/LongLiteralMinValue.java |    54 +-
 .../jdt/internal/compiler/ast/MagicLiteral.java    |    58 +-
 .../internal/compiler/ast/MarkerAnnotation.java    |    90 +-
 .../jdt/internal/compiler/ast/MemberValuePair.java |   328 +-
 .../jdt/internal/compiler/ast/MessageSend.java     |   876 +-
 .../internal/compiler/ast/MethodDeclaration.java   |   433 +-
 .../jdt/internal/compiler/ast/NameReference.java   |   128 +-
 .../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   |   624 +-
 .../ast/ParameterizedSingleTypeReference.java      |   488 +-
 .../internal/compiler/ast/PostfixExpression.java   |   154 +-
 .../internal/compiler/ast/PrefixExpression.java    |   120 +-
 .../ast/QualifiedAllocationExpression.java         |   792 +-
 .../compiler/ast/QualifiedNameReference.java       |  1926 +-
 .../compiler/ast/QualifiedSuperReference.java      |   126 +-
 .../compiler/ast/QualifiedThisReference.java       |   236 +-
 .../compiler/ast/QualifiedTypeReference.java       |   244 +-
 .../jdt/internal/compiler/ast/Reference.java       |   172 +-
 .../jdt/internal/compiler/ast/ReturnStatement.java |   452 +-
 .../compiler/ast/SingleMemberAnnotation.java       |   134 +-
 .../internal/compiler/ast/SingleNameReference.java |  1532 +-
 .../internal/compiler/ast/SingleTypeReference.java |   156 +-
 .../jdt/internal/compiler/ast/Statement.java       |   288 +-
 .../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 |   742 +-
 .../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    |  1130 +-
 .../jdt/internal/compiler/ast/TypeDeclaration.java |  2629 +--
 .../jdt/internal/compiler/ast/TypeParameter.java   |   224 +-
 .../jdt/internal/compiler/ast/TypeReference.java   |   338 +-
 .../jdt/internal/compiler/ast/UnaryExpression.java |   614 +-
 .../jdt/internal/compiler/ast/WhileStatement.java  |   476 +-
 .../jdt/internal/compiler/ast/Wildcard.java        |   226 +-
 .../compiler/batch/ClasspathDirectory.java         |   277 +-
 .../jdt/internal/compiler/batch/ClasspathJar.java  |   192 +-
 .../internal/compiler/batch/ClasspathLocation.java |    88 +-
 .../internal/compiler/batch/CompilationUnit.java   |   156 +-
 .../jdt/internal/compiler/batch/FileFinder.java    |    96 +-
 .../jdt/internal/compiler/batch/FileSystem.java    |   408 +-
 .../eclipse/jdt/internal/compiler/batch/Main.java  |  5437 +++---
 .../internal/compiler/batch/messages.properties    |   422 +-
 .../compiler/classfmt/ClassFileConstants.java      |   144 +-
 .../compiler/classfmt/ClassFileReader.java         |  2132 +--
 .../compiler/classfmt/ClassFileStruct.java         |   376 +-
 .../compiler/classfmt/ClassFormatException.java    |   266 +-
 .../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  | 12315 ++++++------
 .../internal/compiler/codegen/ConstantPool.java    |  1875 +-
 .../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   |    70 +-
 .../jdt/internal/compiler/env/AccessRule.java      |   108 +-
 .../jdt/internal/compiler/env/AccessRuleSet.java   |   202 +-
 .../jdt/internal/compiler/env/IBinaryField.java    |    94 +-
 .../jdt/internal/compiler/env/IBinaryMethod.java   |   124 +-
 .../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   |    46 +-
 .../jdt/internal/compiler/env/IGenericMethod.java  |    58 +-
 .../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   |    64 +-
 .../jdt/internal/compiler/env/ISourceMethod.java   |   126 +-
 .../jdt/internal/compiler/env/ISourceType.java     |   180 +-
 .../compiler/env/NameEnvironmentAnswer.java        |   176 +-
 .../compiler/flow/ConditionalFlowInfo.java         |   500 +-
 .../flow/ExceptionHandlingFlowContext.java         |   434 +-
 .../internal/compiler/flow/FinallyFlowContext.java |   330 +-
 .../jdt/internal/compiler/flow/FlowContext.java    |  1064 +-
 .../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    |  1954 +-
 .../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 |   515 +-
 .../internal/compiler/lookup/BaseTypeBinding.java  |   408 +-
 .../jdt/internal/compiler/lookup/BaseTypes.java    |    48 +-
 .../compiler/lookup/BinaryTypeBinding.java         |  1741 +-
 .../jdt/internal/compiler/lookup/Binding.java      |   172 +-
 .../jdt/internal/compiler/lookup/BlockScope.java   |  1704 +-
 .../internal/compiler/lookup/CaptureBinding.java   |   353 +-
 .../jdt/internal/compiler/lookup/ClassScope.java   |  2271 +--
 .../compiler/lookup/CompilationUnitScope.java      |  1444 +-
 .../compiler/lookup/CompilerModifiers.java         |    82 +-
 .../jdt/internal/compiler/lookup/FieldBinding.java |   618 +-
 .../internal/compiler/lookup/ImportBinding.java    |    96 +-
 .../compiler/lookup/ImportConflictBinding.java     |    58 +-
 .../compiler/lookup/InnerEmulationDependency.java  |    44 +-
 .../internal/compiler/lookup/InvocationSite.java   |    56 +-
 .../internal/compiler/lookup/LocalTypeBinding.java |   433 +-
 .../compiler/lookup/LocalVariableBinding.java      |   316 +-
 .../compiler/lookup/LookupEnvironment.java         |  2035 +-
 .../compiler/lookup/MemberTypeBinding.java         |    78 +-
 .../internal/compiler/lookup/MethodBinding.java    |  1538 +-
 .../jdt/internal/compiler/lookup/MethodScope.java  |   988 +-
 .../internal/compiler/lookup/MethodVerifier.java   |  1196 +-
 .../internal/compiler/lookup/MethodVerifier15.java |   855 +-
 .../compiler/lookup/NestedTypeBinding.java         |   434 +-
 .../internal/compiler/lookup/PackageBinding.java   |   412 +-
 .../compiler/lookup/ParameterizedFieldBinding.java |   128 +-
 .../lookup/ParameterizedGenericMethodBinding.java  |   946 +-
 .../lookup/ParameterizedMethodBinding.java         |   282 +-
 .../compiler/lookup/ParameterizedTypeBinding.java  |  2026 +-
 .../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   |    92 +-
 .../internal/compiler/lookup/RawTypeBinding.java   |   348 +-
 .../internal/compiler/lookup/ReferenceBinding.java |  1982 +-
 .../jdt/internal/compiler/lookup/Scope.java        |  6933 +++----
 .../internal/compiler/lookup/SignatureWrapper.java |   136 +-
 .../compiler/lookup/SourceTypeBinding.java         |  2994 ++-
 .../jdt/internal/compiler/lookup/Substitution.java |    66 +-
 .../compiler/lookup/SyntheticArgumentBinding.java  |   116 +-
 .../compiler/lookup/SyntheticFieldBinding.java     |    48 +-
 .../compiler/lookup/SyntheticMethodBinding.java    |   786 +-
 .../jdt/internal/compiler/lookup/TagBits.java      |   196 +-
 .../jdt/internal/compiler/lookup/TypeBinding.java  |  1314 +-
 .../internal/compiler/lookup/TypeConstants.java    |   314 +-
 .../jdt/internal/compiler/lookup/TypeIds.java      |   308 +-
 .../compiler/lookup/TypeVariableBinding.java       |   936 +-
 .../lookup/UnresolvedReferenceBinding.java         |   142 +-
 .../compiler/lookup/UpdatedMethodBinding.java      |    50 +-
 .../internal/compiler/lookup/VariableBinding.java  |   120 +-
 .../internal/compiler/lookup/WildcardBinding.java  |  1213 +-
 .../compiler/{util => }/messages.properties        |   124 +-
 .../compiler/parser/AbstractCommentParser.java     |  2970 +--
 .../internal/compiler/parser/JavadocParser.java    |  1472 +-
 .../jdt/internal/compiler/parser/NLSLine.java      |   130 +-
 .../jdt/internal/compiler/parser/Parser.java       | 18729 ++++++++++---------
 .../compiler/parser/ParserBasicInformation.java    |    70 +-
 .../internal/compiler/parser/RecoveredBlock.java   |   660 +-
 .../internal/compiler/parser/RecoveredElement.java |   616 +-
 .../internal/compiler/parser/RecoveredField.java   |   402 +-
 .../internal/compiler/parser/RecoveredImport.java  |   114 +-
 .../compiler/parser/RecoveredInitializer.java      |   474 +-
 .../compiler/parser/RecoveredLocalVariable.java    |   216 +-
 .../internal/compiler/parser/RecoveredMethod.java  |   967 +-
 .../compiler/parser/RecoveredStatement.java        |   108 +-
 .../internal/compiler/parser/RecoveredType.java    |  1074 +-
 .../internal/compiler/parser/RecoveredUnit.java    |   434 +-
 .../jdt/internal/compiler/parser/Scanner.java      |  7302 ++++----
 .../internal/compiler/parser/ScannerHelper.java    |   414 +-
 .../internal/compiler/parser/TerminalTokens.java   |   292 +-
 .../compiler/parser/diagnose/DiagnoseParser.java   |  4590 ++---
 .../compiler/parser/diagnose/LexStream.java        |   540 +-
 .../compiler/parser/diagnose/RangeUtil.java        |   400 +-
 .../compiler/parser/readableNames.properties       |   610 +-
 .../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  |   452 +-
 .../compiler/problem/DefaultProblemFactory.java    |   394 +-
 .../internal/compiler/problem/ProblemHandler.java  |   366 +-
 .../internal/compiler/problem/ProblemReporter.java | 11505 ++++++------
 .../compiler/problem/ProblemSeverities.java        |    50 +-
 .../compiler/problem/ShouldNotImplement.java       |    48 +-
 .../internal/compiler/problem/messages.properties  |  1108 +-
 .../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       |   491 +-
 .../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   |   916 +-
 .../jdt/internal/compiler/util/WeakHashSet.java    |   412 +-
 .../compiler/util/WeakHashSetOfCharArray.java      |   418 +-
 309 files changed, 110125 insertions(+), 109626 deletions(-)

diff --cc debian/changelog
index bec1e8b,0000000..664fedf
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,122 -1,0 +1,130 @@@
++ecj-bootstrap (3.1.1-1) unstable; urgency=low
++
++  * New upstream version.
++  * Remove bootstrap workaround, tighten build dependency to gcj-4.0.2.
++  * Fix symlink to manpage (closes: #330080).
++
++ -- Matthias Klose <doko at debian.org>  Sat,  1 Oct 2005 18:32:05 +0200
++
 +ecj-bootstrap (3.0.93-1) unstable; urgency=low
 +
 +  * 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
 +
 +  * Temporarily disable building ecj-bootstrap-gcj. FTBFS on amd64. Unbreak
 +    ant's dependency on ecj (>= 3.0.1-4ubuntu2).
 +
 + -- Matthias Klose <doko at ubuntu.com>  Thu, 30 Jun 2005 09:59:20 +0000
 +
 +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 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 7997f92,0000000..a881629
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,35 -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: 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
++Build-Depends: cdbs (>= 0.4.26), debhelper (>= 4.1.0), gij-4.0 (>= 4.0.2), gcj-4.0 (>= 4.0.2), libgcj6-common, libgcj6-dev, fastjar, ant
++Standards-Version: 3.6.2
 +
 +Package: ecj-bootstrap
 +Architecture: all
- Depends: gij-4.0 (>= 4.0.1-7), libgcj6-common, java-common (>= 0.22ubuntu1)
++Depends: gij-4.0 (>= 4.0.2), 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/copyright
index c898694,0000000..c591ceb
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,282 -1,0 +1,241 @@@
 +This package was debianized by Jerry Haltom <wasabi at larvalstage.net> on
 +Thu, 10 Feb 2005 14:47:15 -0600
 +
 +It was downloaded from dev.eclipse.org cvs. 
- The ecj script is taken from java-gcj-compat (ftp://sources.redhat.com/pub/rhug/)
 +
 +This software is copyright (c) 2000, 2004 IBM Corporation and others,
 +licensed under the Common Public License - v 1.0.
 +
 +The ecj script is Copyright (C) 2004  Red Hat, licensed under the GPL with
 +a special exception.
 +
 +Copyright:
 +
 +Common Public License - v 1.0
 +
 +THE ACCOMPANYING PROGRAM IS PROVIDED UNDER THE TERMS OF THIS COMMON 
 +PUBLIC LICENSE ("AGREEMENT"). ANY USE, REPRODUCTION OR DISTRIBUTION OF 
 +THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE OF THIS AGREEMENT.
 +
 +1. DEFINITIONS
 +
 +"Contribution" means:
 +
 +      a) in the case of the initial Contributor, the initial code and 
 +documentation distributed under this Agreement, and
 +      b) in the case of each subsequent Contributor:
 +
 +      i) changes to the Program, and
 +
 +      ii) additions to the Program;
 +
 +      where such changes and/or additions to the Program originate from 
 +and are distributed by that particular Contributor. A Contribution 
 +'originates' from a Contributor if it was added to the Program by such 
 +Contributor itself or anyone acting on such Contributor's behalf. 
 +Contributions do not include additions to the Program which: (i) are 
 +separate modules of software distributed in conjunction with the Program 
 +under their own license agreement, and (ii) are not derivative works of 
 +the Program. 
 +
 +"Contributor" means any person or entity that distributes the Program.
 +
 +"Licensed Patents " mean patent claims licensable by a Contributor which 
 +are necessarily infringed by the use or sale of its Contribution alone 
 +or when combined with the Program.
 +
 +"Program" means the Contributions distributed in accordance with this 
 +Agreement.
 +
 +"Recipient" means anyone who receives the Program under this Agreement, 
 +including all Contributors.
 +
 +2. GRANT OF RIGHTS
 +
 +      a) Subject to the terms of this Agreement, each Contributor hereby 
 +grants Recipient a non-exclusive, worldwide, royalty-free copyright 
 +license to reproduce, prepare derivative works of, publicly display, 
 +publicly perform, distribute and sublicense the Contribution of such 
 +Contributor, if any, and such derivative works, in source code and 
 +object code form.
 +
 +      b) Subject to the terms of this Agreement, each Contributor hereby 
 +grants Recipient a non-exclusive, worldwide, royalty-free patent license 
 +under Licensed Patents to make, use, sell, offer to sell, import and 
 +otherwise transfer the Contribution of such Contributor, if any, in 
 +source code and object code form. This patent license shall apply to the 
 +combination of the Contribution and the Program if, at the time the 
 +Contribution is added by the Contributor, such addition of the 
 +Contribution causes such combination to be covered by the Licensed 
 +Patents. The patent license shall not apply to any other combinations 
 +which include the Contribution. No hardware per se is licensed 
 +hereunder. 
 +
 +      c) Recipient understands that although each Contributor grants the 
 +licenses to its Contributions set forth herein, no assurances are 
 +provided by any Contributor that the Program does not infringe the 
 +patent or other intellectual property rights of any other entity. Each 
 +Contributor disclaims any liability to Recipient for claims brought by 
 +any other entity based on infringement of intellectual property rights 
 +or otherwise. As a condition to exercising the rights and licenses 
 +granted hereunder, each Recipient hereby assumes sole responsibility to 
 +secure any other intellectual property rights needed, if any. For 
 +example, if a third party patent license is required to allow Recipient 
 +to distribute the Program, it is Recipient's responsibility to acquire 
 +that license before distributing the Program.
 +
 +      d) Each Contributor represents that to its knowledge it has 
 +sufficient copyright rights in its Contribution, if any, to grant the 
 +copyright license set forth in this Agreement. 
 +
 +3. REQUIREMENTS
 +
 +A Contributor may choose to distribute the Program in object code form 
 +under its own license agreement, provided that:
 +
 +      a) it complies with the terms and conditions of this Agreement; 
 +and
 +
 +      b) its license agreement:
 +
 +      i) effectively disclaims on behalf of all Contributors all 
 +warranties and conditions, express and implied, including warranties or 
 +conditions of title and non-infringement, and implied warranties or 
 +conditions of merchantability and fitness for a particular purpose; 
 +
 +      ii) effectively excludes on behalf of all Contributors all 
 +liability for damages, including direct, indirect, special, incidental 
 +and consequential damages, such as lost profits; 
 +
 +      iii) states that any provisions which differ from this Agreement 
 +are offered by that Contributor alone and not by any other party; and
 +
 +      iv) states that source code for the Program is available from such 
 +Contributor, and informs licensees how to obtain it in a reasonable 
 +manner on or through a medium customarily used for software exchange. 
 +
 +When the Program is made available in source code form:
 +
 +      a) it must be made available under this Agreement; and 
 +
 +      b) a copy of this Agreement must be included with each copy of the 
 +Program. 
 +
 +Contributors may not remove or alter any copyright notices contained 
 +within the Program.
 +
 +Each Contributor must identify itself as the originator of its 
 +Contribution, if any, in a manner that reasonably allows subsequent 
 +Recipients to identify the originator of the Contribution.
 +
 +4. COMMERCIAL DISTRIBUTION
 +
 +Commercial distributors of software may accept certain responsibilities 
 +with respect to end users, business partners and the like. While this 
 +license is intended to facilitate the commercial use of the Program, the 
 +Contributor who includes the Program in a commercial product offering 
 +should do so in a manner which does not create potential liability for 
 +other Contributors. Therefore, if a Contributor includes the Program in 
 +a commercial product offering, such Contributor ("Commercial 
 +Contributor") hereby agrees to defend and indemnify every other 
 +Contributor ("Indemnified Contributor") against any losses, damages and 
 +costs (collectively "Losses") arising from claims, lawsuits and other 
 +legal actions brought by a third party against the Indemnified 
 +Contributor to the extent caused by the acts or omissions of such 
 +Commercial Contributor in connection with its distribution of the 
 +Program in a commercial product offering. The obligations in this 
 +section do not apply to any claims or Losses relating to any actual or 
 +alleged intellectual property infringement. In order to qualify, an 
 +Indemnified Contributor must: a) promptly notify the Commercial 
 +Contributor in writing of such claim, and b) allow the Commercial 
 +Contributor to control, and cooperate with the Commercial Contributor 
 +in, the defense and any related settlement negotiations. The Indemnified 
 +Contributor may participate in any such claim at its own expense.
 +
 +For example, a Contributor might include the Program in a commercial 
 +product offering, Product X. That Contributor is then a Commercial 
 +Contributor. If that Commercial Contributor then makes performance 
 +claims, or offers warranties related to Product X, those performance 
 +claims and warranties are such Commercial Contributor's responsibility 
 +alone. Under this section, the Commercial Contributor would have to 
 +defend claims against the other Contributors related to those 
 +performance claims and warranties, and if a court requires any other 
 +Contributor to pay any damages as a result, the Commercial Contributor 
 +must pay those damages.
 +
 +5. NO WARRANTY
 +
 +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, THE PROGRAM IS PROVIDED 
 +ON AN "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, 
 +EITHER EXPRESS OR IMPLIED INCLUDING, WITHOUT LIMITATION, ANY WARRANTIES 
 +OR CONDITIONS OF TITLE, NON-INFRINGEMENT, MERCHANTABILITY OR FITNESS FOR 
 +A PARTICULAR PURPOSE. Each Recipient is solely responsible for 
 +determining the appropriateness of using and distributing the Program 
 +and assumes all risks associated with its exercise of rights under this 
 +Agreement, including but not limited to the risks and costs of program 
 +errors, compliance with applicable laws, damage to or loss of data, 
 +programs or equipment, and unavailability or interruption of operations.
 +
 +6. DISCLAIMER OF LIABILITY
 +
 +EXCEPT AS EXPRESSLY SET FORTH IN THIS AGREEMENT, NEITHER RECIPIENT NOR 
 +ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR ANY DIRECT, INDIRECT, 
 +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING 
 +WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY OF 
 +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
 +NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR 
 +DISTRIBUTION OF THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED 
 +HEREUNDER, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 +
 +7. GENERAL
 +
 +If any provision of this Agreement is invalid or unenforceable under 
 +applicable law, it shall not affect the validity or enforceability of 
 +the remainder of the terms of this Agreement, and without further action 
 +by the parties hereto, such provision shall be reformed to the minimum 
 +extent necessary to make such provision valid and enforceable.
 +
 +If Recipient institutes patent litigation against a Contributor with 
 +respect to a patent applicable to software (including a cross-claim or 
 +counterclaim in a lawsuit), then any patent licenses granted by that 
 +Contributor to such Recipient under this Agreement shall terminate as of 
 +the date such litigation is filed. In addition, if Recipient institutes 
 +patent litigation against any entity (including a cross-claim or 
 +counterclaim in a lawsuit) alleging that the Program itself (excluding 
 +combinations of the Program with other software or hardware) infringes 
 +such Recipient's patent(s), then such Recipient's rights granted under 
 +Section 2(b) shall terminate as of the date such litigation is filed.
 +
 +All Recipient's rights under this Agreement shall terminate if it fails 
 +to comply with any of the material terms or conditions of this Agreement 
 +and does not cure such failure in a reasonable period of time after 
 +becoming aware of such noncompliance. If all Recipient's rights under 
 +this Agreement terminate, Recipient agrees to cease use and distribution 
 +of the Program as soon as reasonably practicable. However, Recipient's 
 +obligations under this Agreement and any licenses granted by Recipient 
 +relating to the Program shall continue and survive.
 +
 +Everyone is permitted to copy and distribute copies of this Agreement, 
 +but in order to avoid inconsistency the Agreement is copyrighted and may 
 +only be modified in the following manner. The Agreement Steward reserves 
 +the right to publish new versions (including revisions) of this 
 +Agreement from time to time. No one other than the Agreement Steward has 
 +the right to modify this Agreement. IBM is the initial Agreement 
 +Steward. IBM may assign the responsibility to serve as the Agreement 
 +Steward to a suitable separate entity. Each new version of the Agreement 
 +will be given a distinguishing version number. The Program (including 
 +Contributions) may always be distributed subject to the version of the 
 +Agreement under which it was received. In addition, after a new version 
 +of the Agreement is published, Contributor may elect to distribute the 
 +Program (including its Contributions) under the new version. Except as 
 +expressly stated in Sections 2(a) and 2(b) above, Recipient receives no 
 +rights or licenses to the intellectual property of any Contributor under 
 +this Agreement, whether expressly, by implication, estoppel or 
 +otherwise. All rights in the Program not expressly granted under this 
 +Agreement are reserved.
 +
 +This Agreement is governed by the laws of the State of New York and the 
 +intellectual property laws of the United States of America. No party to 
 +this Agreement will bring a legal action under this Agreement more than 
 +one year after the cause of action arose. Each party waives its rights 
 +to a jury trial in any resulting litigation. 
- 
- 
- Copyright ecj script:
- 
- /* Main.java -- implement com.sun.tools.javac.Main
-    Copyright (C) 2004  Red Hat
- 
- This file is part of java-gcj-compat.
- 
- java-gcj-compat is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
- 
- java-gcj-compat is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with java-gcj-compat; see the file COPYING.  If not, write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA.
- 
- Linking this library statically or dynamically with other modules is
- making a combined work based on this library.  Thus, the terms and
- conditions of the GNU General Public License cover the whole
- combination.
- 
- As a special exception, the copyright holders of this library give you
- permission to link this library with independent modules to produce an
- executable, regardless of the license terms of these independent
- modules, and to copy and distribute the resulting executable under
- terms of your choice, provided that you also meet, for each linked
- independent module, the terms and conditions of the license of that
- module.  An independent module is a module which is not derived from
- or based on this library.  If you modify this library, you may extend
- this exception to your version of the library, but you are not
- obligated to do so.  If you do not wish to do so, delete this
- exception statement from your version. */
diff --cc debian/rules
index 375aba2,0000000..a303082
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,145 -1,0 +1,136 @@@
 +#!/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
++ant_version =
 +GCJ = gcj-$(gcc_version)
++GIJ = gij-$(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
 +
++default: build
++
++eclipse_root = ../eclipse-3.1.1/source-tree
++
++get-source:
++	test -d $(eclipse_root)
++	rm -rf src
++	mkdir -p src/org.eclipse.jdt.core
++	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/compiler/org \
++		src/org.eclipse.jdt.core/
++	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch \
++		src/org.eclipse.jdt.core/org/eclipse/jdt/internal/compiler/
++
++	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/core/JDTCompilerAdapter.java \
++		src/org.eclipse.jdt.core/org/eclipse/jdt/core/
++	cp -a $(eclipse_root)/plugins/org.eclipse.jdt.core/antadapter/org/eclipse/jdt/internal/antadapter \
++		src/org.eclipse.jdt.core/org/eclipse/jdt/internal/
++
 +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; \
- 	    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 \
++	    $(GCJ) -d build/bin -C -g \
 +	        -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 . -f build/bootstrap/ecj.jar
++	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/org build/bin/
 +
- 	/usr/bin/gij-$(gcc_version) \
++	$(GIJ) \
 +	    -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 . -f build/dist/ecj.jar
++	fastjar -c -C build/bin . -f build/dist/ecj.jar
 +	rm -rf build/bin
 +
 +ifeq ($(with_native),yes)
- 	/usr/bin/gcj-$(gcc_version) \
- 	    -Wl,-Bsymbolic -shared -fPIC -fjni -findirect-dispatch \
++	$(GCJ) \
++	    -O2 -g -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 -findirect-dispatch \
++	$(GCJ) \
++	    -O2 -g -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:
 +	# 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
 +
 +
 +install/ecj-bootstrap:: install-ecj-bootstrap
 +install/ecj-bootstrap-gcj:: install-ecj-bootstrap
++	mkdir -p debian/ecj-bootstrap-gcj/usr/share/man/man1
++	ln -sf ecj-bootstrap.1.gz debian/ecj-bootstrap-gcj/usr/share/man/man1/ecj-bootstrap-gcj.1.gz
 +
 +
 +clean::
 +	rm -rf build

-- 
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