DASCA
/
WALA
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
com.ibm.wala.cast.java.ecj/build.gradle
View File

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

2
com.ibm.wala.cast.java.test.data/build.gradle
View File

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

2
com.ibm.wala.cast.java.test/build.gradle
View File

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

2
com.ibm.wala.cast.java/build.gradle
View File

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

6
com.ibm.wala.cast.js.html.nu_validator/build.gradle
View File

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

4
com.ibm.wala.cast.js.nodejs.test/build.gradle
View File

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

4
com.ibm.wala.cast.js.nodejs/build.gradle
View File

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

2
com.ibm.wala.cast.js.rhino.test/build.gradle
View File

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

2
com.ibm.wala.cast.js.rhino/build.gradle
View File

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

2
com.ibm.wala.cast.js.test/build.gradle
View File

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

4
com.ibm.wala.cast.js/build.gradle
View File

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

6
com.ibm.wala.cast.test/build.gradle
View File

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

6
com.ibm.wala.cast/build.gradle
View File

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

2
com.ibm.wala.core.testdata/build.gradle
View File

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

4
com.ibm.wala.core.tests/build.gradle
View File

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

2
com.ibm.wala.core/build.gradle
View File

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

4
com.ibm.wala.dalvik.test/build.gradle
View File

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

2
com.ibm.wala.dalvik/build.gradle
View File

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

4
com.ibm.wala.ide.jdt.test/build.gradle
View File

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

2
com.ibm.wala.ide.jdt/build.gradle
View File

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

2
com.ibm.wala.ide.jsdt.tests/build.gradle
View File

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

2
com.ibm.wala.ide.jsdt/build.gradle
View File

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

2
com.ibm.wala.ide.tests/build.gradle
View File

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

2
com.ibm.wala.ide/build.gradle
View File

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

2
com.ibm.wala.scandroid/build.gradle
View File

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

2
com.ibm.wala.shrike/build.gradle
View File

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

2
com.ibm.wala.util/build.gradle
View File

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