Anvilcraft/equivalent-exchange-3
2
1
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Added in support for auto-incrementing build numbers into the build script (and code). A nicer way to track what version folks have :)

Browse source
This commit is contained in:
pahimar 2013-04-12 13:01:37 -04:00
parent dad38a11a3
commit ced91d5bf2
6 changed files with 51 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
build.xml
View file

@ -1,53 +1,62 @@
<?xml version="1.0" ?>
<project name="Equivalent Exchange 3">
<property file="build.properties" />
<property file="build.properties" prefix="build"/>
<property file="build_number.properties" prefix="build_number"/>
<target name="increment">
<propertyfile file="build_number.properties">
<entry key="build_number" type="int" operation="+" default="1"/>
</propertyfile>
</target>
<target name="clean">
<delete file="${dir.development}\mcp\src\minecraft\mcmod.info" />
<delete dir="${dir.development}\mcp\src\minecraft\com" />
<delete dir="${dir.development}\mcp\reobf\minecraft" />
<delete file="${build.dir.development}\mcp\src\minecraft\mcmod.info" />
<delete dir="${build.dir.development}\mcp\src\minecraft\com" />
<delete dir="${build.dir.development}\mcp\reobf\minecraft" />
</target>
<target name="build">
<copy todir="${dir.development}\mcp\src\minecraft">
<fileset dir="${dir.development}\source\Equivalent-Exchange-3\ee3_common\" />
<copy todir="${build.dir.development}\mcp\src\minecraft">
<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\ee3_common\" />
</copy>
<replace dir="${dir.development}\mcp\src\minecraft" token="@VERSION@" value="${release.mod.version}" />
<replace dir="${dir.development}\mcp\src\minecraft" token="@FINGERPRINT@" value="${release.mod.fingerprint}" />
<replace dir="${build.dir.development}\mcp\src\minecraft" token="@VERSION@" value="${build.release.mod.version}" />
<replace dir="${build.dir.development}\mcp\src\minecraft" token="@FINGERPRINT@" value="${build.release.mod.fingerprint}" />
<replace dir="${build.dir.development}\mcp\src\minecraft" token="@BUILD_NUMBER@" value="${build_number.build_number}" />
</target>
<target name="recompile">
<exec dir="${dir.development}\mcp" executable="cmd" osfamily="windows">
<exec dir="${build.dir.development}\mcp" executable="cmd" osfamily="windows">
<arg line="/c recompile.bat" />
</exec>
<exec dir="${dir.development}\mcp" executable="bash" osfamily="unix">
<exec dir="${build.dir.development}\mcp" executable="bash" osfamily="unix">
<arg line="recompile.sh" />
</exec>
</target>
<target name="reobfuscate">
<exec dir="${dir.development}\mcp" executable="cmd" osfamily="windows">
<exec dir="${build.dir.development}\mcp" executable="cmd" osfamily="windows">
<arg line="/c reobfuscate_srg.bat" />
</exec>
<exec dir="${dir.development}\mcp" executable="bash" osfamily="unix">
<exec dir="${build.dir.development}\mcp" executable="bash" osfamily="unix">
<arg line="reobfuscate_srg.sh" />
</exec>
</target>
<target name="release-shared">
<!-- Prep for the release -->
<antcall target="increment" />
<antcall target="clean" />
<antcall target="build" />
<antcall target="recompile" />
<antcall target="reobfuscate" />
<!-- Build the jar -->
<mkdir dir="${dir.share}\${release.minecraft.version}\${release.mod.version}" />
<jar destfile="${dir.share}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar">
<fileset dir="${dir.development}\mcp\src\common\" includes="mcmod.info" />
<fileset dir="${dir.development}\mcp\reobf\minecraft" />
<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
<mkdir dir="${build.dir.share}\${build.release.minecraft.version}\${build.release.mod.version}" />
<jar destfile="${build.dir.share}\${build.release.minecraft.version}\${build.release.mod.version}\ee3-universal-${build.release.mod.version}.${build_number.build_number}.jar">
<fileset dir="${build.dir.development}\mcp\src\common\" includes="mcmod.info" />
<fileset dir="${build.dir.development}\mcp\reobf\minecraft" />
<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\resources" />
</jar>
<!-- Clean up the MCP source now that we are done -->
@ -56,21 +65,22 @@
<target name="release">
<!-- Prep for the release -->
<antcall target="increment" />
<antcall target="clean" />
<antcall target="build" />
<antcall target="recompile" />
<antcall target="reobfuscate" />
<!-- Build the jar -->
<mkdir dir="${dir.release}\${release.minecraft.version}\${release.mod.version}" />
<jar destfile="${dir.release}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar">
<fileset dir="${dir.development}\mcp\src\minecraft\" includes="mcmod.info" />
<fileset dir="${dir.development}\mcp\reobf\minecraft" />
<fileset dir="${dir.development}\source\Equivalent-Exchange-3\resources" />
<mkdir dir="${build.dir.release}\${build.release.minecraft.version}\${build.release.mod.version}" />
<jar destfile="${build.dir.release}\${build.release.minecraft.version}\${build.release.mod.version}\ee3-universal-${build.release.mod.version}-${build_number.build_number}.jar">
<fileset dir="${build.dir.development}\mcp\src\minecraft\" includes="mcmod.info" />
<fileset dir="${build.dir.development}\mcp\reobf\minecraft" />
<fileset dir="${build.dir.development}\source\Equivalent-Exchange-3\resources" />
</jar>
<!-- Sign the jar -->
<signjar jar="${dir.release}\${release.minecraft.version}\${release.mod.version}\ee3-universal-${release.mod.version}.jar" keystore="${keystore.location}" alias="${keystore.alias}" storepass="${keystore.password}" />
<signjar jar="${build.dir.release}\${build.release.minecraft.version}\${build.release.mod.version}\ee3-universal-${build.release.mod.version}-${build_number.build_number}.jar" keystore="${build.keystore.location}" alias="${build.keystore.alias}" storepass="${build.keystore.password}" />
<!-- Clean up the MCP source now that we are done -->
<antcall target="clean" />

