[Build-common-hackers] Bug#206408: marked as done (cdbs: Please include Ant class)

Debian Bug Tracking System owner@bugs.debian.org
Fri, 22 Aug 2003 16:33:48 -0500


Your message dated Fri, 22 Aug 2003 17:17:24 -0400
with message-id <E19qJHg-0001fZ-00@auric.debian.org>
and subject line Bug#206408: fixed in cdbs 0.4.5.3
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--------------------------------------
Received: (at submit) by bugs.debian.org; 20 Aug 2003 15:52:21 +0000
>From sgybas@debian.org Wed Aug 20 10:52:08 2003
Return-path: <sgybas@debian.org>
Received: from sebigbos.hepe.com [195.143.191.17] 
	by master.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 19pVFo-0005cq-00; Wed, 20 Aug 2003 10:52:08 -0500
Received: from p508358d4.dip.t-dialin.net ([80.131.88.212] helo=debian.org)
	by sebigbos.hepe.com with asmtp (Exim 3.35 #1 (Debian))
	id 19pVFl-0008Bd-00
	for <submit@bugs.debian.org>; Wed, 20 Aug 2003 17:52:05 +0200
Message-ID: <3F439920.1030303@debian.org>
Date: Wed, 20 Aug 2003 17:52:00 +0200
From: Stefan Gybas <sgybas@debian.org>
User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.2.1) Gecko/20021213
X-Accept-Language: en, de
MIME-Version: 1.0
To: submit@bugs.debian.org
Subject: cdbs: Please include Ant class
Content-Type: multipart/mixed;
 boundary="------------080503090301060001080102"
Delivered-To: submit@bugs.debian.org
X-Spam-Status: No, hits=-12.1 required=4.0
	tests=BAYES_30,HAS_PACKAGE,PATCH_UNIFIED_DIFF,RCVD_IN_NJABL,
	      USER_AGENT_MOZILLA_UA
	autolearn=ham version=2.53-bugs.debian.org_2003_8_17
X-Spam-Level: 
X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_8_17 (1.174.2.15-2003-03-30-exp)

This is a multi-part message in MIME format.
--------------080503090301060001080102
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Transfer-Encoding: 7bit

Package: cdbs
Version: 0.4.5.2
Severity: wishlist
Tags: patch

Please include the attached CDBS class for Ant. Ant is a Java-based 
build system like make and is used by over 30 Debian source packages. I 
plan to migrate some of them to CDBS while they move from contrib to main.

If you want me to maintain this class directly in your CVS repository, 
please add me to your project on Alioth. I promise not to change any 
files that I don't understand. :-)

Stefan

--------------080503090301060001080102
Content-Type: text/plain;
 name="ant-vars.mk.in"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
 filename="ant-vars.mk.in"

# -*- mode: makefile; coding: utf-8 -*-
# Copyright © 2003 Stefan Gybas <sgybas@debian.org>
# Description: Defines useful variables for packages which use Ant
#
# 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.


ifndef _cdbs_bootstrap
@PATH_RULES@
endif

ifndef _cdbs_class_ant_vars
_cdbs_class_ant_vars := 1

# The home directory of the Java Runtime Environment (JRE) or Java Development
# Kit (JDK). You can either directly set JAVA_HOME in debian/rules or set
# JAVA_HOME_DIRS to multilpe possbile home directories. The first existing
# directory from this list is used for JAVA_HOME. You can also override
# JAVACMD in case you don't want to use the default.
JAVA_HOME ?= $(shell for jh in $(JAVA_HOME_DIRS); do if [ -d "$$jh" ]; then \
		echo $${jh}; exit 0; fi; done)
JAVACMD ?= $(JAVA_HOME)/bin/java

# You can list all Java ARchives (JARs) to be added to the class path in
# DEB_JARS, either with their full path or just the basename if the JAR is
# in /usr/share/java. You may also ommit the ".jar" extension. Non-existing
# files will silently be ignored. tools.jar is automatically added to the
# end of the class path if it exists in the JDK's lib directory.
# You can override the complete class path using DEB_CLASSPATH.
DEB_JARS_BASE := /usr/share/java
DEB_CLASSPATH = $(ANT_HOME)/lib/ant.jar:$(shell for jar in $(DEB_JARS); do \
		if [ -f "$$jar" ]; then echo -n "$${jar}:"; fi; \
		if [ -f "$$jar".jar ]; then echo -n "$${jar}.jar:"; fi; \
		if [ -f $(DEB_JARS_BASE)/"$$jar" ]; then echo -n "$(DEB_JARS_BASE)/$${jar}:"; fi; \
		if [ -f $(DEB_JARS_BASE)/"$$jar".jar ]; then echo -n "$(DEB_JARS_BASE)/$${jar}.jar:"; fi; \
		done; \
		if [ -f "$(JAVA_HOME)/lib/tools.jar" ]; then echo -n "$(JAVA_HOME)/lib/tools.jar"; fi)

