LegacyConsoleArchive/jpexs-decompiler
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/jpexs-decompiler.git synced 2026-09-24 19:40:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

versioning fixes

Browse Source
This commit is contained in:
Jindra Petřík
2014-11-11 09:42:00 +01:00
parent 105346cecf
commit 82744bb926
1 changed files with 24 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build_common.xml
+24 -21
View File
@@ -286,7 +286,7 @@
<target name="-set-none-newversion" unless="newversion.type"> <target name="-set-none-newversion" unless="newversion.type">
<property name="newversion.type" value="none"/> <property name="newversion.type" value="none"/>
</target> </target>
<target name="-check-version-online" depends="-set-none-newversion,-timestamp"> <target name="-check-version-online" depends="-set-none-newversion,git-tag">
<loadproperties srcfile="jpexs_website.properties" prefix="website"/> <loadproperties srcfile="jpexs_website.properties" prefix="website"/>
<echo level="info">Checking version online...</echo> <echo level="info">Checking version online...</echo>
<!-- Note: You must have developer account to upload to JPEXS website --> <!-- Note: You must have developer account to upload to JPEXS website -->
@@ -426,12 +426,31 @@
<target name="-suffix" depends="-nightly-suffix,-private-suffix,-no-suffix"> <target name="-suffix" depends="-nightly-suffix,-private-suffix,-no-suffix">
</target> </target>
<target name="-timestamp" depends="-loadversion"> <target name="-timestamp" depends="-loadversion,git-tag">
<tstamp> <tstamp>
<format property="BUILTAT" pattern="MM/dd/yyyy hh:mm aa" timezone="CET"/> <format property="BUILTAT" pattern="MM/dd/yyyy hh:mm aa" timezone="CET"/>
<format property="VERDATE" pattern="yyyyddMM_hhmm" timezone="CET"/> <format property="VERDATE" pattern="yyyyddMM_hhmm" timezone="CET"/>
</tstamp> </tstamp>
<exec executable="git" outputproperty="GITTAG" failonerror="true"> <echo level="info" message="Version: ${VERSION}"/>
</target>
<target name="build_lib">
<ant antfile="${CORELIBSCRIPT}" target="build" inheritAll="false" usenativebasedir="true"/>
<copy file="${CORELIBPATH}" todir="${LIBRARIESDIR}" />
</target>
<target name="clean_lib">
<ant antfile="${CORELIBSCRIPT}" target="clean" inheritAll="false" usenativebasedir="true" />
<delete file="${LIBRARIESDIR}/${CORELIBNAME}" />
</target>
<target name="test_lib">
<ant antfile="${CORELIBSCRIPT}" target="test" inheritAll="false" usenativebasedir="true" />
</target>
<target name="git-tag">
<exec executable="git" outputproperty="GITTAG" failonerror="true">
<arg value="rev-parse"/> <arg value="rev-parse"/>
<arg value="HEAD"/> <arg value="HEAD"/>
</exec> </exec>
@@ -449,22 +468,6 @@
</loadfile> </loadfile>
<echo level="info" message="Git tag:${GITTAG}"/> <echo level="info" message="Git tag:${GITTAG}"/>
<echo level="info" message="Git shorttag:${GITSHORTTAG}"/> <echo level="info" message="Git shorttag:${GITSHORTTAG}"/>
<echo level="info" message="Version: ${VERSION}"/>
</target>
<target name="build_lib">
<ant antfile="${CORELIBSCRIPT}" target="build" inheritAll="false" usenativebasedir="true"/>
<copy file="${CORELIBPATH}" todir="${LIBRARIESDIR}" />
</target>
<target name="clean_lib">
<ant antfile="${CORELIBSCRIPT}" target="clean" inheritAll="false" usenativebasedir="true" />
<delete file="${LIBRARIESDIR}/${CORELIBNAME}" />
</target>
<target name="test_lib">
<ant antfile="${CORELIBSCRIPT}" target="test" inheritAll="false" usenativebasedir="true" />
</target> </target>
<target name="build" depends="-loadversion,build_lib,-timestamp,-suffix,compile"> <target name="build" depends="-loadversion,build_lib,-timestamp,-suffix,compile">
@@ -645,7 +648,7 @@
<target name="new-version-nightlybuild" depends="git-pull,-inc-nightlybuild,-check-version-online,all,-upload,git-push"> <target name="new-version-nightlybuild" depends="git-pull,-inc-nightlybuild,-check-version-online,all,-upload,git-push">
</target> </target>