Commit d2985075 authored by Emmanuel Bourg's avatar Emmanuel Bourg

Refreshed the patches

parent e2489c0e
ant (1.9.10-3) UNRELEASED; urgency=medium
ant (1.10.0-1) UNRELEASED; urgency=medium
* New upstream release
- Refreshed the patches
* Adjust the source/target level to 1.7 in anticipation of the 1.6 removal
in Java 11
* Added activation.jar to the build classpath to fix the empty ant-javamail
......
From: Emmanuel Bourg <ebourg@apache.org>
Date: Mon, 28 Mar 2016 01:45:52 +0200
Subject: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
Description: Add support for the SOURCE_DATE_EPOCH variable in the Tstamp task
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
---
src/main/org/apache/tools/ant/taskdefs/Tstamp.java | 39 ++++++++++++++++++++++
1 file changed, 39 insertions(+)
--- a/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Tstamp.java
@@ -71,20 +71,51 @@
@@ -70,20 +70,51 @@
try {
Date d = getNow();
Date d = new Date();
+ boolean reproducibleBuild = false;
+
......@@ -41,27 +35,27 @@ Forwarded: no
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) {
@@ -200,6 +231,10 @@
@@ -183,6 +214,10 @@
}
}
......@@ -72,7 +66,7 @@ Forwarded: no
/**
* The timezone to use for displaying time.
* The values are as defined by the Java TimeZone class.
@@ -210,6 +245,10 @@
@@ -193,6 +228,10 @@
timeZone = TimeZone.getTimeZone(id);
}
......
From: Emmanuel Bourg <ebourg@apache.org>
Date: Mon, 28 Mar 2016 02:00:16 +0200
Subject: Improves the reproducibility of the javadoc task for the Debian
Description: Improves the reproducibility of the javadoc task for the Debian
builds by setting the locale to 'en' and the encoding to UTF-8 if none was
specified and SOURCE_DATE_EPOCH is set.
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
---
src/main/org/apache/tools/ant/taskdefs/Javadoc.java | 10 ++++++++++
1 file changed, 10 insertions(+)
--- a/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javadoc.java
@@ -1707,6 +1707,16 @@
@@ -1703,6 +1703,16 @@
*/
@Override
public void execute() throws BuildException {
......
From: Emmanuel Bourg <ebourg@apache.org>
Date: Tue, 24 May 2016 00:22:11 +0200
Subject: Improves the reproducibility of the propertyfile task for the Debian
Description: Improves the reproducibility of the propertyfile task for the Debian
builds by using the date specified by the SOURCE_DATE_EPOCH variable in the
header of the .properties file generated
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
---
src/main/org/apache/tools/ant/util/DateUtils.java | 5 +++++
1 file changed, 5 insertions(+)
--- a/src/main/org/apache/tools/ant/util/DateUtils.java
+++ b/src/main/org/apache/tools/ant/util/DateUtils.java
@@ -238,6 +238,10 @@
@@ -208,6 +208,10 @@
*/
public static String getDateForHeader() {
Calendar cal = Calendar.getInstance();
......@@ -22,7 +16,7 @@ Forwarded: no
TimeZone tz = cal.getTimeZone();
int offset = tz.getOffset(cal.get(Calendar.ERA),
cal.get(Calendar.YEAR),
@@ -258,6 +262,7 @@
@@ -228,6 +232,7 @@
}
tzMarker.append(minutes);
synchronized (DATE_HEADER_FORMAT_INT) {
......
......@@ -3,7 +3,7 @@ Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/main/org/apache/tools/ant/taskdefs/Javac.java
+++ b/src/main/org/apache/tools/ant/taskdefs/Javac.java
@@ -210,7 +210,10 @@
@@ -207,7 +207,10 @@
*/
public String getSource() {
return source != null
......@@ -15,7 +15,7 @@ Forwarded: no
}
/**
@@ -789,7 +792,10 @@
@@ -786,7 +789,10 @@
public String getTarget() {
return targetAttribute != null
? targetAttribute
......@@ -27,7 +27,7 @@ Forwarded: no
}
/**
@@ -1118,6 +1124,9 @@
@@ -1109,6 +1115,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
@@ -2207,7 +2207,12 @@
@@ -2203,7 +2203,12 @@
: getProject().getProperty(MagicNames.BUILD_JAVAC_SOURCE);
if (sourceArg != null) {
toExecute.createArgument().setValue("-source");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment