[SCM] UNNAMED PROJECT branch, jh-symbols, updated. 0.36-2-ge85be8e

[Niels Thykier]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".

The branch, jh-symbols has been updated
       via  e85be8e8d68a6fb28d4210cc893c65e815e4c830 (commit)
      from  e0ca16cc77b6b3db2c9443660ecae7e824e42a75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e85be8e8d68a6fb28d4210cc893c65e815e4c830
Author: Niels Thykier <niels at thykier.net>
Date:   Fri Jul 1 23:43:49 2011 +0200

    Added build support to the code for symbols handling

-----------------------------------------------------------------------

Summary of changes:
 debian/control             |    4 ++--
 debian/javahelper.install  |    1 +
 debian/javahelper.manifest |    3 +++
 debian/rules               |    9 +++++++++
 jh_build                   |    3 ++-
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index ef81788..c6f139e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Matthew Johnson <mjj29 at debian.org>, Niels Thykier <niels at thykier.net>
 Build-Depends: debhelper (>= 7.0.50~)
-Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.20), markdown, perl
+Build-Depends-Indep: default-jdk, libarchive-zip-perl (>= 1.20), libbcel-java, markdown, perl
 Standards-Version: 3.9.2
 Section: java
 Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git
@@ -24,7 +24,7 @@ Package: javahelper
 Architecture: all
 Depends: ${misc:Depends}, debhelper, devscripts,
          bsdmainutils, dpkg-dev, dctrl-tools,
-         libarchive-zip-perl (>= 1.20)
+         libarchive-zip-perl (>= 1.20), libbcel-java
 Suggests: cvs,
           gawk,
           tofrodos,
diff --git a/debian/javahelper.install b/debian/javahelper.install
index 3ac2d20..6ea6e3c 100644
--- a/debian/javahelper.install
+++ b/debian/javahelper.install
@@ -17,6 +17,7 @@ jh_compilefeatures /usr/bin
 jh_lib.sh /usr/share/javahelper
 # Internal helper command - not ready for /usr/bin
 jh_scanjavadoc /usr/share/javahelper
+tmp/jh-symbols.jar /usr/share/javahelper
 java-vars.mk /usr/share/javahelper
 java-arch.sh /usr/share/javahelper
 javahelper.mk /usr/share/cdbs/1/class
diff --git a/debian/javahelper.manifest b/debian/javahelper.manifest
new file mode 100644
index 0000000..4cf0baa
--- /dev/null
+++ b/debian/javahelper.manifest
@@ -0,0 +1,3 @@
+usr/share/javahelper/jh-symbols.jar:
+ Class-Path: /usr/share/java/bcel.jar
+ Main-Class: org.debian.javahelper.symbols.Main
diff --git a/debian/rules b/debian/rules
index 74a6c82..676f04d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,9 @@ POD2MAN=pod2man --stderr --utf8 -c Javahelper -r "$(VERSION)"
 
 MOD_PATH:=lib/Debian/Javahelper
 
+export JAVAHELPER_DIR:=$(CURDIR)
+export CLASSPATH:=/usr/share/java/bcel.jar
+
 %:
 	dh $@
 
@@ -14,6 +17,7 @@ jh_lib.sh: jh_lib.sh.in
 
 override_dh_auto_build: jh_lib.sh
 	mkdir tmp tmp.jarwrapper
+	./jh_build --no-javadoc tmp/jh-symbols.jar src/
 	# javahelper pod-based manpages
 	$(POD2MAN) jh_installeclipse tmp/jh_installeclipse.1
 	$(POD2MAN) jh_generateorbitdir tmp/jh_generateorbitdir.1
@@ -35,8 +39,13 @@ override_dh_auto_build: jh_lib.sh
 runtests: jh_lib.sh
 	cd tests && ./tests.sh
 
+override_dh_install:
+	dh_install
+	perl -Ilib jh_manifest -pjavahelper
+
 override_dh_auto_test: runtests
 
 override_dh_auto_clean:
+	[ ! -e jh_lib.sh ] || ./jh_build --clean
 	rm -f jh_lib.sh tutorial.html
 	rm -fr tmp tmp.jarwrapper
diff --git a/jh_build b/jh_build
index 3509956..a024313 100755
--- a/jh_build
+++ b/jh_build
@@ -1,9 +1,10 @@
 #!/bin/bash --
 
 EXECDIRS="bin usr/bin usr/games"
+[ -z "$JAVAHELPER_DIR" ] && JAVAHELPER_DIR="/usr/share/javahelper"
 
 set -e
-. /usr/share/javahelper/jh_lib.sh
+. "$JAVAHELPER_DIR"/jh_lib.sh
 
 syntax()
 {


hooks/post-receive
-- 
UNNAMED PROJECT