mirror of
https://github.com/GTNewHorizons/Chisel.git
synced 2026-11-17 11:15:07 +00:00
Fix buildscript for dev builds and unify version variable
This commit is contained in:
1 parent
64fb6be33a
commit
e5b72a2805
4 files changed
+24
-16
No files matched your search
+11
-11
@@ -26,21 +26,21 @@ import org.ajoberstar.grgit.Grgit
|
||||
def repo = Grgit.open(project.file('.'))
|
||||
project.ext.gitHash = repo.log().find().abbreviatedId
|
||||
|
||||
boolean dev = System.getenv('chisel_dev') != null && System.getenv('chisel_dev').equals('TRUE')
|
||||
|
||||
ext.buildnumber = 0
|
||||
project.buildnumber = System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : project.ext.gitHash
|
||||
project.buildnumber = !dev && System.getenv('BUILD_NUMBER') != null ? System.getenv('BUILD_NUMBER') : project.ext.gitHash
|
||||
|
||||
version = "${mod_version}.${buildnumber}"
|
||||
group = "com.cricketcraft.chisel" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
|
||||
archivesBaseName = "Chisel2"
|
||||
|
||||
println("${version}")
|
||||
archivesBaseName = dev ? "Chisel2_DEV" : "Chisel2"
|
||||
|
||||
minecraft {
|
||||
version = "1.7.10-10.13.2.1277"
|
||||
version = "${minecraft_version}-${forge_version}"
|
||||
runDir = "run"
|
||||
|
||||
replaceIn "Chisel.java"
|
||||
replace "@MOD_VERSION@", project.version
|
||||
replace "@VERSION@", project.version
|
||||
}
|
||||
|
||||
repositories {
|
||||
@@ -56,11 +56,11 @@ repositories {
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compile "mcp.mobius.waila:Waila:1.5.3_1.7.10:dev"
|
||||
compile "codechicken:CodeChickenLib:1.7.10-1.1.1.95:dev"
|
||||
compile "codechicken:CodeChickenCore:1.7.10-1.0.2.11:dev"
|
||||
compile "codechicken:NotEnoughItems:1.7.10-1.0.2.26:dev"
|
||||
compile "codechicken:ForgeMultipart:1.7.10-1.1.0.297:dev"
|
||||
compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev"
|
||||
compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev"
|
||||
compile "codechicken:CodeChickenCore:${minecraft_version}-${ccc_version}:dev"
|
||||
compile "codechicken:NotEnoughItems:${minecraft_version}-${nei_version}:dev"
|
||||
compile "codechicken:ForgeMultipart:${minecraft_version}-${fmp_version}:dev"
|
||||
}
|
||||
|
||||
processResources
|
||||
|
||||
+10
-2
@@ -1,3 +1,11 @@
|
||||
mod_version = 2.2.2
|
||||
mod_version=2.2.2
|
||||
minecraft_version=1.7.10
|
||||
forge_version=10.13.2.1277
|
||||
|
||||
projectId = '225236'
|
||||
waila_version=1.5.3
|
||||
ccl_version=1.1.1.95
|
||||
ccc_version=1.0.2.11
|
||||
nei_version=1.0.2.26
|
||||
fmp_version=1.1.0.297
|
||||
|
||||
projectId='225236'
|
||||
@@ -66,7 +66,7 @@ public class Chisel {
|
||||
public static final String MOD_ID = "chisel";
|
||||
public static final BlockCarvable.SoundType soundTempleFootstep = new BlockCarvable.SoundType("dig.stone", MOD_ID + ":step.templeblock", 1.0f, 1.0f);
|
||||
public static final String MOD_NAME = "Chisel 2";
|
||||
public static final String VERSION = "2.2.2";
|
||||
public static final String VERSION = "@VERSION@";
|
||||
public static final BlockCarvable.SoundType soundHolystoneFootstep = new BlockCarvable.SoundType("holystone", 1.0f, 1.0f);
|
||||
public static final BlockCarvable.SoundType soundMetalFootstep = new BlockCarvable.SoundType("metal", 1.0f, 1.0f);
|
||||
public static boolean multipartLoaded = false;
|
||||
|
||||
@@ -3,8 +3,8 @@
|
||||
"modid": "chisel",
|
||||
"name": "Chisel",
|
||||
"description": "A mod that adds in many fancy blocks for decoration, which are crafted utilising the Chisel.",
|
||||
"version": "2.0",
|
||||
"mcversion": "1.7.10",
|
||||
"version": "${version}",
|
||||
"mcversion": "${mcversion}",
|
||||
"url": "http://www.minecraftforum.net/forums/thread/1294901",
|
||||
"updateUrl": "",
|
||||
"authorList": [ "AUTOMATIC_MAIDEN", "Pokefenn", "Cricket", "tterrag" ],
|
||||
|
||||
Reference in new issue
Block a user