Replace source directories rather than appending to them

I was confused about the differences among:

	srcDir 'foo'
	srcDirs ['foo']
	srcDirs = ['foo']

As it turns out, the first two append to the set of source
directories, while the last replaces this set entirely.  I generally
want replacement, since WALA's current directory layout never matches
Gradle's assumed defaults.
This commit is contained in:
Ben Liblit 2017-12-26 15:54:35 -06:00
parent 0704a66ab1
commit 5d5fa18b5f
27 changed files with 39 additions and 39 deletions

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'src'
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50'

View File

@ -3,7 +3,7 @@ plugins {
id 'de.undercouch.download' version '3.3.0'
}
sourceSets.test.java.srcDir 'src'
sourceSets.test.java.srcDirs = ['src']
////////////////////////////////////////////////////////////////////////

View File

@ -2,7 +2,7 @@ plugins {
id 'com.github.hauner.jarTest' version '1.0.1'
}
sourceSets.test.java.srcDir 'src'
sourceSets.test.java.srcDirs = ['src']
dependencies {
testCompile 'junit:junit:4.11'

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'src'
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile project(':com.ibm.wala.cast')

View File

@ -1,8 +1,8 @@
sourceSets {
main.java.srcDir 'src'
main.java.srcDirs = ['src']
test {
java.srcDir 'tests'
resources.srcDir project(':com.ibm.wala.cast.js.test.data').file('examples-src')
java.srcDirs = ['tests']
resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
}
}

View File

@ -1,6 +1,6 @@
sourceSets.test {
java.srcDir 'src'
resources.srcDir 'testdata'
java.srcDirs = ['src']
resources.srcDirs = ['testdata']
}
dependencies {

View File

@ -1,6 +1,6 @@
sourceSets.main {
java.srcDir 'src'
resources.srcDir 'dat'
java.srcDirs = ['src']
resources.srcDirs = ['dat']
}
dependencies {

View File

@ -2,7 +2,7 @@ plugins {
id 'com.github.hauner.jarTest' version '1.0.1'
}
sourceSets.test.java.srcDir 'harness-src'
sourceSets.test.java.srcDirs = ['harness-src']
dependencies {
testCompile 'junit:junit:4.11'

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'source'
sourceSets.main.java.srcDirs = ['source']
dependencies {
compile 'org.mozilla:rhino:1.7.7.1'

View File

@ -2,7 +2,7 @@ plugins {
id 'com.github.hauner.jarTest' version '1.0.1'
}
sourceSets.test.java.srcDir 'harness-src'
sourceSets.test.java.srcDirs = ['harness-src']
dependencies {
testCompile 'junit:junit:4.11'

View File

@ -1,6 +1,6 @@
sourceSets.main {
java.srcDir 'source'
resources.srcDir 'dat'
java.srcDirs = ['source']
resources.srcDirs = ['dat']
}
dependencies {

View File

@ -4,7 +4,7 @@ plugins {
apply plugin: 'cpp'
sourceSets.test.java.srcDir 'harness-src/java'
sourceSets.test.java.srcDirs = ['harness-src/java']
dependencies {
testCompile 'junit:junit:4.11'
@ -46,7 +46,7 @@ model {
xlator_test(NativeLibrarySpec) {
sources.cpp {
source {
srcDir 'harness-src/c'
srcDirs = ['harness-src/c']
include 'smoke.cpp'
}
generatedBy tasks.generateJniHeaders
@ -69,7 +69,7 @@ model {
smoke_main(NativeExecutableSpec) {
sources.cpp {
source {
srcDir 'harness-src/c'
srcDirs = ['harness-src/c']
include 'smoke_main.cpp'
}
['cast', 'jdk'].each {

View File

@ -1,6 +1,6 @@
apply plugin: 'cpp'
sourceSets.main.java.srcDir 'source/java'
sourceSets.main.java.srcDirs = ['source/java']
dependencies {
compile 'commons-io:commons-io:2.4'
@ -38,10 +38,10 @@ model {
sources.cpp {
def cSourceDir = 'source/c'
source {
srcDir "$cSourceDir/jni"
srcDirs = ["$cSourceDir/jni"]
include '*.cpp'
}
exportedHeaders.srcDir "$cSourceDir/include"
exportedHeaders.srcDirs = ["$cSourceDir/include"]
lib library: 'jdk'
}
binaries.all {

View File

@ -1 +1 @@
sourceSets.test.java.srcDir 'src'
sourceSets.test.java.srcDirs = ['src']

View File

@ -3,8 +3,8 @@ plugins {
}
sourceSets.test {
java.srcDir 'src'
resources.srcDir 'dat'
java.srcDirs = ['src']
resources.srcDirs = ['dat']
}
dependencies {

View File

@ -1,5 +1,5 @@
sourceSets.main {
java.srcDir 'src'
java.srcDirs = ['src']
resources.srcDirs = [
'dat',
'lib',

View File

@ -1,6 +1,6 @@
sourceSets.test {
java.srcDir 'source'
resources.srcDir 'data'
java.srcDirs = ['source']
resources.srcDirs = ['data']
}
dependencies {

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'src'
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile 'org.slf4j:slf4j-api:1.7.2'

View File

@ -1,6 +1,6 @@
sourceSets.test {
java.srcDir 'source'
resources.srcDir 'testdata'
java.srcDirs = ['source']
resources.srcDirs = ['testdata']
}
dependencies {

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'source'
sourceSets.main.java.srcDirs = ['source']
dependencies {
compile 'org.eclipse.jdt:org.eclipse.jdt.core:3.13.50'

View File

@ -1,4 +1,4 @@
sourceSets.test.java.srcDir 'src'
sourceSets.test.java.srcDirs = ['src']
dependencies {
testCompile 'junit:junit:4.11'

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'source'
sourceSets.main.java.srcDirs = ['source']
dependencies {
compile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'

View File

@ -2,7 +2,7 @@ plugins {
id 'com.github.hauner.jarTest' version '1.0.1'
}
sourceSets.test.java.srcDir 'src'
sourceSets.test.java.srcDirs = ['src']
dependencies {
testCompile 'org.eclipse.core:org.eclipse.core.runtime:3.10.0.v20140318-2214'

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'src'
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile 'org.eclipse.pde:org.eclipse.pde.core:3.11.1'

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'source'
sourceSets.main.java.srcDirs = ['source']
dependencies {
compile 'com.google.guava:guava:18.0'

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'src'
sourceSets.main.java.srcDirs = ['src']
dependencies {
compile project(':com.ibm.wala.util')

View File

@ -1,4 +1,4 @@
sourceSets.main.java.srcDir 'src'
sourceSets.main.java.srcDirs = ['src']
tasks.javadoc {
def coreCompileJava = project(':com.ibm.wala.core').tasks.compileJava