[Git][java-team/lombok-ast][master] 5 commits: Declare compliance with Debian Policy 4.6.0.
Markus Koschany (@apo)
gitlab at salsa.debian.org
Mon Nov 8 20:10:15 GMT 2021
Markus Koschany pushed to branch master at Debian Java Maintainers / lombok-ast
Commits:
bcd69484 by Markus Koschany at 2021-11-08T13:37:33+01:00
Declare compliance with Debian Policy 4.6.0.
- - - - -
4df5f64f by Markus Koschany at 2021-11-08T13:38:21+01:00
Update debian/watch
- - - - -
eeab3ac4 by Markus Koschany at 2021-11-08T13:38:53+01:00
Update copyright year
- - - - -
e51fbd30 by Markus Koschany at 2021-11-08T21:06:41+01:00
Add CaseStatement.patch
- - - - -
fb8cce41 by Markus Koschany at 2021-11-08T21:07:58+01:00
Update changelog
- - - - -
7 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/CaseStatement.patch
- debian/patches/asm-compatibility.patch
- debian/patches/series
- debian/watch
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+lombok-ast (0.2+ds-6) unstable; urgency=medium
+
+ * Declare compliance with Debian Policy 4.6.0.
+ * Add CaseStatement.patch and work around a FTBFS due to a newer version of
+ src:eclipse-jdt-core. (Closes: #997250)
+
+ -- Markus Koschany <apo at debian.org> Mon, 08 Nov 2021 21:06:45 +0100
+
lombok-ast (0.2+ds-5) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -20,7 +20,7 @@ Build-Depends:
liblombok-java (>= 1.16.22-3),
libjsr305-java,
maven-repo-helper
-Standards-Version: 4.5.1
+Standards-Version: 4.6.0
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/copyright
=====================================
@@ -38,7 +38,7 @@ Copyright: 2010, John Resig
License: Expat or GPL-2
Files: debian/*
-Copyright: 2016-2018, Markus Koschany <apo at debian.org>
+Copyright: 2016-2021, Markus Koschany <apo at debian.org>
License: Expat
License: Expat
=====================================
debian/patches/CaseStatement.patch
=====================================
@@ -0,0 +1,63 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 8 Nov 2021 20:58:09 +0100
+Subject: CaseStatement
+
+Workaround for a FTBFS since eclipse-jdt-core has been updated to version 4.21.
+lombok.ast hasn't been updated by upstream for a couple of years now. The only
+reverse-dependency is android-platform-tools-base which is also outdated and
+currently RC-buggy. Maybe lombok.ast is no longer needed for newer versions. In
+any case this problem should be properly fixed with a future upload.
+
+Forwarded: not-needed
+---
+ src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java | 4 ++--
+ src/ecjTransformer/lombok/ast/ecj/EcjTreeVisitor.java | 6 +++---
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java b/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java
+index 367179d..513114c 100644
+--- a/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java
++++ b/src/ecjTransformer/lombok/ast/ecj/EcjTreeConverter.java
+@@ -1121,7 +1121,7 @@ public class EcjTreeConverter {
+ set(node, setPosition(node, switchStat));
+ }
+
+- @Override public void visitCaseStatement(CaseStatement node) {
++ /*@Override public void visitCaseStatement(CaseStatement node) {
+ if (node.constantExpression == null) {
+ lombok.ast.Default defaultStat = new lombok.ast.Default();
+ //TODO still have fix drunken positioning.
+@@ -1131,7 +1131,7 @@ public class EcjTreeConverter {
+ lombok.ast.Case caseStat = new lombok.ast.Case();
+ caseStat.astCondition((lombok.ast.Expression) toTree(node.constantExpression));
+ set(node, setPosition(node, caseStat));
+- }
++ }*/
+
+ @Override public void visitSynchronizedStatement(SynchronizedStatement node) {
+ lombok.ast.Synchronized synch = new lombok.ast.Synchronized();
+diff --git a/src/ecjTransformer/lombok/ast/ecj/EcjTreeVisitor.java b/src/ecjTransformer/lombok/ast/ecj/EcjTreeVisitor.java
+index 361b4b6..2bcee43 100644
+--- a/src/ecjTransformer/lombok/ast/ecj/EcjTreeVisitor.java
++++ b/src/ecjTransformer/lombok/ast/ecj/EcjTreeVisitor.java
+@@ -281,7 +281,7 @@ public abstract class EcjTreeVisitor {
+ return;
+ }
+ if (clazz == CaseStatement.class) {
+- visitCaseStatement((CaseStatement) node);
++ //visitCaseStatement((CaseStatement) node);
+ return;
+ }
+ if (clazz == BreakStatement.class) {
+@@ -624,9 +624,9 @@ public abstract class EcjTreeVisitor {
+ visitAny(node);
+ }
+
+- public void visitCaseStatement(CaseStatement node) {
++ /*public void visitCaseStatement(CaseStatement node) {
+ visitAny(node);
+- }
++ }*/
+
+ public void visitBreakStatement(BreakStatement node) {
+ visitAny(node);
=====================================
debian/patches/asm-compatibility.patch
=====================================
@@ -1,57 +1,23 @@
-Description: Build with the latest version of ASM in Debian.
- The changes were imported from the parboiled package.
-Author: Emmanuel Bourg <ebourg at apache.org>
+From: Emmanuel Bourg <ebourg at apache.org>
+Date: Mon, 8 Nov 2021 20:57:36 +0100
+Subject: Build with the latest version of ASM in Debian.
+
Forwarded: no
---- a/src/main/org/parboiled/transform/InstructionGroupPreparer.java
-+++ b/src/main/org/parboiled/transform/InstructionGroupPreparer.java
-@@ -21,7 +21,7 @@
- import org.objectweb.asm.Label;
- import org.objectweb.asm.Opcodes;
- import org.objectweb.asm.Type;
--import org.objectweb.asm.commons.EmptyVisitor;
-+import org.objectweb.asm.MethodVisitor;
- import org.objectweb.asm.tree.AbstractInsnNode;
- import org.objectweb.asm.tree.FieldNode;
- import org.objectweb.asm.tree.VarInsnNode;
-@@ -116,13 +116,14 @@
- }
- }
-
-- private static class MD5Digester extends EmptyVisitor {
-+ private static class MD5Digester extends MethodVisitor {
- private static MessageDigest digest;
- private static ByteBuffer buffer;
- private final List<Label> labels = new ArrayList<Label>();
- private final String parserClassName;
-
- public MD5Digester(String parserClassName) {
-+ super(Opcodes.ASM4);
- this.parserClassName = parserClassName;
- if (digest == null) {
- try {
-@@ -251,6 +252,12 @@
- update(type);
- }
-
-+ public void visitField(FieldNode field) {
-+ update(field.name);
-+ update(field.desc);
-+ update(field.signature);
-+ }
-+
- private void update(int i) {
- ensureRemaining(4);
- buffer.putInt(i);
-@@ -293,4 +300,4 @@
- }
- }
-
--}
-\ No newline at end of file
-+}
+
+The changes were imported from the parboiled package.
+---
+ .../parboiled/transform/ClassNodeInitializer.java | 17 ++++++----
+ .../parboiled/transform/InstructionGraphNode.java | 15 +++++----
+ .../transform/InstructionGroupPreparer.java | 13 ++++++--
+ src/main/org/parboiled/transform/RuleMethod.java | 3 +-
+ .../parboiled/transform/RuleMethodInterpreter.java | 39 +++++++++++-----------
+ 5 files changed, 49 insertions(+), 38 deletions(-)
+
+diff --git a/src/main/org/parboiled/transform/ClassNodeInitializer.java b/src/main/org/parboiled/transform/ClassNodeInitializer.java
+index 7c7f47f..285ecc8 100644
--- a/src/main/org/parboiled/transform/ClassNodeInitializer.java
+++ b/src/main/org/parboiled/transform/ClassNodeInitializer.java
-@@ -24,19 +24,20 @@
+@@ -24,19 +24,20 @@ package org.parboiled.transform;
import org.jetbrains.annotations.NotNull;
import org.objectweb.asm.*;
@@ -74,7 +40,7 @@ Forwarded: no
private ParserClassNode classNode;
private Class<?> ownerClass;
-@@ -44,6 +45,10 @@
+@@ -44,6 +45,10 @@ class ClassNodeInitializer extends EmptyVisitor implements Opcodes, Types {
private boolean hasDontLabelAnnotation;
private boolean hasSkipActionsInPredicates;
@@ -85,7 +51,7 @@ Forwarded: no
public void process(@NotNull ParserClassNode classNode) throws IOException {
this.classNode = classNode;
-@@ -90,16 +95,16 @@
+@@ -90,16 +95,16 @@ class ClassNodeInitializer extends EmptyVisitor implements Opcodes, Types {
@Override
public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
@@ -105,7 +71,7 @@ Forwarded: no
hasSkipActionsInPredicates = true;
return null;
}
-@@ -127,7 +132,7 @@
+@@ -127,7 +132,7 @@ class ClassNodeInitializer extends EmptyVisitor implements Opcodes, Types {
}
// only add non-native, non-abstract methods returning Rules
@@ -114,9 +80,11 @@ Forwarded: no
return null;
}
+diff --git a/src/main/org/parboiled/transform/InstructionGraphNode.java b/src/main/org/parboiled/transform/InstructionGraphNode.java
+index 23035f1..610a814 100644
--- a/src/main/org/parboiled/transform/InstructionGraphNode.java
+++ b/src/main/org/parboiled/transform/InstructionGraphNode.java
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ import org.objectweb.asm.Opcodes;
import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.analysis.BasicValue;
import org.objectweb.asm.tree.analysis.Value;
@@ -125,7 +93,7 @@ Forwarded: no
import java.util.ArrayList;
import java.util.Collection;
-@@ -36,7 +36,7 @@
+@@ -36,7 +36,7 @@ import java.util.List;
/**
* A node in the instruction dependency graph.
*/
@@ -134,7 +102,7 @@ Forwarded: no
private AbstractInsnNode instruction;
private final BasicValue resultValue;
-@@ -52,6 +52,7 @@
+@@ -52,6 +52,7 @@ class InstructionGraphNode implements Value, Opcodes {
private InstructionGroup group;
public InstructionGraphNode(AbstractInsnNode instruction, BasicValue resultValue) {
@@ -142,7 +110,7 @@ Forwarded: no
this.instruction = instruction;
this.resultValue = resultValue;
this.isActionRoot = AsmUtils.isActionRoot(instruction);
-@@ -60,8 +61,8 @@
+@@ -60,8 +61,8 @@ class InstructionGraphNode implements Value, Opcodes {
this.isContextSwitch = AsmUtils.isContextSwitch(instruction);
this.isCallOnContextAware = AsmUtils.isCallOnContextAware(instruction);
this.isCaptureGet = AsmUtils.isCaptureGet(instruction);
@@ -153,7 +121,7 @@ Forwarded: no
}
public int getSize() {
-@@ -136,8 +137,8 @@
+@@ -136,8 +137,8 @@ class InstructionGraphNode implements Value, Opcodes {
return isXStore;
}
@@ -164,7 +132,7 @@ Forwarded: no
if (pred instanceof InstructionGraphNode) {
addPredecessor(((InstructionGraphNode) pred));
}
-@@ -152,7 +153,7 @@
+@@ -152,7 +153,7 @@ class InstructionGraphNode implements Value, Opcodes {
@Override
public String toString() {
@@ -173,9 +141,81 @@ Forwarded: no
}
}
+diff --git a/src/main/org/parboiled/transform/InstructionGroupPreparer.java b/src/main/org/parboiled/transform/InstructionGroupPreparer.java
+index 0dfab29..cc393cc 100644
+--- a/src/main/org/parboiled/transform/InstructionGroupPreparer.java
++++ b/src/main/org/parboiled/transform/InstructionGroupPreparer.java
+@@ -21,7 +21,7 @@ import org.jetbrains.annotations.NotNull;
+ import org.objectweb.asm.Label;
+ import org.objectweb.asm.Opcodes;
+ import org.objectweb.asm.Type;
+-import org.objectweb.asm.commons.EmptyVisitor;
++import org.objectweb.asm.MethodVisitor;
+ import org.objectweb.asm.tree.AbstractInsnNode;
+ import org.objectweb.asm.tree.FieldNode;
+ import org.objectweb.asm.tree.VarInsnNode;
+@@ -116,13 +116,14 @@ class InstructionGroupPreparer implements RuleMethodProcessor, Opcodes {
+ }
+ }
+
+- private static class MD5Digester extends EmptyVisitor {
++ private static class MD5Digester extends MethodVisitor {
+ private static MessageDigest digest;
+ private static ByteBuffer buffer;
+ private final List<Label> labels = new ArrayList<Label>();
+ private final String parserClassName;
+
+ public MD5Digester(String parserClassName) {
++ super(Opcodes.ASM4);
+ this.parserClassName = parserClassName;
+ if (digest == null) {
+ try {
+@@ -251,6 +252,12 @@ class InstructionGroupPreparer implements RuleMethodProcessor, Opcodes {
+ update(type);
+ }
+
++ public void visitField(FieldNode field) {
++ update(field.name);
++ update(field.desc);
++ update(field.signature);
++ }
++
+ private void update(int i) {
+ ensureRemaining(4);
+ buffer.putInt(i);
+@@ -293,4 +300,4 @@ class InstructionGroupPreparer implements RuleMethodProcessor, Opcodes {
+ }
+ }
+
+-}
+\ No newline at end of file
++}
+diff --git a/src/main/org/parboiled/transform/RuleMethod.java b/src/main/org/parboiled/transform/RuleMethod.java
+index e169ba4..7a39856 100644
+--- a/src/main/org/parboiled/transform/RuleMethod.java
++++ b/src/main/org/parboiled/transform/RuleMethod.java
+@@ -33,7 +33,6 @@ import org.objectweb.asm.tree.LabelNode;
+ import org.objectweb.asm.tree.LocalVariableNode;
+ import org.objectweb.asm.tree.MethodNode;
+ import org.objectweb.asm.tree.analysis.BasicValue;
+-import org.objectweb.asm.tree.analysis.Value;
+ import org.parboiled.BaseParser;
+ import org.parboiled.common.StringUtils;
+ import org.parboiled.support.Var;
+@@ -185,7 +184,7 @@ class RuleMethod extends MethodNode implements Opcodes, Types {
+ return name.charAt(0) == '$';
+ }
+
+- public InstructionGraphNode setGraphNode(AbstractInsnNode insn, BasicValue resultValue, List<Value> predecessors) {
++ public InstructionGraphNode setGraphNode(AbstractInsnNode insn, BasicValue resultValue, List<BasicValue> predecessors) {
+ if (graphNodes == null) {
+ // initialize with a list of null values
+ graphNodes = new ArrayList<InstructionGraphNode>(
+diff --git a/src/main/org/parboiled/transform/RuleMethodInterpreter.java b/src/main/org/parboiled/transform/RuleMethodInterpreter.java
+index 689da9c..34937f7 100644
--- a/src/main/org/parboiled/transform/RuleMethodInterpreter.java
+++ b/src/main/org/parboiled/transform/RuleMethodInterpreter.java
-@@ -29,14 +29,13 @@
+@@ -29,14 +29,13 @@ import org.objectweb.asm.tree.AbstractInsnNode;
import org.objectweb.asm.tree.analysis.AnalyzerException;
import org.objectweb.asm.tree.analysis.BasicInterpreter;
import org.objectweb.asm.tree.analysis.BasicValue;
@@ -191,7 +231,7 @@ Forwarded: no
private final RuleMethod method;
private final List<Edge> additionalEdges = new ArrayList<Edge>();
-@@ -46,8 +45,8 @@
+@@ -46,8 +45,8 @@ class RuleMethodInterpreter extends BasicInterpreter implements Types {
}
@Override
@@ -202,7 +242,7 @@ Forwarded: no
if (basicValue == BasicValue.REFERENCE_VALUE) {
basicValue = new BasicValue(type); // record the exact type and not just "Ljava/lang/Object"
}
-@@ -55,27 +54,27 @@
+@@ -55,27 +54,27 @@ class RuleMethodInterpreter extends BasicInterpreter implements Types {
}
@Override
@@ -235,7 +275,7 @@ Forwarded: no
// this method is only called for xASTORE instructions, parameter v1 is the value corresponding to the
// NEWARRAY, ANEWARRAY or MULTIANEWARRAY instruction having created the array, we need to insert a special
// dependency edge from the array creator to this xSTORE instruction
-@@ -85,25 +84,25 @@
+@@ -85,25 +84,25 @@ class RuleMethodInterpreter extends BasicInterpreter implements Types {
@Override
@SuppressWarnings({"unchecked"})
@@ -268,7 +308,7 @@ Forwarded: no
// we don't actually merge values but use the control flow detection to deal with conditionals
return v;
}
-@@ -117,7 +116,7 @@
+@@ -117,7 +116,7 @@ class RuleMethodInterpreter extends BasicInterpreter implements Types {
}
}
@@ -277,7 +317,7 @@ Forwarded: no
String errorMessage = "Internal error during analysis of rule method '" + method.name +
"', please report this error to info at parboiled.org! Thank you!";
Checks.ensure(value instanceof InstructionGraphNode, errorMessage);
-@@ -146,9 +145,9 @@
+@@ -146,9 +145,9 @@ class RuleMethodInterpreter extends BasicInterpreter implements Types {
return method.getGraphNodes().get(method.instructions.indexOf(insn));
}
@@ -290,22 +330,3 @@ Forwarded: no
}
private class Edge {
---- a/src/main/org/parboiled/transform/RuleMethod.java
-+++ b/src/main/org/parboiled/transform/RuleMethod.java
-@@ -33,7 +33,6 @@
- import org.objectweb.asm.tree.LocalVariableNode;
- import org.objectweb.asm.tree.MethodNode;
- import org.objectweb.asm.tree.analysis.BasicValue;
--import org.objectweb.asm.tree.analysis.Value;
- import org.parboiled.BaseParser;
- import org.parboiled.common.StringUtils;
- import org.parboiled.support.Var;
-@@ -185,7 +184,7 @@
- return name.charAt(0) == '$';
- }
-
-- public InstructionGraphNode setGraphNode(AbstractInsnNode insn, BasicValue resultValue, List<Value> predecessors) {
-+ public InstructionGraphNode setGraphNode(AbstractInsnNode insn, BasicValue resultValue, List<BasicValue> predecessors) {
- if (graphNodes == null) {
- // initialize with a list of null values
- graphNodes = new ArrayList<InstructionGraphNode>(
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
build.patch
asm-compatibility.patch
+CaseStatement.patch
=====================================
debian/watch
=====================================
@@ -1,4 +1,4 @@
version=4
opts=dversionmangle=s/(\da?)[\+\.\-~](?:dfsg|debian|ds|repack|repacked)\.?\d*$/$1/ \
https://github.com/rzwitserloot/lombok.ast/tags \
-.*/archive/(?:upstream/)?(?:v||version-|release-|X|R|r)(\d\S*)\.tar\.gz
+.*/v(\d\S*)\.tar\.gz
View it on GitLab: https://salsa.debian.org/java-team/lombok-ast/-/compare/001fbf6a998bb27c94fd23aea7c99f47b665819d...fb8cce414adb147fd8c010d666b69ab5d97ecef6
--
View it on GitLab: https://salsa.debian.org/java-team/lombok-ast/-/compare/001fbf6a998bb27c94fd23aea7c99f47b665819d...fb8cce414adb147fd8c010d666b69ab5d97ecef6
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/20211108/c7009b48/attachment.htm>
More information about the pkg-java-commits
mailing list