Skip to content

Commit

Permalink
Merge PR #30 by @Cervator - make CrashReporter embeddable.
Browse files Browse the repository at this point in the history
  • Loading branch information
Cervator committed Jul 30, 2016
2 parents aa88665 + b324508 commit 470f135
Show file tree
Hide file tree
Showing 68 changed files with 46 additions and 24 deletions.
8 changes: 7 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
// For generating IntelliJ project files
apply plugin: 'idea'

task wrapper(type: Wrapper) {
gradleVersion = '2.9'
}

allprojects {
// Using this instead of allprojects allows this project to be embedded yet not affect parent projects
group = 'org.terasology'
subprojects {
group = 'org.terasology'
}

File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
13 changes: 13 additions & 0 deletions cr-destsol/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'eclipse'
apply plugin: 'idea'

dependencies {
// Using the parent's path here to allow the CR to be embedded deeper in a Terasology workspace
String crCorePath = parent.path + ":cr-core"
// If we're in a standalone workspace we'll end up with "::cr-core" so fix real quick
crCorePath = crCorePath.replaceAll('::', ':')
println "cr-destsol is setting its cr-core dependency using path " + crCorePath
compile project(crCorePath)
}
13 changes: 13 additions & 0 deletions cr-terasology/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apply plugin: 'java'
apply plugin: 'maven'
apply plugin: 'eclipse'
apply plugin: 'idea'

dependencies {
// Using the parent's path here to allow the CR to be embedded deeper in a Terasology workspace
String crCorePath = parent.path + ":cr-core"
// If we're in a standalone workspace we'll end up with "::cr-core" so fix real quick
crCorePath = crCorePath.replaceAll('::', ':')
println "cr-terasology is setting its cr-core dependency using path " + crCorePath
compile project(crCorePath)
}
8 changes: 0 additions & 8 deletions destsol/build.gradle

This file was deleted.

20 changes: 13 additions & 7 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
rootProject.name = 'CrashReporter'
include 'core'
include 'terasology'
include 'destsol'
// Check to see if CR is embedded within Terasology, if so use nested paths
println "rootProject for CrashReporter is: " + rootProject.name

project(":core").name = "CrashReporter-core"
project(":terasology").name = "CrashReporter-terasology"
project(":destsol").name = "CrashReporter-destsol"
if (rootProject.name == 'Terasology') {
println "CrashReporter is embedded within Terasology, using nested paths"
include ':libs:CrashReporter:cr-core'
include ':libs:CrashReporter:cr-destsol'
include ':libs:CrashReporter:cr-terasology'
} else {
println "CrashReporter is running standalone so using simple paths for includes"
include 'cr-core'
include 'cr-destsol'
include 'cr-terasology'
}
8 changes: 0 additions & 8 deletions terasology/build.gradle

This file was deleted.

0 comments on commit 470f135

Please sign in to comment.