Droog71
/
Terasology
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge PR #2104 - logistics

develop
Rasmus Praestholm 2016-01-02 03:19:37 -05:00
parent 1be6d813d5 e06de34826
commit 5e855b8e6e
11 changed files with 48 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -15,6 +15,7 @@ gradle.properties
modules/Core/Core.iml
modules/CoreSampleGameplay/CoreSampleGameplay.iml
facades/PC/PC.iml
facades/TeraEd/TeraEd.iml
engine/engine.iml
engine-tests/engine-tests.iml
/*.iml

14
build.gradle
View File

@ -25,20 +25,18 @@ import org.ajoberstar.gradle.git.tasks.*
buildscript {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/jfrog/jfrog-jars'
}
jcenter()
}
dependencies {
// Artifactory plugin
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.2.3')
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.0.0')
// Git plugin for Gradle
classpath 'org.ajoberstar:gradle-git:0.6.3'
// Needed for caching reflected data during builds
classpath 'org.reflections:reflections:0.9.9'
classpath 'org.reflections:reflections:0.9.10'
classpath 'dom4j:dom4j:1.6.1'
}
}
@ -51,13 +49,13 @@ buildscript {
* 4. Comment 'wrapper' task
*/
//task wrapper(type: Wrapper) {
// gradleVersion = '2.1'
// gradleVersion = '2.10'
//}
import org.apache.tools.ant.filters.FixCrLfFilter;
// Test for right version of Java in use for running this script
assert org.gradle.api.JavaVersion.current().isJava7Compatible()
assert org.gradle.api.JavaVersion.current().isJava8Compatible()
// Declare "extra properties" (variables) for the project (and subs) - a Gradle thing that makes them special.
ext {
@ -77,7 +75,7 @@ repositories {
mavenCentral()
// MovingBlocks Artifactory instance for libs not readily available elsewhere plus our own libs
maven {
url "http://artifactory.terasology.org:8081/artifactory/virtual-repo-live"
url "http://artifactory.terasology.org/artifactory/virtual-repo-live"
}
}

27
config/gradle/artifactory.gradle
View File

@ -4,24 +4,9 @@ apply from: "$rootDir/config/gradle/common.gradle"
// Artifactory publishing requires these (without maven we'd get no .pom with dependency info published)
apply plugin: 'maven'
apply plugin: 'artifactory-publish'
apply plugin: "com.jfrog.artifactory"
apply plugin: 'maven-publish'
// Dependencies needed for what our Gradle scripts themselves use
buildscript {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/jfrog/jfrog-jars'
}
}
dependencies {
// This grabs the Artifactory plugin jars
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.2.3')
}
}
// This configures what we need to interact with the MovingBlocks Artifactory instance. It is primarily for local use.
// In Jenkins the Artifactory plugin can supply overrides for the following values
artifactory {
@ -33,10 +18,10 @@ artifactory {
// The repoKey can be overridden in Jenkins and via local gradle.properties if desired for testing
if (rootProject.hasProperty("artifactoryPublishRepo")) {
repoKey = artifactoryPublishRepo
//println "setting PUBLISH repoKey to $artifactoryPublishRepo"
println "Changing PUBLISH repoKey to $artifactoryPublishRepo"
} else {
repoKey = 'terasology-snapshot-local'
//println "PUBLISH repoKey is terasology-snapshot-local"
println "PUBLISH repoKey is terasology-snapshot-local (default value)"
}
// User and pass are overridden in Jenkins. You can supply your own for manual use in a local prop file, such as gradle.properties
@ -61,10 +46,10 @@ artifactory {
// The repoKey can be overridden in Jenkins and via local gradle.properties if desired for testing
if (rootProject.hasProperty("artifactoryResolveRepo")) {
repoKey = artifactoryResolveRepo
//println "setting RESOLVE repoKey to $artifactoryResolveRepo"
println "Changing RESOLVE repoKey to $artifactoryResolveRepo"
} else {
repoKey = 'virtual-repo-live'
//println "RESOLVE repoKey is repo"
println "RESOLVE repoKey is virtual-repo-live (default value)"
}
}
}
@ -103,4 +88,6 @@ publishing {
// Technically the plain "jar" both here and above is included automatically, but leaving it explicit for clarity
artifactoryPublish {
dependsOn jar, sourceJar, javadocJar
// TODO: After Gradle 2.3 to 2.10 upgrade have to use `gradlew generatePomFileForMavenJavaPublication artifactoryPublish`
// The generation task doesn't happen on its own yet can't be set as a dependsOn as it isn't available yet?
}

14
config/gradle/common.gradle
View File

@ -36,9 +36,9 @@ repositories {
}
dependencies {
checkstyle ('com.puppycrawl.tools:checkstyle:6.5')
pmd ('net.sourceforge.pmd:pmd-core:5.3.3')
pmd ('net.sourceforge.pmd:pmd-java:5.3.3')
checkstyle ('com.puppycrawl.tools:checkstyle:6.14.1')
pmd ('net.sourceforge.pmd:pmd-core:5.4.1')
pmd ('net.sourceforge.pmd:pmd-java:5.4.1')
// the FindBugs version is set in the configuration
}
@ -78,16 +78,16 @@ test {
}
jacoco {
toolVersion = "0.7.4.201502262128"
toolVersion = "0.7.5.201505241946"
}
jacocoTestReport {
dependsOn test // Despite doc saying this should be automatic we need to explicitly add it anyway :-(
reports {
// We only use the .exec report for display in Jenkins and such. More could be enabled if desired.
xml.enabled false
// Used to be exec, but that had a binary incompatibility between JaCoCo 0.7.4 and 0.7.5 and issues with some plugins
xml.enabled true
csv.enabled false
html.enabled false
html.enabled true
}
}

32
engine/build.gradle
View File

@ -2,18 +2,16 @@
// Get the gradle versioneye plugin from the plugins.gradle.org repo
plugins {
id "org.standardout.versioneye" version "1.0.0"
id "org.standardout.versioneye" version "1.1.0"
}
// Grab all the common stuff like plugins to use, artifact repositories, code analysis config, etc
apply from: "$rootDir/config/gradle/artifactory.gradle"
import groovy.json.JsonSlurper
import org.apache.tools.ant.filters.FixCrLfFilter
import org.reflections.Reflections;
import org.reflections.scanners.SubTypesScanner;
import org.reflections.scanners.TypeAnnotationsScanner;
import org.reflections.util.ConfigurationBuilder;
import java.text.SimpleDateFormat;
@ -91,11 +89,11 @@ configurations.all {
dependencies {
// Storage and networking
compile group: 'com.google.guava', name: 'guava', version: '18.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.3.1'
compile group: 'com.google.guava', name: 'guava', version: '19.0'
compile group: 'com.google.code.gson', name: 'gson', version: '2.5'
compile group: 'com.google.protobuf', name: 'protobuf-java', version: '2.6.1'
compile group: 'net.sf.trove4j', name: 'trove4j', version: '3.0.3'
compile group: 'io.netty', name: 'netty', version: '3.10.4.Final'
compile group: 'io.netty', name: 'netty', version: '3.10.5.Final'
// Java magic
compile group: 'net.java.dev.jna', name: 'jna-platform', version: '4.2.1'
@ -107,12 +105,12 @@ dependencies {
compile group: 'org.lwjgl.lwjgl', name: 'lwjgl', version: LwjglVersion
compile group: 'org.lwjgl.lwjgl', name: 'lwjgl_util', version: LwjglVersion
compile group: 'java3d', name: 'vecmath', version: '1.3.1' // Note: Downgraded to this release until TeraMath ready
compile group: 'org.abego.treelayout', name: 'org.abego.treelayout.core', version: '1.0.2'
compile group: 'org.abego.treelayout', name: 'org.abego.treelayout.core', version: '1.0.3'
compile group: 'com.miglayout', name: 'miglayout-core', version: '5.0'
compile group: 'de.matthiasmann.twl', name: 'PNGDecoder', version: '1111'
// Logging and audio
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.9'
compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.13'
compile group: 'com.projectdarkstar.ext.jorbis', name: 'jorbis', version: '0.0.17'
// Small-time 3rd party libs we've stored in our Artifactory for access
@ -133,7 +131,7 @@ dependencies {
compile group: 'org.terasology', name: 'CrashReporter', version: '2.1.0'
runtime group: 'ch.qos.logback', name: 'logback-classic', version: '1.1.3'
runtime group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.12'
runtime group: 'org.slf4j', name: 'jul-to-slf4j', version: '1.7.13'
// In addition to all the above the dev source set also needs to depend on what gets compiled in main
devCompile sourceSets.main.output
@ -155,14 +153,14 @@ task cacheReflections {
inputs.files project.classes.outputs.files
dependsOn classes
doLast {
// Without the .mkdirs() we might hit a scenario where the classes dir doesn't exist yet
file(sourceSets.main.output.classesDir.toString()).mkdirs()
Reflections reflections = new org.reflections.Reflections(new org.reflections.util.ConfigurationBuilder()
.addUrls(configurations.compile.collect { it.toURI().toURL()} + sourceSets.main.output.classesDir.toURI().toURL())
.setScanners(new TypeAnnotationsScanner(), new SubTypesScanner()))
reflections.save(sourceSets.main.output.classesDir.toString() + "/reflections.cache")
}
doLast {
// Without the .mkdirs() we might hit a scenario where the classes dir doesn't exist yet
file(sourceSets.main.output.classesDir.toString()).mkdirs()
Reflections reflections = new org.reflections.Reflections(new org.reflections.util.ConfigurationBuilder()
.addUrls(configurations.compile.collect { it.toURI().toURL()} + sourceSets.main.output.classesDir.toURI().toURL())
.setScanners(new TypeAnnotationsScanner(), new SubTypesScanner()))
reflections.save(sourceSets.main.output.classesDir.toString() + "/reflections.cache")
}
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Tue Apr 21 17:45:12 CEST 2015
#Thu Dec 31 10:21:27 CET 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-bin.zip

10
gradlew vendored
View File

@ -42,11 +42,6 @@ case "`uname`" in
;;
esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
@ -61,9 +56,9 @@ while [ -h "$PRG" ] ; do
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >&-
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >&-
cd "$SAVED" >/dev/null
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@ -114,6 +109,7 @@ fi
if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

8
modules/Core/build.gradle
View File

@ -17,20 +17,18 @@ import org.reflections.util.ConfigurationBuilder;
buildscript {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/jfrog/jfrog-jars'
}
jcenter()
}
dependencies {
// Artifactory plugin
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.2.3')
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.0.0')
// Git plugin for Gradle
classpath 'org.ajoberstar:gradle-git:0.6.3'
// Needed for caching reflected data during builds
classpath 'org.reflections:reflections:0.9.9'
classpath 'org.reflections:reflections:0.9.10'
classpath 'dom4j:dom4j:1.6.1'
}
}

8
modules/CoreSampleGameplay/build.gradle
View File

@ -17,20 +17,18 @@ import org.reflections.util.ConfigurationBuilder;
buildscript {
repositories {
mavenCentral()
maven {
url 'http://dl.bintray.com/jfrog/jfrog-jars'
}
jcenter()
}
dependencies {
// Artifactory plugin
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '2.2.3')
classpath(group: 'org.jfrog.buildinfo', name: 'build-info-extractor-gradle', version: '4.0.0')
// Git plugin for Gradle
classpath 'org.ajoberstar:gradle-git:0.6.3'
// Needed for caching reflected data during builds
classpath 'org.reflections:reflections:0.9.9'
classpath 'org.reflections:reflections:0.9.10'
classpath 'dom4j:dom4j:1.6.1'
}
}

2
templates/facades.gradle
View File

@ -8,7 +8,7 @@ apply plugin: 'pmd'
repositories {
mavenCentral()
maven {
url "http://artifactory.terasology.org:8081/artifactory/repo"
url "http://artifactory.terasology.org/artifactory/repo"
}
}