From 1a8c4700aa9c6e88b5b2357b4c8ff0cfe65e9cc6 Mon Sep 17 00:00:00 2001 From: xjboss Date: Sat, 22 Jul 2017 23:49:54 +0800 Subject: [PATCH] Change version start at 1 and change mainfast KCauldron to KCauldronX and using the jenkins's build ID --- build.gradle | 29 ++++++++++++++------------ src/main/java/kcauldron/KCauldron.java | 12 +++++------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/build.gradle b/build.gradle index c069b7d..1dc548b 100644 --- a/build.gradle +++ b/build.gradle @@ -57,7 +57,7 @@ minecraft { srgExtra "PK: org/bukkit/craftbukkit org/bukkit/craftbukkit/v1_7_R4" } -group = 'pw.prok' +group = 'pw.yumc' ext.buildInfoCached = null; def buildInfo(String key) { @@ -96,11 +96,12 @@ def gitInfo(String key) { } return key ? gitInfoCached[key] : gitInfoCached; } - +ext.sys= System.properties ext.mcVersion = "1.7.10" ext.forgeVersion = VersionParser.parseForgeRevision(file('src/main/resources/fmlversion.properties')) -ext.revision = project.hasProperty('revision') ? project.getProperty('revision') : buildInfo('nextBuildNumber') -version = "${mcVersion}-${forgeVersion}.${revision}" +ext.build = sys.hasProperty('BUILD_NUMBER') ? sys.getProperty('BUILD_NUMBER') : "Unkonwn" +ext.kcx_version = 1 +version = "${mcVersion}-${forgeVersion}-${kcx_version}.${build}" if (project.hasProperty('officialBuild')) println "Updated KCauldron version: ${version}" launch4j { @@ -169,13 +170,13 @@ def generateClasspath(boolean legacy = false) { def generateManifest(boolean legacy = false) { [ - 'KCauldron-Git-Branch' : gitInfo('branch'), - 'KCauldron-Git-Hash' : gitInfo('fullHash'), - 'KCauldron-Group' : project.group, - 'KCauldron-Channel' : project.name, - 'KCauldron-Version' : project.version, - 'KCauldron-Legacy' : legacy, - 'KCauldron-Official' : project.hasProperty('officialBuild'), + 'KCauldronX-Git-Branch' : gitInfo('branch'), + 'KCauldronX-Git-Hash' : gitInfo('fullHash'), + 'KCauldronX-Group' : project.group, + 'KCauldronX-Channel' : project.name, + 'KCauldronX-Version' : project.version, + 'KCauldronX-Legacy' : legacy, + 'KCauldronX-Official' : sys.hasProperty('officialBuild'), 'Implementation-Vendor' : 'Prototik', 'Implementation-Title' : project.name, 'Implementation-Version': '1.7.10-R0.1-SNAPSHOT', @@ -206,12 +207,14 @@ tasks.packageInstaller.onlyIf { false } task packageChangelog(type: CreateChangelog) { onlyIf { project.hasProperty('officialBuild') } + /* classifier = 'changelog' extension = 'txt' oldChangelogUrl = "https://repo.prok.pw/${project.group.replace('.', '/')}/${project.name}/${buildInfo('version')}/${project.name}-${buildInfo('version')}-changelog.txt" hash = gitInfo('hash') message = gitInfo('message') version = project.version + */ } task bundleStub(type: Jar) { @@ -263,7 +266,7 @@ def getSignatureFiles = { [archive: signedJar, classifier: null, extension: 'jar.asc'] ] } - +/* publishing { repositories { maven { @@ -294,7 +297,7 @@ publishing { } } } - +*/ tasks.generateProjectCauldron { doLast { def file = new File('eclipse/cauldron/build.gradle') diff --git a/src/main/java/kcauldron/KCauldron.java b/src/main/java/kcauldron/KCauldron.java index 9430ead..6561386 100644 --- a/src/main/java/kcauldron/KCauldron.java +++ b/src/main/java/kcauldron/KCauldron.java @@ -29,7 +29,7 @@ public class KCauldron { while (resources.hasMoreElements()) { URL url = resources.nextElement(); manifest.load(url.openStream()); - String version = manifest.getProperty("KCauldron-Version"); + String version = manifest.getProperty("KCauldronX-Version"); if (version != null) { String path = url.getPath(); String jarFilePath = path.substring(path.indexOf(":") + 1, @@ -38,11 +38,11 @@ public class KCauldron { sServerLocation = new File(jarFilePath); sCurrentVersion = version; - sGroup = manifest.getProperty("KCauldron-Group"); - sBranch = manifest.getProperty("KCauldron-Branch"); - sChannel = manifest.getProperty("KCauldron-Channel"); - sLegacy = Boolean.parseBoolean(manifest.getProperty("KCauldron-Legacy")); - sOfficial = Boolean.parseBoolean(manifest.getProperty("KCauldron-Official")); + sGroup = manifest.getProperty("KCauldronX-Group"); + sBranch = manifest.getProperty("KCauldronX-Branch"); + sChannel = manifest.getProperty("KCauldronX-Channel"); + sLegacy = Boolean.parseBoolean(manifest.getProperty("KCauldronX-Legacy")); + sOfficial = Boolean.parseBoolean(manifest.getProperty("KCauldronX-Official")); break; } manifest.clear();