[Git][java-team/dynalang][master] 6 commits: Setting the test classpath in the build.xml file
Pierre Gruet (@pgt)
gitlab at salsa.debian.org
Wed Jan 22 19:18:15 GMT 2025
Pierre Gruet pushed to branch master at Debian Java Maintainers / dynalang
Commits:
9d734951 by Pierre Gruet at 2025-01-21T22:51:00+01:00
Setting the test classpath in the build.xml file
- - - - -
d9c1434e by Pierre Gruet at 2025-01-21T22:51:27+01:00
Raising the source/target versions to numbers that are supported in Debian builds
- - - - -
1be0e3c7 by Pierre Gruet at 2025-01-21T22:54:56+01:00
B-D on the headless JDK is enough
- - - - -
e04de9a1 by Pierre Gruet at 2025-01-21T23:11:20+01:00
Removing now useless d/README.source file
- - - - -
7909b62b by Pierre Gruet at 2025-01-22T17:46:32+01:00
Simplifying debian/rules for the ant build
- - - - -
f3f342f5 by Pierre Gruet at 2025-01-22T17:48:18+01:00
Upload to unstable
- - - - -
7 changed files:
- − debian/README.source
- debian/changelog
- debian/control
- + debian/patches/java_version.patch
- debian/patches/series
- + debian/patches/set_test_classpath.patch
- debian/rules
Changes:
=====================================
debian/README.source deleted
=====================================
@@ -1,8 +0,0 @@
-dynalang
-========
-
-Use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
- -- Torsten Werner <twerner at debian.org> Mon, 02 Aug 2010 05:26:46 +0200
=====================================
debian/changelog
=====================================
@@ -1,3 +1,15 @@
+dynalang (0.4-5) unstable; urgency=medium
+
+ * Team upload
+ * Simplifying debian/rules for the ant build, and setting the test classpath
+ in the build.xml file
+ * Raising the source/target versions to values that are supported in Debian
+ builds
+ * Build-Depending on the headless JDK only
+ * Removing now useless d/README.source file
+
+ -- Pierre Gruet <pgt at debian.org> Wed, 22 Jan 2025 17:46:37 +0100
+
dynalang (0.4-4) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -6,7 +6,7 @@ Priority: optional
Build-Depends: debhelper-compat (= 13),
javahelper
Build-Depends-Indep: ant-optional,
- default-jdk,
+ default-jdk-headless,
junit
Standards-Version: 4.7.0
Vcs-Browser: https://salsa.debian.org/java-team/dynalang
=====================================
debian/patches/java_version.patch
=====================================
@@ -0,0 +1,26 @@
+Description: raising source/target versions to numbers that are supported by
+ Debian builds
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2025-01-21
+
+--- a/mop/build.xml
++++ b/mop/build.xml
+@@ -40,7 +40,7 @@
+ <property name="classes.dir" location="${build.dir}/classes"/>
+ <mkdir dir="${classes.dir}"/>
+ <javac srcdir="src" destdir="${classes.dir}" deprecation="off"
+- debug="on" optimize="off" target="1.5" source="1.5"
++ debug="on" optimize="off" target="1.8" source="1.8"
+ classpathref="compile.classpath"/>
+ <copy toDir="${classes.dir}">
+ <fileset dir="src"
+@@ -123,7 +123,7 @@
+ <property name="test.classes.dir" location="${build.dir}/test/classes"/>
+ <mkdir dir="${test.classes.dir}"/>
+ <javac srcdir="testsrc" destdir="${test.classes.dir}" deprecation="off"
+- debug="on" optimize="off" target="1.5" source="1.5">
++ debug="on" optimize="off" target="1.8" source="1.8">
+ <classpath>
+ <pathelement path="${classes.dir}" />
+ <pathelement path="/usr/share/java/junit.jar" />
=====================================
debian/patches/series
=====================================
@@ -2,3 +2,5 @@
0002-fix-build-failure.patch
0003-java8-compatibility.patch
0004-disable-emma.patch
+set_test_classpath.patch
+java_version.patch
=====================================
debian/patches/set_test_classpath.patch
=====================================
@@ -0,0 +1,26 @@
+Description: handling the classpath of the Debian build by altering the
+ build.xml file
+Author: Pierre Gruet <pgt at debian.org>
+Forwarded: not-needed
+Last-Update: 2025-01-21
+
+--- a/mop/build.xml
++++ b/mop/build.xml
+@@ -126,7 +126,7 @@
+ debug="on" optimize="off" target="1.5" source="1.5">
+ <classpath>
+ <pathelement path="${classes.dir}" />
+- <pathelement path="build/lib/test/junit.jar" />
++ <pathelement path="/usr/share/java/junit.jar" />
+ </classpath>
+ </javac>
+ <copy toDir="${test.classes.dir}">
+@@ -143,7 +143,7 @@
+ <pathelement path="${coverage.classes.dir}" />
+ <pathelement path="${test.classes.dir}" />
+ <pathelement path="build/lib/test/emma.jar"/>
+- <pathelement path="build/lib/test/junit.jar"/>
++ <pathelement path="/usr/share/java/junit.jar"/>
+ </classpath>
+ <batchtest todir="build/test">
+ <fileset dir="${test.classes.dir}" includes="**/Test*.class"/>
=====================================
debian/rules
=====================================
@@ -1,19 +1,10 @@
#!/usr/bin/make -f
-export JAVA_HOME := /usr/lib/jvm/default-java
-
-include /usr/share/javahelper/java-vars.mk
-DEB_JARS := ant-junit junit ant-trax
-
-CLASSPATH = /usr/share/ant/lib/ant.jar:/usr/share/ant/lib/ant-launcher.jar:$(shell for jar in $(DEB_JARS:%=/usr/share/java/%.jar); do \
- echo -n $${jar}:; done; \
- echo -n $(JAVA_HOME)/lib/tools.jar)
-
%:
dh $@ --sourcedir=mop --buildsystem=ant --with javahelper
override_dh_auto_build:
- cd mop && /usr/lib/jvm/default-java/bin/java -classpath $(CLASSPATH) -Dant.home=/usr/share/ant org.apache.tools.ant.Main -Dcompile.debug=true -Dcompile.optimize=true -propertyfile $(CURDIR)/debian/ant.properties jar test doc
+ cd mop && ant -Dcompile.debug=true -Dcompile.optimize=true -propertyfile $(CURDIR)/debian/ant.properties jar test doc
override_dh_missing:
dh_missing --list-missing
View it on GitLab: https://salsa.debian.org/java-team/dynalang/-/compare/dabd59a330a13e737012706bd8e44cc16bd60038...f3f342f522e3e84c715c74d76ee6c82626966c8d
--
View it on GitLab: https://salsa.debian.org/java-team/dynalang/-/compare/dabd59a330a13e737012706bd8e44cc16bd60038...f3f342f522e3e84c715c74d76ee6c82626966c8d
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/20250122/d68193a9/attachment.htm>
More information about the pkg-java-commits
mailing list