3
build_number.properties Normal file
View file

@ -0,0 +1,3 @@
#Fri, 12 Apr 2013 12:55:58 -0400
build_number=5

2
ee3_common/com/pahimar/ee3/EquivalentExchange3.java
View file

@ -63,7 +63,7 @@ import cpw.mods.fml.relauncher.Side;
@Mod(
modid = Reference.MOD_ID,
name = Reference.MOD_NAME,
version = Reference.VERSION,
version = Reference.VERSION_NUMBER,
dependencies = Reference.DEPENDENCIES,
certificateFingerprint = Reference.FINGERPRINT)
@NetworkMod(

2
ee3_common/com/pahimar/ee3/command/CommandVersion.java
View file

@ -39,7 +39,7 @@ public class CommandVersion {
private static void processVersionCommand(ICommandSender commandSender) {
commandSender.sendChatToPlayer(VersionHelper.getResultMessageForClient());
commandSender.sendChatToPlayer(VersionHelper.getResultMessage());
}
private static void processChangelogCommand(ICommandSender commandSender) {

13
ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java
View file

@ -80,7 +80,7 @@ public class VersionHelper implements Runnable {
ConfigurationHandler.set(Configuration.CATEGORY_GENERAL, ConfigurationSettings.LAST_DISCOVERED_VERSION_CONFIGNAME, remoteVersion);
}
if (remoteVersion.equals(Reference.VERSION)) {
if (remoteVersion.equalsIgnoreCase(getVersionForCheck())) {
result = CURRENT;
}
else {
@ -109,6 +109,17 @@ public class VersionHelper implements Runnable {
}
}
}
private static String getVersionForCheck() {
String[] versionTokens = Reference.VERSION_NUMBER.split(" ");
if (versionTokens.length >= 1) {
return versionTokens[0];
}
else {
return Reference.VERSION_NUMBER;
}
}
public static void logResult() {

3
ee3_common/com/pahimar/ee3/lib/Reference.java
View file

@ -17,7 +17,7 @@ public class Reference {
/* General Mod related constants */
public static final String MOD_ID = "EE3";
public static final String MOD_NAME = "Equivalent Exchange 3";
public static final String VERSION = "@VERSION@";
public static final String VERSION_NUMBER = "@VERSION@ (build @BUILD_NUMBER@)";
public static final String CHANNEL_NAME = MOD_ID;
public static final String DEPENDENCIES = "required-after:Forge@[7.7.1.650,)";
public static final String FINGERPRINT = "@FINGERPRINT@";
@ -26,6 +26,5 @@ public class Reference {
public static final String SERVER_PROXY_CLASS = "com.pahimar.ee3.core.proxy.CommonProxy";
public static final String CLIENT_PROXY_CLASS = "com.pahimar.ee3.core.proxy.ClientProxy";
public static final int VERSION_CHECK_ATTEMPTS = 3;
public static final float MODEL_TEXTURE_OFFSET = 0.0002F;
}