diff options
| author | Markus Koschany <apo@debian.org> | 2019-03-05 13:19:24 +0100 |
|---|---|---|
| committer | Andrej Shadura <andrew.shadura@collabora.co.uk> | 2019-03-10 18:26:11 +0000 |
| commit | 01075a5932519075d2775ad2baeb3fd5b2fe386e (patch) | |
| tree | c3009182b6bfecefc40b14c982ec2036aa7c25cd | |
| parent | c70a934a4b81fd1597c64c925658f178f42a2104 (diff) | |
jh_build: Remove CLASSPATHDOCS variable and do not link to external classes by default anymore
Closes: #923756
| -rwxr-xr-x | jh_build | 15 |
1 files changed, 3 insertions, 12 deletions
@@ -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}); } |