This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ant.
commit ff36400053157b0ff1cbb486c5a094bb3ffad92f Author: Emmanuel Bourg <[email protected]> Date: Fri Jun 30 00:35:44 2017 +0200 Adjust the source/target level automatically for Debian builds with Java 9 --- debian/changelog | 7 +++++++ debian/patches/0013-auto-adjust-target.patch | 25 +++++++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 33 insertions(+) diff --git a/debian/changelog b/debian/changelog index e28a5ae..6346885 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ant (1.9.9-4) UNRELEASED; urgency=medium + + * Team upload. + * Adjust the source/target level automatically for Debian builds with Java 9 + + -- Emmanuel Bourg <[email protected]> Fri, 30 Jun 2017 00:34:56 +0200 + ant (1.9.9-3) unstable; urgency=medium * Team upload. diff --git a/debian/patches/0013-auto-adjust-target.patch b/debian/patches/0013-auto-adjust-target.patch new file mode 100644 index 0000000..e685efe --- /dev/null +++ b/debian/patches/0013-auto-adjust-target.patch @@ -0,0 +1,25 @@ +Description: Adjust the source/target level automatically for Debian builds with Java 9 +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java ++++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java +@@ -1109,6 +1109,19 @@ + checkParameters(); + resetFileLists(); + ++ if (JAVAC9.equals(assumedJavaVersion()) && System.getenv("DEB_BUILD_ARCH") != null) { ++ // adjust the source/target level automatically for Debian builds with Java 9 ++ List<String> unsupportedLanguageLevels = java.util.Arrays.asList(new String[]{"1.1", "1.2", "1.3", "1.4", "1.5", "5"}); ++ if (unsupportedLanguageLevels.contains(source)) { ++ log("Use of a source " + source + " is no longer supported, switching to 1.6", Project.MSG_WARN); ++ source = "1.6"; ++ } ++ if (unsupportedLanguageLevels.contains(targetAttribute)) { ++ log("Use of a target " + targetAttribute + " is no longer supported, switching to 1.6", Project.MSG_WARN); ++ targetAttribute = "1.6"; ++ } ++ } ++ + // scan source directories and dest directory to build up + // compile list + if (hasPath(src)) { diff --git a/debian/patches/series b/debian/patches/series index a74bc14..d3353fc 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 0009-reproducible-timestamp-task.patch 0010-reproducible-javadoc-task.patch 0011-reproducible-propertyfile-task.patch +0013-auto-adjust-target.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ant.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
