loveisgrief/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Build: Fix Windows build, version checking for release

Browse Source
This commit is contained in:
zzz
2012-01-21 15:28:24 +00:00
parent b003ee8748
commit 256b05531e
1 changed files with 42 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
build.xml
View File

@@ -443,50 +443,82 @@
</target> </target>
<target name="getReleaseNumber" > <target name="getReleaseNumber" >
<exec executable="grep" outputproperty="versionLine" failonerror="true" > <exec executable="grep" outputproperty="versionLine" failifexecutionfails="false" >
<arg value="public final static String VERSION" /> <arg value="public final static String VERSION" />
<arg value="core/java/src/net/i2p/CoreVersion.java" /> <arg value="core/java/src/net/i2p/CoreVersion.java" />
</exec> </exec>
<exec executable="cut" osfamily="unix" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" > <property name="versionLine" value="unknown" />
<exec executable="cut" osfamily="unix" inputstring="${versionLine}" outputproperty="release.number" failifexecutionfails="false" >
<arg value="-f2" /> <arg value="-f2" />
<arg value="-d&quot;" /> <arg value="-d&quot;" />
</exec> </exec>
<exec executable="cut" osfamily="mac" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" > <exec executable="cut" osfamily="mac" inputstring="${versionLine}" outputproperty="release.number" failifexecutionfails="false" >
<arg value="-f2" /> <arg value="-f2" />
<arg value="-d&quot;"/> <arg value="-d&quot;"/>
</exec> </exec>
<exec executable="cut" osfamily="windows" inputstring="${versionLine}" outputproperty="release.number" failonerror="true" > <exec executable="cut" osfamily="windows" inputstring="${versionLine}" outputproperty="release.number" failifexecutionfails="false" >
<arg value="-f2" /> <arg value="-f2" />
<arg value="-d&quot;\&quot;&quot;"/> <arg value="-d&quot;\&quot;&quot;"/>
</exec> </exec>
<property name="release.number" value="unknown" />
<echo message="Release number is ${release.number}" /> <echo message="Release number is ${release.number}" />
</target> </target>
<target name="getBuildNumber" > <target name="getBuildNumber" >
<exec executable="grep" outputproperty="buildLine" > <exec executable="grep" outputproperty="buildLine" failifexecutionfails="false" >
<arg value="public final static long BUILD" /> <arg value="public final static long BUILD" />
<arg value="router/java/src/net/i2p/router/RouterVersion.java" /> <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
</exec> </exec>
<exec executable="cut" inputstring="${buildLine}" outputproperty="build.temp" failonerror="true" > <property name="buildLine" value="??" />
<exec executable="cut" inputstring="${buildLine}" outputproperty="build.temp" failifexecutionfails="false" >
<arg value="-f2" /> <arg value="-f2" />
<arg value="-d=" /> <arg value="-d=" />
</exec> </exec>
<exec executable="tr" inputstring="${build.temp}" outputproperty="build.temp.tr" failonerror="true"> <property name="build.temp" value="??" />
<exec executable="tr" inputstring="${build.temp}" outputproperty="build.temp.tr" failifexecutionfails="false">
<arg value="-d" /> <arg value="-d" />
<arg value="&quot;[:space:]&quot;"/> <arg value="&quot;[:space:]&quot;"/>
</exec> </exec>
<exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failonerror="true" > <property name="build.temp.tr" value="??" />
<exec executable="cut" inputstring="${build.temp.tr}" outputproperty="build.number" failifexecutionfails="false" >
<arg value="-f1" /> <arg value="-f1" />
<arg value="-d;" /> <arg value="-d;" />
</exec> </exec>
<exec executable="awk" outputproperty="build.extra" failonerror="false"> <exec executable="awk" outputproperty="build.extra" failifexecutionfails="false">
<arg value="-F&quot;" /> <arg value="-F&quot;" />
<arg value="/public final static String EXTRA/{print $2}" /> <arg value="/public final static String EXTRA/{print $2}" />
<arg value="router/java/src/net/i2p/router/RouterVersion.java" /> <arg value="router/java/src/net/i2p/router/RouterVersion.java" />
</exec> </exec>
<property name="build.number" value="??" />
<property name="build.extra" value="" />
<echo message="Build number is ${build.number}${build.extra}" /> <echo message="Build number is ${build.number}${build.extra}" />
</target> </target>
<target name="verifyReleaseBuildNumbers" depends="getReleaseNumber, getBuildNumber" >
<fail message="Bad release number: ${release.number}" >
<condition>
<or>
<equals arg1="${release.number}" arg2="unknown"/>
<equals arg1="${release.number}" arg2=""/>
</or>
</condition>
</fail>
<fail message="Non-zero build number: ${build.number}" >
<condition>
<not>
<equals arg1="${build.number}" arg2="0"/>
</not>
</condition>
</fail>
<fail message="Non-empty extra build: ${build.extra}" >
<condition>
<not>
<equals arg1="${build.extra}" arg2=""/>
</not>
</condition>
</fail>
</target>
<target name="clean" depends="pkgclean" > <target name="clean" depends="pkgclean" >
<delete dir="./build" /> <delete dir="./build" />
<delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" /> <delete file="installer/lib/izpack/patches.jar" failonerror="false" quiet="true" />
@@ -1235,7 +1267,7 @@
<!-- <!--
<target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" > <target name="release" depends="distclean, updaterWithJettyFixesAndJbigi , updater200WithJettyFixes, preppkg, installer, getReleaseNumber" >
--> -->
<target name="release" depends="distclean, testscripts, updater, updater200, preppkg, installer, getReleaseNumber" > <target name="release" depends="verifyReleaseBuildNumbers, distclean, testscripts, updater, updater200, preppkg, installer" >
<echo message="================================================================" /> <echo message="================================================================" />
<echo message="Did you update these files?" /> <echo message="Did you update these files?" />
<exec executable="ls" failonerror="true"> <exec executable="ls" failonerror="true">