rpm/ant
SHA256
1
0
Fork 0
forked from pool/ant
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/Java:packages/ant?expand=0&rev=197

Browse Source
This commit is contained in:
Fridrich Strba 2024-07-18 13:00:40 +00:00 committed by Git OBS Bridge
parent 7b4c62170a
commit c540ae8505
9 changed files with 62 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ant-antlr.changes
View File

@ -1,10 +1,13 @@
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
- Added patches:
* reproducible-jar-mtime.patch
+ make the modification times of files in a jar file
reproducible
* reproducible-javadoc.patch
+ make javadoc generation reproducible: don't generate
timestamps, and normalize locale and encoding
-------------------------------------------------------------------
Sat May 4 00:54:38 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>

2
ant-antlr.spec
View File

@ -47,6 +47,7 @@ Patch6: apache-ant-xml-apis.patch
# PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files
Patch7: reproducible-propertyfile-task.patch
Patch8: reproducible-jar-mtime.patch
Patch9: reproducible-javadoc.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
@ -397,6 +398,7 @@ find -name \*.jar -print -delete
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%patch -P 9 -p1
# clean jar files
find . -name "*.jar" -print -delete

5
ant-junit.changes
View File

@ -1,10 +1,13 @@
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
- Added patches:
* reproducible-jar-mtime.patch
+ make the modification times of files in a jar file
reproducible
* reproducible-javadoc.patch
+ make javadoc generation reproducible: don't generate
timestamps, and normalize locale and encoding
-------------------------------------------------------------------
Sat May 4 00:54:38 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>

2
ant-junit.spec
View File

@ -47,6 +47,7 @@ Patch6: apache-ant-xml-apis.patch
# PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files
Patch7: reproducible-propertyfile-task.patch
Patch8: reproducible-jar-mtime.patch
Patch9: reproducible-javadoc.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
@ -397,6 +398,7 @@ find -name \*.jar -print -delete
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%patch -P 9 -p1
# clean jar files
find . -name "*.jar" -print -delete

5
ant-junit5.changes
View File

@ -1,10 +1,13 @@
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
- Added patches:
* reproducible-jar-mtime.patch
+ make the modification times of files in a jar file
reproducible
* reproducible-javadoc.patch
+ make javadoc generation reproducible: don't generate
timestamps, and normalize locale and encoding
-------------------------------------------------------------------
Sat May 4 00:54:38 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>

2
ant-junit5.spec
View File

@ -47,6 +47,7 @@ Patch6: apache-ant-xml-apis.patch
# PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files
Patch7: reproducible-propertyfile-task.patch
Patch8: reproducible-jar-mtime.patch
Patch9: reproducible-javadoc.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
@ -397,6 +398,7 @@ find -name \*.jar -print -delete
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%patch -P 9 -p1
# clean jar files
find . -name "*.jar" -print -delete

5
ant.changes
View File

@ -1,10 +1,13 @@
-------------------------------------------------------------------
Thu Jul 18 12:09:04 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Added patch:
- Added patches:
* reproducible-jar-mtime.patch
+ make the modification times of files in a jar file
reproducible
* reproducible-javadoc.patch
+ make javadoc generation reproducible: don't generate
timestamps, and normalize locale and encoding
-------------------------------------------------------------------
Sat May 4 00:54:38 UTC 2024 - Anton Shvetz <shvetz.anton@gmail.com>

2
ant.spec
View File

@ -46,6 +46,7 @@ Patch6: apache-ant-xml-apis.patch
# PATCH-FEATURE-OPENSUSE debian patch to use SOURCE_DATE_EPOCH for timestamp in property files
Patch7: reproducible-propertyfile-task.patch
Patch8: reproducible-jar-mtime.patch
Patch9: reproducible-javadoc.patch
BuildRequires: antlr-bootstrap
BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local >= 6
@ -396,6 +397,7 @@ find -name \*.jar -print -delete
%patch -P 6 -p1
%patch -P 7 -p1
%patch -P 8 -p1
%patch -P 9 -p1
# clean jar files
find . -name "*.jar" -print -delete

38
reproducible-javadoc.patch Normal file
View File

@ -0,0 +1,38 @@
--- apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Javadoc.java 2024-07-17 15:06:13.718343866 +0200
+++ apache-ant-1.10.14/src/main/org/apache/tools/ant/taskdefs/Javadoc.java 2024-07-18 14:51:50.362329096 +0200
@@ -1297,6 +1297,15 @@
}
/**
+ * Control generation of timestamps.
+ *
+ * @param b if true, don't generate timestamps.
+ */
+ public void setNoTimestamp(final boolean b) {
+ addArgIf(b, "-notimestamp");
+ }
+
+ /**
* Create link to Javadoc output at the given URL.
*
* @return link argument to configure
@@ -1807,6 +1816,19 @@
*/
@Override
public void execute() throws BuildException {
+ if (System.getenv("SOURCE_DATE_EPOCH") != null) {
+ java.util.List<String> arguments = java.util.Arrays.asList(cmd.getCommandline());
+ if (!arguments.contains("-locale")) {
+ setLocale("en");
+ }
+ if (!arguments.contains("-encoding")) {
+ setEncoding("UTF-8");
+ }
+ if (!arguments.contains("-notimestamp")) {
+ setNoTimestamp(true);
+ }
+ }
+
checkTaskName();
final List<String> packagesToDoc = new Vector<>();