[Git][java-team/javatools][master] 4 commits: jh_build: Expand globs in d/javabuild

[Niels Thykier]

Niels Thykier pushed to branch master at Debian Java Maintainers / javatools


Commits:
788ef474 by Niels Thykier at 2019-03-31T09:50:36Z
jh_build: Expand globs in d/javabuild

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -
b9bfd21d by Niels Thykier at 2019-03-31T09:50:53Z
jh_build: Remove stray -quiet in javac cmd options

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -
72661d1a by Niels Thykier at 2019-03-31T10:25:11Z
jh_build: Fix some perlcritic issues

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -
4486bd96 by Niels Thykier at 2019-03-31T10:26:02Z
Release javatools/0.72.7

Signed-off-by: Niels Thykier <niels at thykier.net>

- - - - -


2 changed files:

- debian/changelog
- jh_build


Changes:

=====================================
debian/changelog
=====================================
@@ -1,11 +1,17 @@
-javatools (0.72.7) UNRELEASED; urgency=medium
+javatools (0.72.7) unstable; urgency=medium
 
   * Team upload.
   * jh_build: Fix processing of --no-javadoc plus correctly
     interpret --javacopts as javac options rather than javadoc
     options.  (Closes: #924328)
-
- -- Niels Thykier <niels at thykier.net>  Mon, 18 Mar 2019 07:28:59 +0000
+  * jh_build: Expand globs in debian/javabuild like the previous
+    version of jh_build did.  Issue also reported in #925507.
+  * jh_build: Remove stray "-quiet" option in the javac parameter
+    list for single files ("-quiet" is only for the javadoc command).
+    (Closes: #925507)
+  * jh_build: Fix some perlcritic issues that now fail the build.
+
+ -- Niels Thykier <niels at thykier.net>  Sun, 31 Mar 2019 10:25:16 +0000
 
 javatools (0.72.6) unstable; urgency=medium
 


=====================================
jh_build
=====================================
@@ -110,8 +110,8 @@ Can be omitted if no extra files need to be included.
 
 =cut
 
-my $JAVA_HOME = defined $ENV{'JAVA_HOME'} ? $ENV{'JAVA_HOME'} : "";
-my $CLASSPATH_ORIG = defined $ENV{'CLASSPATH'} ? $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;
@@ -226,9 +226,9 @@ sub do_build {
 		}
 
 	} elsif (@srcfiles) {
-		doit(@JAVAC, '-g', '-cp', "${CLASSPATH_ORIG}:_jh_build.$ext", '-d', "debian/_jh_build.$ext", '-quiet', @javac_opts, @srcfiles);
+		doit(@JAVAC, '-g', '-cp', "${CLASSPATH_ORIG}:_jh_build.$ext", '-d', "debian/_jh_build.$ext", @javac_opts, @srcfiles);
 		if ($build_javadoc) {
-			doit(@JAVADOC, '-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;
@@ -249,7 +249,7 @@ sub do_build {
 if (@ARGV) {
 	push(@builds, [@ARGV]);
 } elsif (-f 'debian/javabuild') {
-	@builds = filedoublearray('debian/javabuild')
+	@builds = filedoublearray('debian/javabuild', ['.'])
 }
 
 if (@builds) {
@@ -257,7 +257,7 @@ if (@builds) {
 		$JAVA_HOME = '/usr/lib/jvm/default-java' if -d '/usr/lib/jvm/default-java';
 	}
 	if (not $JAVA_HOME) {
-		error("Cannot find any JAVA_HOME: aborting");
+		error('Cannot find any JAVA_HOME: aborting');
 	}
 	@JAVAC = ("${JAVA_HOME}/bin/javac");
 	@JAVADOC = ("${JAVA_HOME}/bin/javadoc", '-locale', 'en_US');



View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/af6c36c1799b26bd1bc6baf037a8f355916df2bf...4486bd96b55c4b695aff2ee2e5d7a92d926ef9f2

-- 
View it on GitLab: https://salsa.debian.org/java-team/javatools/compare/af6c36c1799b26bd1bc6baf037a8f355916df2bf...4486bd96b55c4b695aff2ee2e5d7a92d926ef9f2
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/20190331/f9ad4d84/attachment.html>