# Options for Ant: compile.debug, compile.optimize and build.compiler
# depending on DEB_BUILD_OPTION and DEB_ANT_COMPILER
# You can specify additional Ant options in ANT_OPTS or override the default
# options. ANT_OPTS_<package> can also be definied for each package.
DEB_ANT_DEFAULT_OPTIONS = -Dcompile.debug=true
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
	DEB_ANT_DEFAULT_OPTIONS += -Dcompile.optimize=false
else
	DEB_ANT_DEFAULT_OPTIONS += -Dcompile.optimize=true
endif

# Property file for Ant, defaults to debian/ant.properties. You may define
# additional properties that are referenced from build.xml there so you don't
# have to modify upstream's build.xml. Please note that command line options,
# e.g. compile.optimize or build.compiler override the settins in build.xml
# and the property file.
DEB_ANT_PROPERTYFILE := $(CURDIR)/debian/ant.properties

DEB_ANT_INVOKE = cd $(DEB_BUILDDIR) && $(JAVACMD) -classpath $(DEB_CLASSPATH) $(DEB_JVM_ARGS) -Dant.home=$(ANT_HOME) org.apache.tools.ant.Main $(DEB_ANT_DEFAULT_OPTIONS)

# Add package-specific (or general) $ANT_OPTS and build.compiler if specified
DEB_ANT_INVOKE += $(if $(ANT_OPTS_$(cdbs_curpkg)),$(ANT_OPTS_$(cdbs_curpkg)),$(ANT_OPTS))
DEB_ANT_INVOKE += $(if $(DEB_ANT_COMPILER),-Dbuild.compiler=$(DEB_ANT_COMPILER),)

# Add property file if it exists and build file if set
DEB_ANT_INVOKE += $(if $(shell test -f $(DEB_ANT_PROPERTYFILE)),-propertyfile $(DEB_ANT_PROPERTYFILE),)
DEB_ANT_INVOKE += $(if $(DEB_ANT_BUILDFILE),-buildfile $(DEB_ANT_BUILDFILE),)

# Targets to invoke for building, installing, testing and cleaning up.
# Building uses the default target from build.xml, installing and testing is
# only called if the corresponding variable is set. You can also specify
# multiple targets for each step.
DEB_ANT_BUILD_TARGET = 
DEB_ANT_INSTALL_TARGET =
DEB_ANT_TEST_TARGET =
DEB_ANT_CLEAN_TARGET = clean

endif

--------------080503090301060001080102
Content-Type: text/plain;
 name="ant.mk.in"
Content-Transfer-Encoding: 8bit
Content-Disposition: inline;
 filename="ant.mk.in"

# -*- mode: makefile; coding: utf-8 -*-
# Copyright © 2003 Stefan Gybas <sgybas@debian.org>
# Description: Builds and cleans packages which have an Ant build.xml file
#
# 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.


ifndef _cdbs_bootstrap
@PATH_RULES@
endif

ifndef _cdbs_class_ant
_cdbs_class_ant := 1

include $(_cdbs_rules_path)/buildcore.mk$(_cdbs_makefile_suffix)
include $(_cdbs_class_path)/ant-vars.mk$(_cdbs_makefile_suffix)

DEB_PHONY_RULES += ant-sanity-check

ant-sanity-check:
	@if ! test -d "$(JAVA_HOME)"; then \
		echo "You must specify a valid JAVA_HOME directory!"; \
		exit 1; \
	fi
	@if ! test -d "$(ANT_HOME)"; then \
		echo "You must specify a valid ANT_HOME directory!"; \
		exit 1; \
	fi


common-build-arch common-build-indep:: debian/stamp-ant-build ant-sanity-check
debian/stamp-ant-build:
	$(DEB_ANT_INVOKE) $(DEB_ANT_BUILD_TARGET)
	touch debian/stamp-ant-build

clean:: ant-sanity-check
	$(DEB_ANT_INVOKE) $(DEB_ANT_CLEAN_TARGET) || true
	rm -f debian/stamp-ant-build

common-install-arch common-install-indep:: common-install-impl
common-install-impl::
	@if test -n "$(DEB_ANT_INSTALL_TARGET)"; then \
	  echo $(DEB_ANT_INVOKE) $(DEB_ANT_INSTALL_TARGET); \
	  $(DEB_ANT_INVOKE) $(DEB_ANT_INSTALL_TARGET); \
	 else \
	   echo "DEB_ANT_INSTALL_TARGET unset, skipping default ant.mk common-install target"; \
	 fi

ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
common-post-build-arch common-post-build-indep:: common-post-build-impl
common-post-build-impl::
	@if test -n "$(DEB_ANT_CHECK_TARGET)"; then \
	  echo $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET); \
	  $(DEB_ANT_INVOKE) $(DEB_ANT_CHECK_TARGET); \
	else \
	   echo "DEB_ANT_CHECK_TARGET unset, not running checks"; \
	fi
