[Git][java-team/javatools][master] drop unused CDBS plugin that depends on removed ant.mk
Alexandre Detiste (@detiste-guest)
gitlab at salsa.debian.org
Thu Sep 4 12:42:18 BST 2025
Alexandre Detiste pushed to branch master at Debian Java Maintainers / javatools
Commits:
746b9942 by Alexandre Detiste at 2025-09-04T13:39:16+02:00
drop unused CDBS plugin that depends on removed ant.mk
- - - - -
5 changed files:
- debian/changelog
- debian/control
- debian/javahelper.install
- − javahelper.mk
- tutorial.txt
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+javatools (0.81) unstable; urgency=medium
+
+ * Team upload.
+ * Drop unused CDBS integration: ant.mk has been removed from CDBS.
+
+ -- Alexandre Detiste <tchet at debian.org> Thu, 04 Sep 2025 13:04:07 +0200
+
javatools (0.80) unstable; urgency=medium
[ Bastian Germann ]
=====================================
debian/control
=====================================
@@ -86,8 +86,8 @@ Description: Helper scripts for packaging Java programs
/usr/share/javahelper/java-arch.sh converts Debian architecture
names into java names to locate libjvm.so in non-make build systems
.
- javahelper provides CDBS and dh macros so that it can be used with those
- package build systems.
+ javahelper provides dh macros so that it can be used with this
+ package build system.
.
Note that some of the eclipse helpers depends on packages not pulled
by default (like with devscripts). You can find these scripts in
=====================================
debian/javahelper.install
=====================================
@@ -2,7 +2,6 @@
eclipse_helper.pm /usr/share/perl5/Debian/Debhelper/Sequence
java-arch.sh /usr/share/javahelper
java-vars.mk /usr/share/javahelper
-javahelper.mk /usr/share/cdbs/1/class
javahelper.pm /usr/share/perl5/Debian/Debhelper/Sequence
jh_build /usr/bin
jh_classpath /usr/bin
=====================================
javahelper.mk deleted
=====================================
@@ -1,53 +0,0 @@
-# Copyright © 2009 Matthew Johnson <mjj29 at debian.org>
-# Description: A class to build java packages
-#
-# This program 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.
-#
-# This program 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 this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-# 02111-1307 USA.
-
-_cdbs_scripts_path ?= /usr/lib/cdbs
-_cdbs_rules_path ?= /usr/share/cdbs/1/rules
-_cdbs_class_path ?= /usr/share/cdbs/1/class
-
-ifndef _cdbs_class_javahelper
-_cdbs_class_javahelper = 1
-
-ifdef _cdbs_class_ant
-$(error Must include javahelper.mk before ant.mk in your rules file)
-endif
-
-JH_BUILD=jh_build
-
-include $(_cdbs_rules_path)/debhelper.mk$(_cdbs_makefile_suffix)
-
-common-build-indep common-build-arch:: debian/jh_build_stamp
-debian/jh_build_stamp:
- jh_linkjars
- $(JH_BUILD) -J $(JH_BUILD_ARGS) $(JH_BUILD_JAR) $(JH_BUILD_SRC)
- touch $@
-clean::
- jh_clean
- rm -f debian/jh_build_stamp
- if [ -n "$(JH_BUILD_JAR)" ]; then rm -f $(JH_BUILD_JAR); fi
-
-$(patsubst %,install/%,$(DEB_ALL_PACKAGES)) :: install/%:
- jh_installjavadoc -p$(cdbs_curpkg) $(JH_INSTALLJAVADOC_ARGS)
-$(patsubst %,binary-post-install/%,$(DEB_ALL_PACKAGES)) :: binary-post-install/%:
- jh_installlibs -p$(cdbs_curpkg) $(JH_INSTALLLIBS_ARGS)
- jh_classpath -p$(cdbs_curpkg) $(JH_CLASSPATH_ARGS)
- jh_manifest -p$(cdbs_curpkg) $(JH_MANIFEST_ARGS)
- jh_exec -p$(cdbs_curpkg) $(JH_EXEC_ARGS)
- jh_depends -p$(cdbs_curpkg) $(JH_DEPENDS_ARGS)
-
-endif # _cdbs_class_javahelper
=====================================
tutorial.txt
=====================================
@@ -130,9 +130,9 @@ indented below each one a list of manifest elements to set:
Main-Class: com.jcraft.weirdx.WeirdX
Debian-Java-Home: /usr/lib/jvm/default-java
-Note: Prior to javahelper 0.32 (0.33 if you used cdbs), `jh_manifest` would
-be run before `jh_installlibs`. In these versions the jars were usually
-referred to by their location in the build directories rather than their
+Note: Prior to javahelper 0.32, `jh_manifest` would be run before
+`jh_installlibs`. In these versions the jars were usually referred
+to by their location in the build directories rather than their
install location.
jh_classpath
@@ -150,10 +150,9 @@ specifying the jar followed by it's space-separated classpath:
usr/share/java/bar.jar /usr/share/java/quux.jar
usr/share/java/foo.jar /usr/share/java/bar.jar /usr/share/java/baz.jar
-Note: Prior to javahelper 0.32 (0.33 if you used cdbs), `jh_classpath` would
-be run before `jh_installlibs`. In these versions the jars were usually
-referred to by their location in the build directories rather than their
-install location.
+Note: Prior to javahelper 0.32, `jh_classpath` would be run before
+`jh_installlibs`. In these versions the jars were usually referred to by
+their location in the build directories rather than their install location.
jh_exec
-------
@@ -575,34 +574,6 @@ debian/salliere.links
usr/share/salliere/salliere.jar usr/bin/salliere.jar
-Using javahelper with CDBS
---------------------------
-
-Javahelper 0.18 introduces a CDBS class for javahelper. It runs all
-the `jh_` commands after `dh_install*` and `dh_link` and has options
-for running `jh_build` under the build target.
-
-The `jh_` commands are invoked once per package. You can pass options to
-all the invocations using the `JH_EXEC_ARGS`, `JH_INSTALLLIBS_ARGS`,
-`JH_MANIFEST_ARGS` and `JH_DEPENDS_ARGS` variables.
-
-To invoke `jh_build` you must either set `JH_BUILD_JAR` and
-`JH_BUILD_SOURCE` and `JAVA_HOME` or have a debian/javabuild file and
-set `JAVA_HOME`. Optionally you can also set `CLASSPATH` and
-`JH_BUILD_ARGS`.
-
-Please note: you _MUST_ include javahelper.mk before ant.mk.
-
-The above debian/rules can be rewritten with CDBS as follows:
-
- #!/usr/bin/make -f
- export JAVA_HOME=/usr/lib/jvm/default-java
- export CLASSPATH=/usr/share/java/csv.jar:/usr/share/java/debug-disable.jar:/usr/share/java/itext.jar
- JH_BUILD_JAR=salliere.jar
- JH_BUILD_SRC=src
-
- include /usr/share/cdbs/1/class/javahelper.mk
-
Using javahelper with dh
------------------------
View it on GitLab: https://salsa.debian.org/java-team/javatools/-/commit/746b99425156fccb08cb67a4d831b354a3006aa9
--
View it on GitLab: https://salsa.debian.org/java-team/javatools/-/commit/746b99425156fccb08cb67a4d831b354a3006aa9
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/20250904/1a87770f/attachment.htm>
More information about the pkg-java-commits
mailing list