Accepting request 1110246 from Java:packages

reproducible

OBS-URL: https://build.opensuse.org/request/show/1110246
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/picocli?expand=0&rev=8
This commit is contained in:
Ana Guerrero 2023-09-11 19:22:10 +00:00 committed by Git OBS Bridge
commit 84b8be420a
3 changed files with 57 additions and 47 deletions

View File

@ -47,8 +47,8 @@
verbose="false" verbose="false"
fork="false" fork="false"
source="${compiler.source}" source="${compiler.source}"
encoding="UTF-8" encoding="UTF-8"
createMissingPackageInfoClass="false"> createMissingPackageInfoClass="false">
<src> <src>
<pathelement location="${build.srcDir}"/> <pathelement location="${build.srcDir}"/>
</src> </src>
@ -62,8 +62,8 @@
release="9" release="9"
verbose="false" verbose="false"
fork="false" fork="false"
encoding="UTF-8" encoding="UTF-8"
createMissingPackageInfoClass="false"> createMissingPackageInfoClass="false">
<src> <src>
<pathelement location="${build.srcDir9}"/> <pathelement location="${build.srcDir9}"/>
</src> </src>
@ -79,14 +79,14 @@
verbose="false" verbose="false"
fork="false" fork="false"
source="${compiler.source}" source="${compiler.source}"
encoding="UTF-8" encoding="UTF-8"
createMissingPackageInfoClass="false"> createMissingPackageInfoClass="false">
<src> <src>
<pathelement location="picocli-codegen/${build.srcDir}"/> <pathelement location="picocli-codegen/${build.srcDir}"/>
</src> </src>
<classpath> <classpath>
<pathelement location="${build.outputDir}"/> <pathelement location="${build.outputDir}"/>
</classpath> </classpath>
</javac> </javac>
<!-- Build module-info.java with release 9 --> <!-- Build module-info.java with release 9 -->
<javac destdir="picocli-codegen/${build.outputDir}" <javac destdir="picocli-codegen/${build.outputDir}"
@ -97,15 +97,15 @@
release="9" release="9"
verbose="false" verbose="false"
fork="false" fork="false"
encoding="UTF-8" encoding="UTF-8"
createMissingPackageInfoClass="false"> createMissingPackageInfoClass="false">
<src> <src>
<pathelement location="picocli-codegen/${build.srcDir9}"/> <pathelement location="picocli-codegen/${build.srcDir9}"/>
</src> </src>
<include name="**/module-info.java"/> <include name="**/module-info.java"/>
<modulepath> <modulepath>
<pathelement location="${build.outputDir}"/> <pathelement location="${build.outputDir}"/>
</modulepath> </modulepath>
</javac> </javac>
<!-- Build all except module-info.java with source/target 8 --> <!-- Build all except module-info.java with source/target 8 -->
<mkdir dir="picocli-shell-jline2/${build.outputDir}"/> <mkdir dir="picocli-shell-jline2/${build.outputDir}"/>
@ -118,15 +118,15 @@
verbose="false" verbose="false"
fork="false" fork="false"
source="${compiler.source}" source="${compiler.source}"
encoding="UTF-8" encoding="UTF-8"
createMissingPackageInfoClass="false"> createMissingPackageInfoClass="false">
<src> <src>
<pathelement location="picocli-shell-jline2/${build.srcDir}"/> <pathelement location="picocli-shell-jline2/${build.srcDir}"/>
</src> </src>
<classpath> <classpath>
<pathelement location="${build.outputDir}"/> <pathelement location="${build.outputDir}"/>
<pathelement location="${jline2.jar}"/> <pathelement location="${jline2.jar}"/>
</classpath> </classpath>
</javac> </javac>
<!-- Build module-info.java with release 9 --> <!-- Build module-info.java with release 9 -->
<javac destdir="picocli-shell-jline2/${build.outputDir}" <javac destdir="picocli-shell-jline2/${build.outputDir}"
@ -137,15 +137,15 @@
release="9" release="9"
verbose="false" verbose="false"
fork="false" fork="false"
encoding="UTF-8" encoding="UTF-8"
createMissingPackageInfoClass="false"> createMissingPackageInfoClass="false">
<src> <src>
<pathelement location="picocli-shell-jline2/${build.srcDir9}"/> <pathelement location="picocli-shell-jline2/${build.srcDir9}"/>
</src> </src>
<modulepath> <modulepath>
<pathelement location="${build.outputDir}"/> <pathelement location="${build.outputDir}"/>
<pathelement location="${jline2.jar}"/> <pathelement location="${jline2.jar}"/>
</modulepath> </modulepath>
</javac> </javac>
</target> </target>
@ -174,16 +174,16 @@
charset="UTF-8" charset="UTF-8"
linksource="false" linksource="false"
breakiterator="false" breakiterator="false"
source="${compiler.source}" source="${compiler.source}"
> >
<sourcepath> <sourcepath>
<pathelement location="${build.srcDir}"/> <pathelement location="${build.srcDir}"/>
<pathelement location="picocli-codegen/${build.srcDir}"/> <pathelement location="picocli-codegen/${build.srcDir}"/>
</sourcepath> </sourcepath>
<classpath> <classpath>
<pathelement location="${build.outputDir}"/> <pathelement location="${build.outputDir}"/>
</classpath> </classpath>
</javadoc> </javadoc>
</target> </target>
<!-- ====================================================================== --> <!-- ====================================================================== -->
@ -201,9 +201,9 @@
index="false" index="false"
basedir="picocli-codegen/${build.outputDir}" basedir="picocli-codegen/${build.outputDir}"
excludes="**/package.html"> excludes="**/package.html">
<service type="javax.annotation.processing.Processor" <service type="javax.annotation.processing.Processor"
provider="picocli.codegen.aot.graalvm.processor.NativeImageConfigGeneratorProcessor"/> provider="picocli.codegen.aot.graalvm.processor.NativeImageConfigGeneratorProcessor"/>
</jar> </jar>
<jar jarfile="${build.dir}/${project.artifactId}-shell-jline2-${project.version}.jar" <jar jarfile="${build.dir}/${project.artifactId}-shell-jline2-${project.version}.jar"
compress="true" compress="true"
index="false" index="false"

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Sep 10 10:27:31 UTC 2023 - Fridrich Strba <fstrba@suse.com>
- Reproducible builds: Do not create timestamps with bnd wrap
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Aug 27 06:46:38 UTC 2023 - Fridrich Strba <fstrba@suse.com> Sun Aug 27 06:46:38 UTC 2023 - Fridrich Strba <fstrba@suse.com>

View File

@ -81,13 +81,18 @@ cp %{SOURCE1} build.xml
-Djline2.jar=$(find-jar jline/jline) \ -Djline2.jar=$(find-jar jline/jline) \
jar javadoc jar javadoc
echo "-reproducible: true" >> bnd.bnd
echo "-noextraheaders: true" >> bnd.bnd
echo "-snapshot: SNAPSHOT" >> bnd.bnd
# Convert to OSGi bundle # Convert to OSGi bundle
bnd wrap \ bnd wrap \
--bsn %{name} \ --force \
--version %{version} \ --bsn %{name} \
--output target/%{name}-%{version}.bar \ --version %{version} \
--properties bnd.bnd \ --output target/%{name}-%{version}.bar \
target/%{name}-%{version}.jar --properties bnd.bnd \
target/%{name}-%{version}.jar
mv target/%{name}-%{version}.bar target/%{name}-%{version}.jar mv target/%{name}-%{version}.bar target/%{name}-%{version}.jar
%install %install