Changeset d8cc2a3


Ignore:
Timestamp:
Jun 28, 2018 6:47:45 PM (2 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
3de1fa2
Parents:
9b17b52
Message:

Debian: Add build option for reproducible builds;
remove timestamp from manifests and javadocs (ticket #2279)

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • build.properties

    r9b17b52 rd8cc2a3  
    141141
    142142### Debian/Ubuntu packages ###
     143# uncomment to try to make the build reproducible; work in progress
     144#build.reproducible=true
    143145# Don't include geoip files, we will use geoip-database package
    144146#with-geoip-database=true
  • build.xml

    r9b17b52 rd8cc2a3  
    440440    </target>
    441441
    442     <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber" >
     442    <target name="buildProperties" depends="getMtnRev, getReleaseNumber, getBuildNumber, setBuildTimestamp" >
    443443        <!-- default if not set above -->
    444444        <property name="workspace.version" value="unknown" />
     445        <!-- default if not set by setBuildTimestamp -->
     446        <property name="build.timestamp" value="reproducible" />
     447        <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
     448        <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
     449    </target>
     450
     451    <target name="setBuildTimestamp" unless="${build.reproducible}" >
    445452        <tstamp>
    446453            <format property="build.timestamp" pattern="yyyy-MM-dd HH:mm:ss z" timezone="UTC" locale="en" />
    447454        </tstamp>
    448         <property name="full.version" value="${release.number}-${i2p.build.number}${build.extra}" />
    449         <echo message="Building version ${full.version} (mtn rev ${workspace.version})" />
    450455    </target>
    451456
     
    807812            splitindex="true"
    808813            failonerror="true"
     814            additionalparam="-notimestamp"
    809815            doctitle="I2P Javadocs for Release ${release.number} Build ${i2p.build.number}${build.extra}"
    810816            windowtitle="I2P Anonymous Network - Java Documentation - Version ${release.number}">
     
    881887            <link offline="true" href="${wrapperdocs.url}" packagelistLoc="installer/resources/package-lists/wrapper/" />
    882888        </javadoc>
    883         <echo message="Warning, javadoc embeds timestamps in the output, run with 'TZ=UTC ant javadoc' if you plan to distribute" />
    884889    </target>
    885890
  • debian/rules

    r9b17b52 rd8cc2a3  
    8383        @/bin/echo -e "javac.compilerargs7=-bootclasspath $(JAVA_HOME)/jre/lib/rt.jar:$(JAVA_HOME)/jre/lib/jce.jar" >> $(CURDIR)/override.properties
    8484        @/bin/echo -e "build.built-by=debian" >> $(CURDIR)/override.properties
     85        @/bin/echo -e "build.reproducible=true" >> $(CURDIR)/override.properties
    8586
    8687        @# debian and ubuntu: everywhere
Note: See TracChangeset for help on using the changeset viewer.