Reverted to old build script temporarily
This commit is contained in:
parent
4bce8a8fe0
commit
beb69e8531
4 changed files with 197 additions and 181 deletions
140
build-moduarlized.gradle
Normal file
140
build-moduarlized.gradle
Normal file
|
@ -0,0 +1,140 @@
|
||||||
|
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'
|
||||||
|
|
||||||
|
ext.buildProps = file "build.properties"
|
||||||
|
|
||||||
|
buildProps.withReader {
|
||||||
|
def prop = new Properties()
|
||||||
|
prop.load(it)
|
||||||
|
ext.config = new ConfigSlurper().parse prop
|
||||||
|
}
|
||||||
|
|
||||||
|
group = "resonant-induction"
|
||||||
|
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}"
|
||||||
|
}
|
||||||
|
|
||||||
|
allprojects {
|
||||||
|
apply plugin: 'java'
|
||||||
|
|
||||||
|
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 'CB FS'
|
||||||
|
artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[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'
|
||||||
|
}
|
||||||
|
|
||||||
|
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.setUseRetroGuard(true)
|
||||||
|
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}"
|
||||||
|
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 "apiZip", "copyBuildXml", "createChangelog"
|
|
@ -1,84 +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'
|
|
||||||
|
|
||||||
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 'CB FS'
|
|
||||||
artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[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'
|
|
||||||
}
|
|
148
build.gradle
148
build.gradle
|
@ -10,131 +10,85 @@ buildscript {
|
||||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
|
classpath 'net.minecraftforge.gradle:ForgeGradle:1.0-SNAPSHOT'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'forge'
|
apply plugin: 'forge'
|
||||||
apply plugin: 'maven-publish'
|
|
||||||
|
sourceSets {
|
||||||
|
main {
|
||||||
|
java {
|
||||||
|
include 'archaic/src/main/java/**'
|
||||||
|
include 'electrical/src/main/java/**'
|
||||||
|
include 'mechanical/src/main/java/**'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ext.buildProps = file "build.properties"
|
ext.buildProps = file "build.properties"
|
||||||
|
|
||||||
buildProps.withReader {
|
buildProps.withReader {
|
||||||
def prop = new Properties()
|
def prop = new Properties()
|
||||||
prop.load(it)
|
prop.load(it)
|
||||||
ext.config = new ConfigSlurper().parse prop
|
ext.config = new ConfigSlurper().parse prop
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "resonant-induction"
|
version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}"
|
||||||
|
group = "resonantinduction"
|
||||||
archivesBaseName = "Resonant-Induction"
|
archivesBaseName = "Resonant-Induction"
|
||||||
|
|
||||||
minecraft {
|
minecraft {
|
||||||
version = "${rootProject.config.version.minecraft}-${rootProject.config.version.forge}"
|
version = "${config.version.minecraft}-${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}"
|
|
||||||
}
|
|
||||||
|
|
||||||
allprojects {
|
|
||||||
apply plugin: 'java'
|
|
||||||
|
|
||||||
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 'CB FS'
|
|
||||||
artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[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'
|
|
||||||
}
|
|
||||||
|
|
||||||
jar {
|
|
||||||
classifier = project.name
|
|
||||||
dependsOn ":copyBuildXml"
|
|
||||||
destinationDir = file (rootProject.getRootDir().getPath() + '/output')
|
|
||||||
}
|
|
||||||
|
|
||||||
publishing {
|
replaceIn "Reference.java"
|
||||||
publications {
|
replace "@MAJOR@", config.version.mod.major
|
||||||
mavenJava(MavenPublication) {
|
replace "@MINOR@", config.version.mod.minor
|
||||||
artifact jar
|
replace "@REVIS@", config.version.mod.revis
|
||||||
}
|
replace "@BUILD@", System.getenv("BUILD_NUMBER")
|
||||||
}
|
|
||||||
repositories {
|
|
||||||
maven {
|
|
||||||
url "file://var/www/maven"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
subprojects {
|
if (System.getenv("BUILD_NUMBER") != null)
|
||||||
archivesBaseName = "Resonant-Induction"
|
version += ".${System.getenv("BUILD_NUMBER")}"
|
||||||
|
|
||||||
dependencies {
|
|
||||||
compile rootProject
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.tasks.reobf {
|
|
||||||
reobf.setUseRetroGuard(true)
|
|
||||||
reobf(tasks.jar) { spec ->
|
|
||||||
spec.classpath = sourceSets.main.compileClasspath
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
processResources {
|
processResources {
|
||||||
from 'build.properties'
|
from 'build.properties'
|
||||||
}
|
}
|
||||||
|
|
||||||
task copyBuildXml(type: Copy) {
|
task copyBuildXml(type: Copy) {
|
||||||
from 'build.properties'
|
from 'build.properties'
|
||||||
into 'output'
|
into 'output'
|
||||||
}
|
}
|
||||||
|
|
||||||
task apiZip(type: Zip) {
|
task apiZip(type: Zip) {
|
||||||
classifier = 'api'
|
classifier = 'api'
|
||||||
from sourceSets*.allSource
|
from sourceSets*.allSource
|
||||||
include 'resonantinduction/api/**'
|
include 'resonantinduction/api/**'
|
||||||
destinationDir = file 'output'
|
destinationDir = file 'output'
|
||||||
}
|
}
|
||||||
|
|
||||||
artifacts {
|
artifacts {
|
||||||
archives apiZip
|
archives apiZip
|
||||||
}
|
}
|
||||||
|
|
||||||
import net.minecraftforge.gradle.tasks.dev.ChangelogTask
|
jar {
|
||||||
import net.minecraftforge.gradle.common.Constants
|
dependsOn copyBuildXml
|
||||||
import net.minecraftforge.gradle.delayed.*
|
classifier = ''
|
||||||
|
destinationDir = file 'output'
|
||||||
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 "apiZip", "copyBuildXml", "createChangelog"
|
repositories {
|
||||||
|
maven {
|
||||||
|
name 'Calclavia Maven'
|
||||||
|
url 'http://calclavia.com/maven'
|
||||||
|
}
|
||||||
|
|
||||||
|
ivy {
|
||||||
|
name 'CB FS'
|
||||||
|
artifactPattern "http://files.minecraftforge.net/[module]/[module]-dev-[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'
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,6 @@
|
||||||
|
package resonantinduction.mechanical.logistic;
|
||||||
|
|
||||||
|
public class TileRailing
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in a new issue