[Git][java-team/javatools][master] 2 commits: jh_build: Remove CLASSPATHDOCS variable and do not link to external classes by default anymore

[Andrej Shadura]

Andrej Shadura pushed to branch master at Debian Java Maintainers / javatools


Commits:
01075a59 by Markus Koschany at 2019-03-10T18:26:11Z
jh_build: Remove CLASSPATHDOCS variable and do not link to external classes by default anymore

Closes: #923756

- - - - -
b685821c by Andrej Shadura at 2019-03-10T18:26:35Z
Update the changelog

- - - - -


2 changed files:

- debian/changelog
- jh_build


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+javatools (0.72.5) unstable; urgency=medium
+
+  [ Markus Koschany ]
+  * jh_build: Remove CLASSPATHDOCS variable and do not link to
+    external classes by default anymore (Closes: #923756).
+
+ -- Andrej Shadura <andrewsh at debian.org>  Sun, 10 Mar 2019 18:26:19 +0000
+
 javatools (0.72.4) unstable; urgency=medium
 
   * Team upload.


=====================================
jh_build
=====================================
@@ -116,7 +116,7 @@ my $CLASSPATH = $CLASSPATH_ORIG;
 my @JH_JAR_EXTRA;
 my $build_javadoc = 1;
 my (@javac_opts, @javadoc_opts, $main_class, $do_clean);
-my (@JAVAC, @JAVADOC, @JAR, @CLASSPATHDOCS, @builds);
+my (@JAVAC, @JAVADOC, @JAR, @builds);
 
 $CLASSPATH =~ tr/:/ /;
 @JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if @JH_JAR_EXTRA;
@@ -222,13 +222,13 @@ sub do_build {
 		my $files_escaped = escape_shell(@srcfiles);
 		complex_doit(qq{find $dirs_escaped -name '*.java' -and -type f -print0 | xargs -s 512000 -0 @JAVAC -g -cp ${CLASSPATH_ORIG}:debian/_jh_build.$ext -d debian/_jh_build.$ext @javac_opts $files_escaped});
 		if ($build_javadoc) {
-			complex_doit(qq{find $dirs_escaped -name '*.java' -and -type f -print0 | xargs -s 512000 -0 @JAVADOC @CLASSPATHDOCS -classpath ${CLASSPATH_ORIG}:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet @javadoc_opts $files_escaped});
+			complex_doit(qq{find $dirs_escaped -name '*.java' -and -type f -print0 | xargs -s 512000 -0 @JAVADOC -classpath ${CLASSPATH_ORIG}:debian/_jh_build.$ext -d debian/_jh_build.javadoc/api -quiet @javadoc_opts $files_escaped});
 		}
 
 	} elsif (@srcfiles) {
 		doit(@JAVAC, '-g', '-cp', "${CLASSPATH_ORIG}:_jh_build.$ext", '-d', "debian/_jh_build.$ext", '-quiet', @javac_opts, @srcfiles);
 		if ($build_javadoc) {
-			doit(@JAVADOC, @CLASSPATHDOCS, '-classpath', "${CLASSPATH_ORIG}:_jh_build.$ext", '-d', "debian/_jh_build.javadoc/api", '-quiet', @javadoc_opts, @srcfiles);
+			doit(@JAVADOC, '-classpath', "${CLASSPATH_ORIG}:_jh_build.$ext", '-d', "debian/_jh_build.javadoc/api", '-quiet', @javadoc_opts, @srcfiles);
 		}
 	} else {
 		return;
@@ -242,14 +242,6 @@ sub do_build {
 	return;
 }
 
-sub _classpath_docs {
-	my $source = sourcepackage();
-	return map {
-		chomp;
-		('-link', $_)
-	} `for i in \$(grep-dctrl --no-field-names --show-field Build-Depends,Build-Depends-Indep -F source "${source}" debian/control | tr , ' ' | sed 's/([^)]*)//g') ; do dpkg -L \$i 2>/dev/null | grep /usr/share/doc/.*/api\$; done`;
-}
-
 # By default, jh_build does nothing without a debian/javabuild file or explicit arguments.
 # PROMISE: DH NOOP WITHOUT pkgfile(javabuild)
 
@@ -269,7 +261,6 @@ if (@builds) {
 	@JAVAC = ("${JAVA_HOME}/bin/javac");
 	@JAVADOC = ("${JAVA_HOME}/bin/javadoc", '-locale', 'en_US');
 	@JAR = ("${JAVA_HOME}/bin/jar");
-	@CLASSPATHDOCS = _classpath_docs();
 	for my $build (@builds) {
 		do_build(@{$build});
 	}



View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/c70a934a4b81fd1597c64c925658f178f42a2104...b685821cb6d45c392721ba570b26c4937693a431

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/c70a934a4b81fd1597c64c925658f178f42a2104...b685821cb6d45c392721ba570b26c4937693a431
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/20190310/22b9fd42/attachment.html>