[Git][java-team/lombok-ast][master] 6 commits: Declare compliance with Debian Policy 4.6.1.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Fri Aug 12 11:53:16 BST 2022
Markus Koschany pushed to branch master at Debian Java Maintainers / lombok-ast
Commits:
fc7a3366 by Markus Koschany at 2022-08-12T00:40:40+02:00
Declare compliance with Debian Policy 4.6.1.
- - - - -
8729efb1 by Markus Koschany at 2022-08-12T12:34:00+02:00
Add JcTreeConverter.patch and remove obsolete CommentInfo class references.
CommentInfo is no longer present in lombok
- - - - -
b363f163 by Markus Koschany at 2022-08-12T12:36:23+02:00
Update changelog
- - - - -
78fc9464 by Markus Koschany at 2022-08-12T12:41:40+02:00
Update patch header
- - - - -
8be479ff by Markus Koschany at 2022-08-12T12:50:13+02:00
Add datetime.patch
- - - - -
32084ea0 by Markus Koschany at 2022-08-12T12:51:00+02:00
Update changelog
- - - - -
5 changed files:
- debian/changelog
- debian/control
- + debian/patches/JcTreeConverter.patch
- + debian/patches/datetime.patch
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,12 @@
+lombok-ast (0.2+ds-7) unstable; urgency=medium
+
+ * Declare compliance with Debian Policy 4.6.1.
+ * Add JcTreeConverter.patch and remove obsolete CommentInfo class references.
+ CommentInfo is no longer present in lombok. (Closes: #1011735, #1012874)
+ * Add datetime.patch to work around a FTBFS due to a negative datetime value.
+
+ -- Markus Koschany <apo at debian.org> Fri, 12 Aug 2022 12:34:52 +0200
+
lombok-ast (0.2+ds-6) unstable; urgency=medium
* Declare compliance with Debian Policy 4.6.0.
=====================================
debian/control
=====================================
@@ -20,7 +20,7 @@ Build-Depends:
liblombok-java (>= 1.16.22-3),
libjsr305-java,
maven-repo-helper
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
Vcs-Git: https://salsa.debian.org/java-team/lombok-ast.git
Vcs-Browser: https://salsa.debian.org/java-team/lombok-ast
Homepage: https://projectlombok.org
=====================================
debian/patches/JcTreeConverter.patch
=====================================
@@ -0,0 +1,141 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 12 Aug 2022 12:33:44 +0200
+Subject: JcTreeConverter
+
+Bug-Debian: https://bugs.debian.org/1011735
+Bug-Debian: https://bugs.debian.org/1012874
+Forwarded: no
+
+lombok-utils.jar has been removed from lombok which contained the CommentInfo
+class. Work around it by removing all references to CommentInfo. Hopefully it
+is not needed anymore.
+---
+ .../lombok/ast/javac/JcTreeConverter.java | 108 ---------------------
+ 1 file changed, 108 deletions(-)
+
+diff --git a/src/javacTransformer/lombok/ast/javac/JcTreeConverter.java b/src/javacTransformer/lombok/ast/javac/JcTreeConverter.java
+index 665d761..fdea99f 100644
+--- a/src/javacTransformer/lombok/ast/javac/JcTreeConverter.java
++++ b/src/javacTransformer/lombok/ast/javac/JcTreeConverter.java
+@@ -116,7 +116,6 @@ import lombok.ast.VariableDefinitionEntry;
+ import lombok.ast.VariableReference;
+ import lombok.ast.While;
+ import lombok.ast.WildcardKind;
+-import lombok.javac.CommentInfo;
+
+ import com.google.common.collect.ImmutableMap;
+ import com.google.common.collect.Lists;
+@@ -423,113 +422,6 @@ public class JcTreeConverter {
+ return get();
+ }
+
+- public Node getResultWithJavadoc(java.util.List<CommentInfo> comments) {
+- ListBuffer<CommentInfo> javadocs = ListBuffer.lb();
+- for (CommentInfo commentInfo : comments) {
+- if (commentInfo.isJavadoc()) javadocs.append(commentInfo);
+- }
+-
+- Node result = getResult();
+- if (javadocs.isEmpty()) return result;
+-
+- val nodePositions = new TreeMap<Integer, Node>();
+- result.accept(new ForwardingAstVisitor() {
+- private void addToMap(Node positionNode, Node linked) {
+- if (positionNode == null) return;
+-
+- int start = positionNode.getPosition().getStart();
+- if (start == -1) return;
+-
+- if (linked instanceof JavadocContainer || !nodePositions.containsKey(start)) {
+- nodePositions.put(start, linked);
+- }
+- }
+-
+- private void addToMap(StrictListAccessor<?, ?> nodes, Node linked) {
+- if (nodes == null) return;
+-
+- for (Node node : nodes) {
+- addToMap(node, linked);
+- }
+- }
+-
+- @Override public boolean visitNode(Node node) {
+- int start = node.getPosition().getStart();
+-
+- addToMap(node, node);
+- try {
+- if (node instanceof VariableDeclaration) {
+- addToMap(((VariableDeclaration)node).astDefinition().astModifiers(), node);
+- addToMap(((VariableDeclaration)node).astDefinition().astModifiers().astAnnotations(), node);
+- addToMap(((VariableDeclaration)node).astDefinition().astTypeReference(), node);
+- addToMap(((VariableDeclaration)node).astDefinition().astVariables().first().astName(), node);
+- } else if (node instanceof TypeDeclaration) {
+- addToMap(((TypeDeclaration)node).astModifiers(), node);
+- addToMap(((TypeDeclaration)node).astModifiers().astAnnotations(), node);
+- } else if (node instanceof MethodDeclaration) {
+- addToMap(((MethodDeclaration)node).astModifiers(), node);
+- addToMap(((MethodDeclaration)node).astModifiers().astAnnotations(), node);
+- addToMap(((MethodDeclaration)node).astTypeVariables().first(), node);
+- addToMap(((MethodDeclaration)node).astReturnTypeReference(), node);
+- addToMap(((MethodDeclaration)node).astMethodName(), node);
+- } else if (node instanceof ConstructorDeclaration) {
+- addToMap(((ConstructorDeclaration)node).astModifiers(), node);
+- addToMap(((ConstructorDeclaration)node).astModifiers().astAnnotations(), node);
+- addToMap(((ConstructorDeclaration)node).astTypeVariables().first(), node);
+- addToMap(((ConstructorDeclaration)node).astTypeName(), node);
+- } else if (node instanceof EnumConstant) {
+- addToMap(((EnumConstant)node).astName(), node);
+- addToMap(((EnumConstant)node).astAnnotations(), node);
+- } else if (node instanceof AnnotationMethodDeclaration) {
+- addToMap(((AnnotationMethodDeclaration)node).astModifiers(), node);
+- addToMap(((AnnotationMethodDeclaration)node).astModifiers().astAnnotations(), node);
+- addToMap(((AnnotationMethodDeclaration)node).astReturnTypeReference(), node);
+- addToMap(((AnnotationMethodDeclaration)node).astMethodName(), node);
+- } else if (node instanceof PackageDeclaration) {
+- addToMap(((PackageDeclaration)node).astAnnotations(), node);
+- }
+- } catch (NullPointerException e) {
+- // Syntax errors in file - javadoc won't get linked up correctly.
+- }
+-
+- if (node instanceof JavadocContainer || !nodePositions.containsKey(start)) {
+- nodePositions.put(start, node);
+- }
+-
+- return false;
+- }
+- });
+-
+- for (CommentInfo javadoc : javadocs) {
+- try {
+- Integer key = nodePositions.tailMap(javadoc.endPos).firstKey();
+- Node node = nodePositions.get(key);
+- if (node instanceof JavadocContainer) {
+- attachJavadocToNode(javadoc, (JavadocContainer) node);
+- }
+- } catch (NoSuchElementException e) {
+- // Then the javadoc obviously is 'floating', as its the last thing in the file.
+- }
+- }
+-
+- return result;
+- }
+-
+- private void attachJavadocToNode(CommentInfo javadoc, JavadocContainer node) {
+- String content = javadoc.content;
+- if (content.startsWith("/*") && content.endsWith("*/")) content = content.substring(2, content.length() - 2);
+-
+- Comment comment = new Comment().astBlockComment(true).astContent(content);
+- comment.setPosition(new Position(javadoc.pos, javadoc.endPos));
+- node.astJavadoc(comment);
+- if (!node.getPosition().isUnplaced()) {
+- int oldStart = node.getPosition().getStart();
+- if (oldStart == -1 || comment.getPosition().getStart() < oldStart) {
+- node.setPosition(new Position(comment.getPosition().getStart(), node.getPosition().getEnd()));
+- }
+- }
+- }
+-
+ private <N extends Node> N setPos(JCTree node, N astNode) {
+ if (astNode != null && node != null) {
+ int start = node.pos;
=====================================
debian/patches/datetime.patch
=====================================
@@ -0,0 +1,22 @@
+From: Markus Koschany <apo at debian.org>
+Date: Fri, 12 Aug 2022 12:43:23 +0200
+Subject: datetime
+
+Work around a FTBFS because of a negative?? datetime value
+---
+ build.xml | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 1af4a5d..e61077b 100644
+--- a/build.xml
++++ b/build.xml
+@@ -144,7 +144,7 @@
+ <compilerarg value="-processorpath" />
+ <compilerarg path="/usr/share/java/lombok.jar" />
+ </ivy:compile>
+- <touch file="build/lastSuccessfulCompile" datetime="${compile.started}" pattern="yyyyMMddHHmmssSSS" />
++ <!--<touch file="build/lastSuccessfulCompile" datetime="${compile.started}" pattern="yyyyMMddHHmmssSSS" />-->
+ </target>
+
+ <target name="-test.quiet">
=====================================
debian/patches/series
=====================================
@@ -1,3 +1,5 @@
build.patch
asm-compatibility.patch
CaseStatement.patch
+JcTreeConverter.patch
+datetime.patch
View it on GitLab: https://salsa.debian.org/java-team/lombok-ast/-/compare/fb8cce414adb147fd8c010d666b69ab5d97ecef6...32084ea040d5e93bd4cae67f470ce9b662c51f53
--
View it on GitLab: https://salsa.debian.org/java-team/lombok-ast/-/compare/fb8cce414adb147fd8c010d666b69ab5d97ecef6...32084ea040d5e93bd4cae67f470ce9b662c51f53
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20220812/fc42d921/attachment.htm>
More information about the pkg-java-commits
mailing list