shorter nightly build revision names

This commit is contained in:
Jindra Petřík
2014-05-18 13:14:16 +02:00
parent 63cf7e9792
commit bb624ef5a1
4 changed files with 20 additions and 3 deletions
+2 -1
View File
@@ -20,4 +20,5 @@
/coverage.ec /coverage.ec
/libsrc/jsyntaxpane/jsyntaxpane/src/target/ /libsrc/jsyntaxpane/jsyntaxpane/src/target/
hs_err_pid*.log hs_err_pid*.log
*.~* *.~*
/revision.txt
+3
View File
@@ -50,6 +50,9 @@
<property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/> <property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/>
<property name="EXECONFIG" value="${basedir}/build_exe.xml"/> <property name="EXECONFIG" value="${basedir}/build_exe.xml"/>
<property name="EXE64CONFIG" value="${basedir}/build_exe64.xml"/> <property name="EXE64CONFIG" value="${basedir}/build_exe64.xml"/>
<property name="REVFILE" value="${basedir}/revision.txt"/>
<property name="RUNPARAMS" value=""/> <property name="RUNPARAMS" value=""/>
<import file="build_common.xml"/> <import file="build_common.xml"/>
+14 -1
View File
@@ -277,7 +277,7 @@
</target> </target>
<target name="-nightly-suffix" if="NIGHTLY"> <target name="-nightly-suffix" if="NIGHTLY">
<property name="VERSIONSUFFIX" value="_${GITTAG}"/> <property name="VERSIONSUFFIX" value="_${GITSHORTTAG}"/>
</target> </target>
<target name="-nonightly-suffix" unless="NIGHTLY"> <target name="-nonightly-suffix" unless="NIGHTLY">
@@ -293,7 +293,20 @@
<arg value="rev-parse"/> <arg value="rev-parse"/>
<arg value="HEAD"/> <arg value="HEAD"/>
</exec> </exec>
<echo message="${GITTAG}" file="${REVFILE}"/>
<loadfile srcfile="${REVFILE}" property="GITSHORTTAG">
<filterchain>
<headfilter lines="1" skip="0"/>
<tokenfilter>
<replaceregex pattern="[0-9a-f]{33}$" replace="" flags="gi"/>
</tokenfilter>
<striplinebreaks/>
</filterchain>
</loadfile>
<echo message="Git tag:${GITTAG}"/> <echo message="Git tag:${GITTAG}"/>
<echo message="Git shorttag:${GITSHORTTAG}"/>
<echo message="Version: ${VERSION}"/> <echo message="Version: ${VERSION}"/>
</target> </target>
@@ -49,7 +49,7 @@ public class ApplicationInfo {
build = prop.getProperty("build"); build = prop.getProperty("build");
nightly = prop.getProperty("nightly").equals("true"); nightly = prop.getProperty("nightly").equals("true");
if (nightly) { if (nightly) {
version = version + " nightly build " + build; version = version + " nightly build " + build.substring(0,7);
} }
} catch (IOException | NullPointerException ex) { } catch (IOException | NullPointerException ex) {
//ignore //ignore