This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ant.
commit f668ce1d26402647d22b8f03f2465b986e124c4d
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Wed Mar 28 01:36:34 2018 +0200
Refreshed the patches
---
debian/changelog | 2 +-
.../patches/0009-reproducible-timestamp-task.patch | 23 +++++++++++-----------
.../patches/0010-reproducible-javadoc-task.patch | 4 ++--
.../0011-reproducible-propertyfile-task.patch | 4 ++--
debian/patches/0013-auto-adjust-target.patch | 8 ++++----
5 files changed, 20 insertions(+), 21 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0e83e34..26d3fcf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ant (1.10.1-1) UNRELEASED; urgency=medium
+ant (1.10.2-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
diff --git a/debian/patches/0009-reproducible-timestamp-task.patch
b/debian/patches/0009-reproducible-timestamp-task.patch
index 9a1b6b9..33105c2 100644
--- a/debian/patches/0009-reproducible-timestamp-task.patch
+++ b/debian/patches/0009-reproducible-timestamp-task.patch
@@ -3,10 +3,11 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
-@@ -70,20 +70,51 @@
+@@ -76,16 +76,49 @@
try {
- Date d = new Date();
+ Date d = getNow();
+- customFormats.forEach(cts -> cts.execute(getProject(), d,
getLocation()));
+ boolean reproducibleBuild = false;
+
+ if (System.getenv("SOURCE_DATE_EPOCH") != null) {
@@ -21,9 +22,7 @@ Forwarded: no
+ }
+ }
+
- Enumeration i = customFormats.elements();
- while (i.hasMoreElements()) {
- CustomFormat cts = (CustomFormat) i.nextElement();
++ for (CustomFormat cts : customFormats) {
+ if (reproducibleBuild) {
+ if (cts.getTimezone() == null) {
+ cts.setTimezone("UTC");
@@ -32,30 +31,30 @@ Forwarded: no
+ cts.setLocale("en_US");
+ }
+ }
- cts.execute(getProject(), d, getLocation());
- }
++ cts.execute(getProject(), d, getLocation());
++ }
- SimpleDateFormat dstamp = new SimpleDateFormat ("yyyyMMdd");
+ SimpleDateFormat dstamp = new SimpleDateFormat("yyyyMMdd");
+ if (reproducibleBuild) {
+ dstamp.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
+ }
setProperty("DSTAMP", dstamp.format(d));
- SimpleDateFormat tstamp = new SimpleDateFormat ("HHmm");
+ SimpleDateFormat tstamp = new SimpleDateFormat("HHmm");
+ if (reproducibleBuild) {
+ tstamp.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
+ }
setProperty("TSTAMP", tstamp.format(d));
SimpleDateFormat today
- = new SimpleDateFormat ("MMMM d yyyy", Locale.US);
+ = new SimpleDateFormat("MMMM d yyyy", Locale.US);
+ if (reproducibleBuild) {
+ today.setTimeZone(java.util.TimeZone.getTimeZone("UTC"));
+ }
setProperty("TODAY", today.format(d));
} catch (Exception e) {
-@@ -183,6 +214,10 @@
+@@ -220,6 +253,10 @@
}
}
@@ -66,7 +65,7 @@ Forwarded: no
/**
* The timezone to use for displaying time.
* The values are as defined by the Java TimeZone class.
-@@ -193,6 +228,10 @@
+@@ -230,6 +267,10 @@
timeZone = TimeZone.getTimeZone(id);
}
diff --git a/debian/patches/0010-reproducible-javadoc-task.patch
b/debian/patches/0010-reproducible-javadoc-task.patch
index 937d795..e8cc874 100644
--- a/debian/patches/0010-reproducible-javadoc-task.patch
+++ b/debian/patches/0010-reproducible-javadoc-task.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -1703,6 +1703,16 @@
+@@ -1700,6 +1700,16 @@
*/
@Override
public void execute() throws BuildException {
@@ -21,4 +21,4 @@ Forwarded: no
+
checkTaskName();
- final Vector<String> packagesToDoc = new Vector<String>();
+ final List<String> packagesToDoc = new Vector<>();
diff --git a/debian/patches/0011-reproducible-propertyfile-task.patch
b/debian/patches/0011-reproducible-propertyfile-task.patch
index bb4d0d1..1539e8d 100644
--- a/debian/patches/0011-reproducible-propertyfile-task.patch
+++ b/debian/patches/0011-reproducible-propertyfile-task.patch
@@ -5,7 +5,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
-@@ -208,6 +208,10 @@
+@@ -238,6 +238,10 @@
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
@@ -16,7 +16,7 @@ Forwarded: no
TimeZone tz = cal.getTimeZone();
int offset = tz.getOffset(cal.get(Calendar.ERA),
cal.get(Calendar.YEAR),
-@@ -228,6 +232,7 @@
+@@ -258,6 +262,7 @@
}
tzMarker.append(minutes);
synchronized (DATE_HEADER_FORMAT_INT) {
diff --git a/debian/patches/0013-auto-adjust-target.patch
b/debian/patches/0013-auto-adjust-target.patch
index a820483..48f70ab 100644
--- a/debian/patches/0013-auto-adjust-target.patch
+++ b/debian/patches/0013-auto-adjust-target.patch
@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebo...@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
-@@ -207,7 +207,10 @@
+@@ -213,7 +213,10 @@
*/
public String getSource() {
return source != null
@@ -15,7 +15,7 @@ Forwarded: no
}
/**
-@@ -786,7 +789,10 @@
+@@ -792,7 +795,10 @@
public String getTarget() {
return targetAttribute != null
? targetAttribute
@@ -27,7 +27,7 @@ Forwarded: no
}
/**
-@@ -1109,6 +1115,9 @@
+@@ -1121,6 +1127,9 @@
checkParameters();
resetFileLists();
@@ -39,7 +39,7 @@ Forwarded: no
if (hasPath(src)) {
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
-@@ -2203,7 +2203,12 @@
+@@ -2174,7 +2174,12 @@
: getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
if (sourceArg != null) {
toExecute.createArgument().setValue("-source");
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/ant.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
