Andrej Shadura pushed to branch master at Debian Java Maintainers / javatools
Commits: ac6e9e7d by Andrej Shadura at 2019-03-10T17:30:55Z Fix the hashbang Closes: #923748 - - - - - 83d0d2ca by Andrej Shadura at 2019-03-10T17:32:08Z Use @javadoc_opts instead of $JH_JAVADOC_OPTS - - - - - 7c5e7e1c by Andrej Shadura at 2019-03-10T17:50:30Z Fix failure due to undefined variables - - - - - c70a934a by Andrej Shadura at 2019-03-10T17:51:02Z Update the changelog - - - - - 2 changed files: - debian/changelog - jh_build Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +javatools (0.72.4) unstable; urgency=medium + + * Team upload. + * Fix the hashbang (Closes: #923748). + * Use @javadoc_opts instead of $JH_JAVADOC_OPTS. + * Fix failure due to undefined variables. + + -- Andrej Shadura <[email protected]> Sun, 10 Mar 2019 17:50:49 +0000 + javatools (0.72.3) unstable; urgency=medium * Team upload. ===================================== jh_build ===================================== @@ -1,4 +1,4 @@ -#!/use/bin/perl +#!/usr/bin/perl =head1 NAME @@ -110,15 +110,15 @@ Can be omitted if no extra files need to be included. =cut -my $JAVA_HOME = $ENV{'JAVA_HOME'}; -my $CLASSPATH_ORIG = $ENV{'CLASSPATH'}; +my $JAVA_HOME = defined $ENV{'JAVA_HOME'} ? $ENV{'JAVA_HOME'} : ""; +my $CLASSPATH_ORIG = defined $ENV{'CLASSPATH'} ? $ENV{'CLASSPATH'} : ""; 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); -$CLASSPATH =~ tr/:/ / if defined($CLASSPATH_ORIG); +$CLASSPATH =~ tr/:/ /; @JH_JAR_EXTRA = split(' ', $ENV{'JH_JAR_EXTRA'}) if @JH_JAR_EXTRA; init(options => { @@ -222,7 +222,7 @@ 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 $JH_JAVADOC_OPTS $files_escaped}); + 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}); } } elsif (@srcfiles) { View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/2ae6c8db1f9c186ff8b5cafb835307f1acc4bb2b...c70a934a4b81fd1597c64c925658f178f42a2104 -- View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/2ae6c8db1f9c186ff8b5cafb835307f1acc4bb2b...c70a934a4b81fd1597c64c925658f178f42a2104 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
