[libgetopt-java] 03/11: Build only the relevant javadocs and exclude GetoptDemo.java.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository libgetopt-java.

commit cba0de9eb9246eac8f54d945516962047fdf48de
Author: Markus Koschany <apo at debian.org>
Date:   Sun Oct 8 21:49:36 2017 +0200

    Build only the relevant javadocs and exclude GetoptDemo.java.
    
    This will prevent a build failure with OpenJDK 9.
---
 debian/rules | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index b4fb36a..0228c3c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,23 +17,23 @@ export CLASSPATH=$(JAVA_HOME)/jre/lib/rt.jar:.
 	dh $@ --with javahelper --with jh_maven_repo_helper
 
 override_dh_auto_build:
+	[ -f $(CURDIR)/GetoptDemo.java ] || mv $(CURDIR)/gnu/getopt/GetoptDemo.java .
 	mkdir -p $(CURDIR)/classes
 	${JAVAC} -target 1.8 -source 1.8 -d classes -classpath ${CLASSPATH} gnu/getopt/*.java
 	cp $(CURDIR)/gnu/getopt/*.properties $(CURDIR)/classes/gnu/getopt
 	cd $(CURDIR)/classes; ${JAR} cvf ../gnu-getopt.jar gnu
-	javadoc -link /usr/share/doc/default-jdk-doc/api -d api/ gnu/getopt/*.java
-	# Remove the javadoc of the example
-	[ ! -f $(CURDIR)/api/GetoptDemo.html ] || rm -f $(CURDIR)/api/GetoptDemo.html
+	javadoc -link /usr/share/doc/default-jdk-doc/api -d api/ gnu/getopt/Getopt.java gnu/getopt/LongOpt.java
 
 override_dh_installexamples:
-	dh_installexamples gnu/getopt/GetoptDemo.java
+	dh_installexamples GetoptDemo.java
 
 override_dh_installchangelogs:
 	dh_installchangelogs gnu/getopt/ChangeLog
 
 override_dh_clean:
 	dh_clean
-	rm -rf $(CURDIR)/classes $(CURDIR)/api
+	$(RM) -r $(CURDIR)/classes $(CURDIR)/api
+	[ -f $(CURDIR)/gnu/getopt/GetoptDemo.java ] || mv $(CURDIR)/GetoptDemo.java $(CURDIR)/gnu/getopt/
 
 .PHONY: get-orig-source
 get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.gz

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libgetopt-java.git