endif

endif

--------------080503090301060001080102
Content-Type: text/plain;
 name="cdbs-makefile.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="cdbs-makefile.diff"

Index: Makefile.am
===================================================================
RCS file: /cvsroot/build-common/cdbs/Makefile.am,v
retrieving revision 1.23
diff -u -r1.23 Makefile.am
--- Makefile.am	6 Jul 2003 00:02:56 -0000	1.23
+++ Makefile.am	20 Aug 2003 15:43:08 -0000
@@ -36,6 +36,8 @@
 		1/rules/simple-patchsys.mk	\
 		1/rules/utils.mk		\
 		1/rules/tarball.mk		\
+		1/class/ant-vars.mk		\
+		1/class/ant.mk			\
 		1/class/autotools-vars.mk	\
 		1/class/autotools-files.mk	\
 		1/class/autotools.mk		\

--------------080503090301060001080102--


---------------------------------------
Received: (at 206408-close) by bugs.debian.org; 22 Aug 2003 21:23:19 +0000
>From katie@auric.debian.org Fri Aug 22 16:23:19 2003
Return-path: <katie@auric.debian.org>
Received: from auric.debian.org [206.246.226.45] 
	by master.debian.org with esmtp (Exim 3.35 1 (Debian))
	id 19qJNP-0003eR-00; Fri, 22 Aug 2003 16:23:19 -0500
Received: from katie by auric.debian.org with local (Exim 3.35 1 (Debian))
	id 19qJHg-0001fZ-00; Fri, 22 Aug 2003 17:17:24 -0400
From: Jeff Bailey <jbailey@nisa.net>
To: 206408-close@bugs.debian.org
X-Katie: $Revision: 1.35 $
Subject: Bug#206408: fixed in cdbs 0.4.5.3
Message-Id: <E19qJHg-0001fZ-00@auric.debian.org>
Sender: Archive Administrator <katie@auric.debian.org>
Date: Fri, 22 Aug 2003 17:17:24 -0400
Delivered-To: 206408-close@bugs.debian.org

We believe that the bug you reported is fixed in the latest version of
cdbs, which is due to be installed in the Debian FTP archive:

cdbs_0.4.5.3.dsc
  to pool/main/c/cdbs/cdbs_0.4.5.3.dsc
cdbs_0.4.5.3.tar.gz
  to pool/main/c/cdbs/cdbs_0.4.5.3.tar.gz
cdbs_0.4.5.3_all.deb
  to pool/main/c/cdbs/cdbs_0.4.5.3_all.deb



A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 206408@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Jeff Bailey <jbailey@nisa.net> (supplier of updated cdbs package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Format: 1.7
Date: Tue, 19 Aug 2003 01:03:46 -0400
Source: cdbs
Binary: cdbs
Architecture: source all
Version: 0.4.5.3
Distribution: unstable
Urgency: low
Maintainer: CDBS Hackers <build-common-hackers@lists.alioth.debian.org>
Changed-By: Jeff Bailey <jbailey@nisa.net>
Description: 
 cdbs       - common build system for Debian packages
Closes: 206408
Changes: 
 cdbs (0.4.5.3) unstable; urgency=low
 .
   * Jeff Bailey <jbailey@nisa.net>:
     - Make debhelper.mk.in defaults respect $(DEB_SRCDIR) for looking for
       AUTHORS, README, ChangeLog, and other such files.
     - debhelper.mk now installs THANKS if found.
   * Stefan Gybas <sgybas@debian.org>:
     - Added Ant class for Java packages (Closes: #206408)
     - Fixed prerequisites of common-install-arch and common-install-indep in
       buildcore.mk
   * Colin Walters <walters@debian.org>:
     - Add Stefan Gybas to AUTHORS.
     - Fix udeb creation rules.
Files: 
 7c965a7ed70111fd015b333e2f8975d7 785 devel optional cdbs_0.4.5.3.dsc
 595981dcee0a73c4be5d7618d47088a3 219246 devel optional cdbs_0.4.5.3.tar.gz
 2277a4fae03cbd431023f48187405952 46446 devel optional cdbs_0.4.5.3_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.2 (GNU/Linux)

iD8DBQE/RoQJ5M5hmdCYCpkRAj3ZAJwIFXvmQGT1vXWpVePhrJc9PTyVJwCguXYA
IWPObWCO+hcHI5Y+/Yit7JY=
=DwZe
-----END PGP SIGNATURE-----