From 5ff76a39b72f8abe5679373db48c9c2c0edff279 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Wed, 26 Feb 2014 17:26:36 +0800 Subject: [PATCH] Reverted scripts as obfuscation doesn't work --- build-module.gradle | 144 ++++++++++++++++++++++++++++++++++++++ build-old.gradle | 137 ------------------------------------- build.gradle | 163 +++++++++++++++++++++----------------------- 3 files changed, 222 insertions(+), 222 deletions(-) create mode 100644 build-module.gradle delete mode 100644 build-old.gradle diff --git a/build-module.gradle b/build-module.gradle new file mode 100644 index 00000000..d9591527 --- /dev/null +++ b/build-module.gradle @@ -0,0 +1,144 @@ +buildscript { + repositories { + mavenCentral() + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + } +} + +apply plugin: 'forge' +apply plugin: 'maven' +apply plugin: 'maven-publish' + +ext.buildProps = file "build.properties" + +buildProps.withReader { + def prop = new Properties() + prop.load(it) + ext.config = new ConfigSlurper().parse prop +} + +group = "resonantinduction" +archivesBaseName = "Resonant-Induction" + +minecraft { + version = "${rootProject.config.version.minecraft}-${rootProject.config.version.forge}" + + replaceIn "Reference.java" + replace "@MAJOR@", rootProject.config.version.mod.major + replace "@MINOR@", rootProject.config.version.mod.minor + replace "@REVIS@", rootProject.config.version.mod.revis + replace "@BUILD@", "${System.getenv().BUILD_NUMBER}" +} + +subprojects*.apply plugin: 'java' + +allprojects { + version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}" + + if (System.getenv("BUILD_NUMBER") != null) + version += ".${System.getenv("BUILD_NUMBER")}" + + repositories { + maven { + name 'Calclavia Maven' + url 'http://calclavia.com/maven' + } + maven { + name = "forge" + url = "http://files.minecraftforge.net/maven" + } + ivy { + name 'FMP' + artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" + } + ivy { + artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" + } + mavenCentral() + } + + dependencies { + compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${rootProject.config.version.universalelectricity}", classifier: "dev" + compile group: 'calclaviacore', name: 'calclavia-core', version: "${rootProject.config.version.calclaviacore}", classifier: "dev" + compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar' + compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar' + compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar' + } + + jar { + classifier = project.name + dependsOn ":copyBuildXml" + destinationDir = file (rootProject.getRootDir().getPath() + '/output') + } + + publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + } + } + repositories { + maven { + url "file://var/www/maven" + } + } + } +} + +subprojects { + archivesBaseName = "Resonant-Induction" + + dependencies { + compile rootProject + } + + rootProject.tasks.reobf { + reobf(tasks.jar) { spec -> + spec.classpath = sourceSets.main.compileClasspath + } + } +} + +processResources { + from 'build.properties' +} + +task copyBuildXml(type: Copy) { + from 'build.properties' + into 'output' +} + +task apiZip(type: Zip) { + classifier = 'api' + from sourceSets*.allSource + include 'resonantinduction/api/**' + destinationDir = file 'output' +} + +artifacts { + archives apiZip +} + +import net.minecraftforge.gradle.tasks.dev.ChangelogTask +import net.minecraftforge.gradle.common.Constants +import net.minecraftforge.gradle.delayed.* + +task createChangelog(type: ChangelogTask) { + def jobName = "${System.getenv().JOB_NAME}" + def buildNumber = "${System.getenv().BUILD_NUMBER}" + + setServerRoot(new DelayedString(project, 'http://ci.calclavia.com/')) + setJobName(new DelayedString(project, jobName.toString())); + setAuthName(new DelayedString(project, 'console_script')); + setAuthPassword(new DelayedString(project, '625d2ac53190be3422faa0c474fb299b')); + setTargetBuild({buildNumber.toString()}); + setOutput(new DelayedFile(project, 'output/' + jobName + "-${project.version}" + '-changelog' + '.txt')); +} + +build.dependsOn "apiZip", "copyBuildXml", "createChangelog" diff --git a/build-old.gradle b/build-old.gradle deleted file mode 100644 index b823113d..00000000 --- a/build-old.gradle +++ /dev/null @@ -1,137 +0,0 @@ -buildscript { - repositories { - mavenCentral() - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' - } -} - -apply plugin: 'forge' -apply plugin: 'maven-publish' - -sourceSets { - main { - java { - srcDirs 'src/main/java', 'archaic/src/main/java', 'electrical/src/main/java', 'mechanical/src/main/java' - //exclude 'resonantinduction/core/nei/**' - } - } -} - -ext.buildProps = file "build.properties" - -buildProps.withReader { - def prop = new Properties() - prop.load(it) - ext.config = new ConfigSlurper().parse prop -} - -version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}" -group = "resonantinduction" -archivesBaseName = "Resonant-Induction" - -minecraft { - version = "${config.version.minecraft}-${config.version.forge}" - - replaceIn "Reference.java" - replace "@MAJOR@", config.version.mod.major - replace "@MINOR@", config.version.mod.minor - replace "@REVIS@", config.version.mod.revis - replace "@BUILD@", System.getenv("BUILD_NUMBER") -} - -if (System.getenv("BUILD_NUMBER") != null) - version += ".${System.getenv("BUILD_NUMBER")}" - - -processResources { - from 'build.properties' -} - -task copyBuildXml(type: Copy) { - from 'build.properties' - into 'output' -} - -task apiZip(type: Zip) { - classifier = 'api' - from sourceSets*.allSource - include 'resonantinduction/api/**' - destinationDir = file 'output' -} - -artifacts { - archives apiZip -} - -jar { - dependsOn copyBuildXml - classifier = '' - destinationDir = file 'output' -} - -repositories { - maven { - name 'Calclavia Maven' - url 'http://calclavia.com/maven' - } - - ivy { - name 'FMP' - artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" - } - - ivy { - artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" - } -} - -dependencies { - compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${config.version.universalelectricity}", classifier: "dev" - compile group: 'calclaviacore', name: 'calclavia-core', version: "${config.version.calclaviacore}", classifier: "dev" - compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar' - compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar' - //compile name: 'NotEnoughItems', version: "1.6.1.8", ext: 'jar' - compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar' -} - -publishing { - publications { - mavenJava(MavenPublication) { - artifact jar - /*artifact apiZip*/ - - artifact { - file 'output/build.properties' - } - } - } - repositories { - maven { - url "file://var/www/maven" - } - } -} - -import net.minecraftforge.gradle.tasks.dev.ChangelogTask -import net.minecraftforge.gradle.common.Constants -import net.minecraftforge.gradle.delayed.* - -task createChangelog(type: ChangelogTask) { - def jobName = "${System.getenv().JOB_NAME}" - def buildNumber = "${System.getenv().BUILD_NUMBER}" - jobName.replaceAll(' ','%20') - setServerRoot(new DelayedString(project, 'http://ci.calclavia.com/')) - setJobName(new DelayedString(project, jobName.toString())); - setAuthName(new DelayedString(project, 'console_script')); - setAuthPassword(new DelayedString(project, '625d2ac53190be3422faa0c474fb299b')); - setTargetBuild({buildNumber.toString()}); - setOutput(new DelayedFile(project, 'output/' + jobName + "-${project.version}" + '-changelog' + '.txt')); -} - -build.dependsOn "createChangelog" \ No newline at end of file diff --git a/build.gradle b/build.gradle index d9591527..b823113d 100644 --- a/build.gradle +++ b/build.gradle @@ -7,124 +7,117 @@ buildscript { } } dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' + classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT' } } apply plugin: 'forge' -apply plugin: 'maven' apply plugin: 'maven-publish' +sourceSets { + main { + java { + srcDirs 'src/main/java', 'archaic/src/main/java', 'electrical/src/main/java', 'mechanical/src/main/java' + //exclude 'resonantinduction/core/nei/**' + } + } +} + ext.buildProps = file "build.properties" - + buildProps.withReader { def prop = new Properties() prop.load(it) ext.config = new ConfigSlurper().parse prop } - + +version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}" group = "resonantinduction" archivesBaseName = "Resonant-Induction" - + minecraft { - version = "${rootProject.config.version.minecraft}-${rootProject.config.version.forge}" - - replaceIn "Reference.java" - replace "@MAJOR@", rootProject.config.version.mod.major - replace "@MINOR@", rootProject.config.version.mod.minor - replace "@REVIS@", rootProject.config.version.mod.revis - replace "@BUILD@", "${System.getenv().BUILD_NUMBER}" -} - -subprojects*.apply plugin: 'java' - -allprojects { - version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}" - - if (System.getenv("BUILD_NUMBER") != null) - version += ".${System.getenv("BUILD_NUMBER")}" - - repositories { - maven { - name 'Calclavia Maven' - url 'http://calclavia.com/maven' - } - maven { - name = "forge" - url = "http://files.minecraftforge.net/maven" - } - ivy { - name 'FMP' - artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" - } - ivy { - artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" - } - mavenCentral() - } - - dependencies { - compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${rootProject.config.version.universalelectricity}", classifier: "dev" - compile group: 'calclaviacore', name: 'calclavia-core', version: "${rootProject.config.version.calclaviacore}", classifier: "dev" - compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar' - compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar' - compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar' - } - - jar { - classifier = project.name - dependsOn ":copyBuildXml" - destinationDir = file (rootProject.getRootDir().getPath() + '/output') - } + version = "${config.version.minecraft}-${config.version.forge}" - publishing { - publications { - mavenJava(MavenPublication) { - artifact jar - } - } - repositories { - maven { - url "file://var/www/maven" - } - } - } -} - -subprojects { - archivesBaseName = "Resonant-Induction" - - dependencies { - compile rootProject - } - - rootProject.tasks.reobf { - reobf(tasks.jar) { spec -> - spec.classpath = sourceSets.main.compileClasspath - } - } + replaceIn "Reference.java" + replace "@MAJOR@", config.version.mod.major + replace "@MINOR@", config.version.mod.minor + replace "@REVIS@", config.version.mod.revis + replace "@BUILD@", System.getenv("BUILD_NUMBER") } +if (System.getenv("BUILD_NUMBER") != null) + version += ".${System.getenv("BUILD_NUMBER")}" + + processResources { from 'build.properties' } - + task copyBuildXml(type: Copy) { from 'build.properties' into 'output' } - + task apiZip(type: Zip) { classifier = 'api' from sourceSets*.allSource include 'resonantinduction/api/**' destinationDir = file 'output' } - + artifacts { archives apiZip } +jar { + dependsOn copyBuildXml + classifier = '' + destinationDir = file 'output' +} + +repositories { + maven { + name 'Calclavia Maven' + url 'http://calclavia.com/maven' + } + + ivy { + name 'FMP' + artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[revision].[ext]" + } + + ivy { + artifactPattern "http://www.chickenbones.craftsaddle.org/Files/New_Versions/1.6.4/[module]-dev%20[revision].[ext]" + } +} + +dependencies { + compile group: 'universalelectricity', name: 'Universal-Electricity', version: "${config.version.universalelectricity}", classifier: "dev" + compile group: 'calclaviacore', name: 'calclavia-core', version: "${config.version.calclaviacore}", classifier: "dev" + compile name: 'CodeChickenLib', version: "${config.version.minecraft}-${config.version.cclib}", ext: 'jar' + compile name: 'ForgeMultipart', version: "${config.version.minecraft}-${config.version.fmp}", ext: 'jar' + //compile name: 'NotEnoughItems', version: "1.6.1.8", ext: 'jar' + compile name: 'NotEnoughItems', version: "${config.version.nei}", ext: 'jar' +} + +publishing { + publications { + mavenJava(MavenPublication) { + artifact jar + /*artifact apiZip*/ + + artifact { + file 'output/build.properties' + } + } + } + repositories { + maven { + url "file://var/www/maven" + } + } +} + import net.minecraftforge.gradle.tasks.dev.ChangelogTask import net.minecraftforge.gradle.common.Constants import net.minecraftforge.gradle.delayed.* @@ -132,7 +125,7 @@ import net.minecraftforge.gradle.delayed.* task createChangelog(type: ChangelogTask) { def jobName = "${System.getenv().JOB_NAME}" def buildNumber = "${System.getenv().BUILD_NUMBER}" - + jobName.replaceAll(' ','%20') setServerRoot(new DelayedString(project, 'http://ci.calclavia.com/')) setJobName(new DelayedString(project, jobName.toString())); setAuthName(new DelayedString(project, 'console_script')); @@ -141,4 +134,4 @@ task createChangelog(type: ChangelogTask) { setOutput(new DelayedFile(project, 'output/' + jobName + "-${project.version}" + '-changelog' + '.txt')); } -build.dependsOn "apiZip", "copyBuildXml", "createChangelog" +build.dependsOn "createChangelog" \ No newline at end of file