[Git][java-team/jitescript][master] 3 commits: Imported Upstream version 0.4.3
Miguel Landaeta (@nomadium)
gitlab at salsa.debian.org
Tue Nov 28 21:46:36 GMT 2023
Miguel Landaeta pushed to branch master at Debian Java Maintainers / jitescript
Commits:
e409d28b by Miguel Landaeta at 2023-11-25T13:53:52+00:00
Imported Upstream version 0.4.3
- - - - -
0e96fcbf by Miguel Landaeta at 2023-11-28T21:17:35+00:00
Merge tag 'upstream/0.4.3'
Upstream version 0.4.3
- - - - -
4451ae56 by Miguel Landaeta at 2023-11-28T21:23:53+00:00
Upload 0.4.3-1 to unstable
- - - - -
14 changed files:
- .travis.yml
- debian/changelog
- − debian/compat
- debian/control
- debian/copyright
- − debian/patches/01-asm-compatibility.patch
- − debian/patches/series
- debian/rules
- debian/watch
- pom.xml
- src/main/java/me/qmx/jitescript/FieldDefinition.java
- src/main/java/me/qmx/jitescript/MethodDefinition.java
- src/main/java/me/qmx/jitescript/VisibleAnnotation.java
- src/main/java/me/qmx/jitescript/util/CodegenUtils.java
Changes:
=====================================
.travis.yml
=====================================
@@ -1 +1,7 @@
language: java
+matrix:
+ include:
+ - arch: amd64
+ - arch: ppc64le
+ addons: [ apt: [ packages: maven ]]
+
=====================================
debian/changelog
=====================================
@@ -1,3 +1,18 @@
+jitescript (0.4.3-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Update Vcs-* URL fields.
+ * Bump DH compat level to 13.
+ * Bump Standards-Version to 4.6.2.
+ * Add Rules-Require-Root field with 'no' as value.
+ * Update copyright dates.
+ * Bump watch file version to 4 and fix tags URLs.
+ * Apply Multi-Arch hints.
+ * Drop unneeded get-orig-source target in d/rules.
+ * Drop unneeded patch 01-asm-compatibility.patch.
+
+ -- Miguel Landaeta <nomadium at debian.org> Sat, 25 Nov 2023 13:58:55 +0000
+
jitescript (0.4.1-3) unstable; urgency=medium
* Team upload.
=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10
=====================================
debian/control
=====================================
@@ -3,21 +3,22 @@ Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Miguel Landaeta <nomadium at debian.org>
-Build-Depends: debhelper (>= 10~),
+Build-Depends: debhelper-compat (= 13),
default-jdk,
junit4,
libasm-java,
libfest-assert-java,
maven-debian-helper
-Standards-Version: 4.1.2
+Standards-Version: 4.6.2
Homepage: https://github.com/qmx/jitescript
-Vcs-Git: https://anonscm.debian.org/git/pkg-java/jitescript.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/jitescript.git
+Vcs-Git: https://salsa.debian.org/java-team/jitescript.git
+Vcs-Browser: https://salsa.debian.org/java-team/jitescript
+Rules-Requires-Root: no
Package: libjitescript-java
Architecture: all
-Depends: ${misc:Depends}
Multi-Arch: foreign
+Depends: ${misc:Depends}
Description: Java API for generating JVM bytecode
jitescript provides a nice domain specific language around the
popular ASM Java library for bytecode generation purposes. It's
=====================================
debian/copyright
=====================================
@@ -8,7 +8,7 @@ Copyright: 2011-2016 Douglas Campos <qmx at qmx.me>
License: Apache-2.0
Files: debian/*
-Copyright: 2017 Miguel Landaeta <nomadium at debian.org>
+Copyright: 2017-2023 Miguel Landaeta <nomadium at debian.org>
License: Apache-2.0
Comment: the Debian packaging is licensed under the same terms as the original package.
=====================================
debian/patches/01-asm-compatibility.patch deleted
=====================================
@@ -1,26 +0,0 @@
-Description: Fixes the build failure with the version of ASM in Debian
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/884044
---- a/src/main/java/me/qmx/jitescript/FieldDefinition.java
-+++ b/src/main/java/me/qmx/jitescript/FieldDefinition.java
-@@ -22,7 +22,7 @@
-
- public FieldNode getFieldNode() {
- FieldNode node = new FieldNode(modifiers, fieldName, signature, null, value);
-- node.visibleAnnotations = new ArrayList<VisibleAnnotation>();
-+ node.visibleAnnotations = new ArrayList();
- for (VisibleAnnotation annotation : annotations) {
- node.visibleAnnotations.add(annotation.getNode());
- }
---- a/src/main/java/me/qmx/jitescript/MethodDefinition.java
-+++ b/src/main/java/me/qmx/jitescript/MethodDefinition.java
-@@ -55,7 +55,7 @@
-
- public MethodNode getMethodNode() {
- MethodNode method = new MethodNode(getModifiers(), getMethodName(), getSignature(), null, null);
-- method.visibleAnnotations = new ArrayList<VisibleAnnotation>();
-+ method.visibleAnnotations = new ArrayList();
- method.instructions.add(getMethodBody().getInstructionList());
- for (TryCatchBlockNode tryCatchBlockNode : getMethodBody().getTryCatchBlockList()) {
- method.tryCatchBlocks.add(tryCatchBlockNode);
=====================================
debian/patches/series deleted
=====================================
@@ -1 +0,0 @@
-01-asm-compatibility.patch
=====================================
debian/rules
=====================================
@@ -1,6 +1,3 @@
#!/usr/bin/make -f
%:
dh $@ --buildsystem=maven
-
-get-orig-source:
- uscan --verbose --download-current-version
=====================================
debian/watch
=====================================
@@ -1,3 +1,3 @@
-version=3
-https://github.com/qmx/jitescript/releases \
- /qmx/jitescript/archive/v([0-9].+)\.tar\.gz
+version=4
+https://github.com/qmx/jitescript/tags \
+ /qmx/jitescript/archive/refs/tags/jitescript- at ANY_VERSION@@ARCHIVE_EXT@
=====================================
pom.xml
=====================================
@@ -3,7 +3,7 @@
<groupId>me.qmx.jitescript</groupId>
<artifactId>jitescript</artifactId>
- <version>0.4.1</version>
+ <version>0.4.3</version>
<packaging>jar</packaging>
<name>jitescript</name>
@@ -32,7 +32,7 @@
<connection>scm:git:git at github.com:qmx/jitescript.git</connection>
<developerConnection>scm:git:git at github.com:qmx/jitescript.git</developerConnection>
<url>git at github.com:qmx/jitescript.git</url>
- <tag>v0.4.1</tag>
+ <tag>jitescript-0.4.3</tag>
</scm>
<developers>
@@ -57,7 +57,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>4.8.2</version>
+ <version>4.13.1</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -81,11 +81,23 @@
<artifactId>maven-compiler-plugin</artifactId>
<version>2.3.2</version>
<configuration>
- <source>1.6</source>
- <target>1.6</target>
+ <source>7</source>
+ <target>7</target>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <version>3.2.0</version>
+ <configuration>
+ <archive>
+ <manifestEntries>
+ <Automatic-Module-Name>me.qmx.jitescript</Automatic-Module-Name>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
=====================================
src/main/java/me/qmx/jitescript/FieldDefinition.java
=====================================
@@ -2,6 +2,7 @@ package me.qmx.jitescript;
import java.util.ArrayList;
import java.util.List;
+import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.FieldNode;
public class FieldDefinition {
@@ -22,7 +23,7 @@ public class FieldDefinition {
public FieldNode getFieldNode() {
FieldNode node = new FieldNode(modifiers, fieldName, signature, null, value);
- node.visibleAnnotations = new ArrayList<VisibleAnnotation>();
+ node.visibleAnnotations = new ArrayList<AnnotationNode>();
for (VisibleAnnotation annotation : annotations) {
node.visibleAnnotations.add(annotation.getNode());
}
=====================================
src/main/java/me/qmx/jitescript/MethodDefinition.java
=====================================
@@ -16,6 +16,7 @@
package me.qmx.jitescript;
import java.util.ArrayList;
+import org.objectweb.asm.tree.AnnotationNode;
import org.objectweb.asm.tree.LocalVariableNode;
import org.objectweb.asm.tree.MethodNode;
import org.objectweb.asm.tree.TryCatchBlockNode;
@@ -55,7 +56,7 @@ public class MethodDefinition {
public MethodNode getMethodNode() {
MethodNode method = new MethodNode(getModifiers(), getMethodName(), getSignature(), null, null);
- method.visibleAnnotations = new ArrayList<VisibleAnnotation>();
+ method.visibleAnnotations = new ArrayList<AnnotationNode>();
method.instructions.add(getMethodBody().getInstructionList());
for (TryCatchBlockNode tryCatchBlockNode : getMethodBody().getTryCatchBlockList()) {
method.tryCatchBlocks.add(tryCatchBlockNode);
=====================================
src/main/java/me/qmx/jitescript/VisibleAnnotation.java
=====================================
@@ -30,7 +30,7 @@ public class VisibleAnnotation {
return this;
}
- public VisibleAnnotation enumValue(String name, Enum value) {
+ public VisibleAnnotation enumValue(String name, Enum<?> value) {
enumValue(name, ci(value.getClass()), value.name());
return this;
}
=====================================
src/main/java/me/qmx/jitescript/util/CodegenUtils.java
=====================================
@@ -39,14 +39,14 @@ public final class CodegenUtils {
/**
* Creates a class path name, from a Class.
*/
- public static String p(Class n) {
+ public static String p(Class<?> n) {
return n.getName().replace('.', '/');
}
/**
* Creates a class identifier of form Labc/abc;, from a Class.
*/
- public static String ci(Class n) {
+ public static String ci(Class<?> n) {
if (n.isArray()) {
n = n.getComponentType();
if (n.isPrimitive()) {
@@ -104,28 +104,28 @@ public final class CodegenUtils {
/**
* Creates a human-readable representation, from a Class.
*/
- public static String human(Class n) {
+ public static String human(Class<?> n) {
return n.getCanonicalName();
}
/**
* Create a method signature from the given param types and return values
*/
- public static String sig(Class retval, Class... params) {
+ public static String sig(Class<?> retval, Class<?>... params) {
return sigParams(params) + ci(retval);
}
- public static String sig(Class[] retvalParams) {
- Class[] justParams = new Class[retvalParams.length - 1];
+ public static String sig(Class<?>[] retvalParams) {
+ Class<?>[] justParams = new Class<?>[retvalParams.length - 1];
System.arraycopy(retvalParams, 1, justParams, 0, justParams.length);
return sigParams(justParams) + ci(retvalParams[0]);
}
- public static String sig(Class retval, String descriptor, Class... params) {
+ public static String sig(Class<?> retval, String descriptor, Class<?>... params) {
return sigParams(descriptor, params) + ci(retval);
}
- public static String sigParams(Class... params) {
+ public static String sigParams(Class<?>... params) {
StringBuilder signature = new StringBuilder("(");
for (int i = 0; i < params.length; i++) {
@@ -137,7 +137,7 @@ public final class CodegenUtils {
return signature.toString();
}
- public static String sigParams(String descriptor, Class... params) {
+ public static String sigParams(String descriptor, Class<?>... params) {
StringBuilder signature = new StringBuilder("(");
signature.append(descriptor);
@@ -151,11 +151,11 @@ public final class CodegenUtils {
return signature.toString();
}
- public static String pretty(Class retval, Class... params) {
+ public static String pretty(Class<?> retval, Class<?>... params) {
return prettyParams(params) + human(retval);
}
- public static String prettyParams(Class... params) {
+ public static String prettyParams(Class<?>... params) {
StringBuilder signature = new StringBuilder("(");
for (int i = 0; i < params.length; i++) {
@@ -170,25 +170,25 @@ public final class CodegenUtils {
return signature.toString();
}
- public static Class[] params(Class... classes) {
+ public static Class<?>[] params(Class<?>... classes) {
return classes;
}
- public static Class[] params(Class cls, int times) {
- Class[] classes = new Class[times];
+ public static Class<?>[] params(Class<?> cls, int times) {
+ Class<?>[] classes = new Class<?>[times];
Arrays.fill(classes, cls);
return classes;
}
- public static Class[] params(Class cls1, Class clsFill, int times) {
- Class[] classes = new Class[times + 1];
+ public static Class<?>[] params(Class<?> cls1, Class<?> clsFill, int times) {
+ Class<?>[] classes = new Class<?>[times + 1];
Arrays.fill(classes, clsFill);
classes[0] = cls1;
return classes;
}
- public static Class[] params(Class cls1, Class cls2, Class clsFill, int times) {
- Class[] classes = new Class[times + 2];
+ public static Class<?>[] params(Class<?> cls1, Class<?> cls2, Class<?> clsFill, int times) {
+ Class<?>[] classes = new Class<?>[times + 2];
Arrays.fill(classes, clsFill);
classes[0] = cls1;
classes[1] = cls2;
@@ -226,7 +226,7 @@ public final class CodegenUtils {
}
}
- public static Class getBoxType(Class type) {
+ public static Class<?> getBoxType(Class<?> type) {
if (type == int.class) {
return Integer.class;
} else if (type == byte.class) {
@@ -247,4 +247,4 @@ public final class CodegenUtils {
throw new RuntimeException("Not a native type: " + type);
}
}
-}
\ No newline at end of file
+}
View it on GitLab: https://salsa.debian.org/java-team/jitescript/-/compare/e3642e7ffb3842cfee9e089384f2d1908f9ca5f1...4451ae56719e3b6b58dcdcf7387fc600629f931d
--
View it on GitLab: https://salsa.debian.org/java-team/jitescript/-/compare/e3642e7ffb3842cfee9e089384f2d1908f9ca5f1...4451ae56719e3b6b58dcdcf7387fc600629f931d
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/20231128/0bec9434/attachment.htm>
More information about the pkg-java-commits
mailing list