mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git
synced 2026-07-01 19:25:02 +00:00
shorter nightly build revision names
This commit is contained in:
3
.gitignore
vendored
3
.gitignore
vendored
@@ -20,4 +20,5 @@
|
||||
/coverage.ec
|
||||
/libsrc/jsyntaxpane/jsyntaxpane/src/target/
|
||||
hs_err_pid*.log
|
||||
*.~*
|
||||
*.~*
|
||||
/revision.txt
|
||||
@@ -50,6 +50,9 @@
|
||||
<property name="INSTALLERPROJECT" value="${basedir}/installer.iss"/>
|
||||
<property name="EXECONFIG" value="${basedir}/build_exe.xml"/>
|
||||
<property name="EXE64CONFIG" value="${basedir}/build_exe64.xml"/>
|
||||
|
||||
<property name="REVFILE" value="${basedir}/revision.txt"/>
|
||||
|
||||
<property name="RUNPARAMS" value=""/>
|
||||
|
||||
<import file="build_common.xml"/>
|
||||
|
||||
@@ -277,7 +277,7 @@
|
||||
</target>
|
||||
|
||||
<target name="-nightly-suffix" if="NIGHTLY">
|
||||
<property name="VERSIONSUFFIX" value="_${GITTAG}"/>
|
||||
<property name="VERSIONSUFFIX" value="_${GITSHORTTAG}"/>
|
||||
</target>
|
||||
|
||||
<target name="-nonightly-suffix" unless="NIGHTLY">
|
||||
@@ -293,7 +293,20 @@
|
||||
<arg value="rev-parse"/>
|
||||
<arg value="HEAD"/>
|
||||
</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 shorttag:${GITSHORTTAG}"/>
|
||||
<echo message="Version: ${VERSION}"/>
|
||||
</target>
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@ public class ApplicationInfo {
|
||||
build = prop.getProperty("build");
|
||||
nightly = prop.getProperty("nightly").equals("true");
|
||||
if (nightly) {
|
||||
version = version + " nightly build " + build;
|
||||
version = version + " nightly build " + build.substring(0,7);
|
||||
}
|
||||
} catch (IOException | NullPointerException ex) {
|
||||
//ignore
|
||||
|
||||
Reference in New Issue
Block a user