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

Merge pull request #325 from liblit/miscellaneous-ide-updates 

Miscellaneous IDE updates
This commit is contained in:
Julian Dolby 2018-07-12 12:57:40 -04:00 committed by GitHub
parent dc47e1da98 858148e91b
commit ed59197ae3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@ -57,7 +57,6 @@ version '1.5.0-SNAPSHOT'
subprojects { subproject -> subprojects { subproject ->
// skip generic Java setup for the few projects that have no Java code whatsoever // skip generic Java setup for the few projects that have no Java code whatsoever
switch (subproject.name) { switch (subproject.name) {
case 'com.ibm.wala.cast.js.test.data':
case 'com.ibm.wala-repository': case 'com.ibm.wala-repository':
case ~/.*_feature/: case ~/.*_feature/:
return return
@ -79,6 +78,7 @@ subprojects { subproject ->
jar.manifest.from('META-INF/MANIFEST.MF') jar.manifest.from('META-INF/MANIFEST.MF')
task afterEclipseBuildshipImport(dependsOn: processTestResources) task afterEclipseBuildshipImport(dependsOn: processTestResources)
task afterIntelliJIDEAOpen
test { test {
include '**/*Test.class' include '**/*Test.class'

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

@ -1,9 +1,6 @@
sourceSets { sourceSets {
main.java.srcDirs = ['src'] main.java.srcDirs = ['src']
test { test.java.srcDirs = ['tests']
java.srcDirs = ['tests']
resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
}
} }
dependencies { dependencies {
@ -21,6 +18,12 @@ dependencies {
) )
} }
processTestResources {
def data = project(':com.ibm.wala.cast.js.test.data')
dependsOn data.processTestResources
from data.sourceSets.test.resources
}
test { test {
maxHeapSize = '800M' maxHeapSize = '800M'
} }

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

@ -2,10 +2,7 @@ plugins {
id 'com.github.hauner.jarTest' id 'com.github.hauner.jarTest'
} }
sourceSets.test { sourceSets.test.java.srcDirs = ['harness-src']
java.srcDirs = ['harness-src']
resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
}
dependencies { dependencies {
testCompile( testCompile(
@ -22,6 +19,12 @@ dependencies {
) )
} }
processTestResources {
def data = project(':com.ibm.wala.cast.js.test.data')
dependsOn data.processTestResources
from data.sourceSets.test.resources
}
test { test {
environment 'TRAVIS', 1 environment 'TRAVIS', 1
maxHeapSize = '800M' maxHeapSize = '800M'

4
com.ibm.wala.cast.js.test.data/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.source=1.8

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

@ -1,6 +1,4 @@
plugins { sourceSets.test.resources.srcDirs = ['examples-src']
id 'base'
}
task downloadAjaxslt(type: VerifiedDownload) { task downloadAjaxslt(type: VerifiedDownload) {
def version = '0.8.1' def version = '0.8.1'
@ -21,3 +19,5 @@ task unpackAjaxslt(type: Sync, dependsOn: downloadAjaxslt) {
} }
clean.dependsOn cleanUnpackAjaxslt clean.dependsOn cleanUnpackAjaxslt
processTestResources.dependsOn(unpackAjaxslt)

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

@ -2,10 +2,7 @@ plugins {
id 'com.github.hauner.jarTest' id 'com.github.hauner.jarTest'
} }
sourceSets.test { sourceSets.test.java.srcDirs = ['harness-src']
java.srcDirs = ['harness-src']
resources.srcDirs = [project(':com.ibm.wala.cast.js.test.data').file('examples-src')]
}
dependencies { dependencies {
testCompile( testCompile(
@ -21,7 +18,11 @@ dependencies {
) )
} }
processTestResources.dependsOn ':com.ibm.wala.cast.js.test.data:unpackAjaxslt' processTestResources {
def data = project(':com.ibm.wala.cast.js.test.data')
dependsOn data.processTestResources
from data.sourceSets.test.resources
}
test { test {
maxHeapSize = '800M' maxHeapSize = '800M'

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

@ -6,6 +6,7 @@ plugins {
} }
eclipse.project.natures 'org.eclipse.pde.PluginNature' eclipse.project.natures 'org.eclipse.pde.PluginNature'
afterIntelliJIDEAOpen.dependsOn jarTest
sourceSets.test.java.srcDirs = ['harness-src/java'] sourceSets.test.java.srcDirs = ['harness-src/java']

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

@ -93,6 +93,7 @@ clean.dependsOn cleanCopyDxJar
compileTestJava.dependsOn copyDxJar compileTestJava.dependsOn copyDxJar
afterEclipseBuildshipImport.dependsOn copyDxJar afterEclipseBuildshipImport.dependsOn copyDxJar
afterIntelliJIDEAOpen.dependsOn copyDxJar
task copyAndroidJar(type: Sync, dependsOn: installAndroidSdk) { task copyAndroidJar(type: Sync, dependsOn: installAndroidSdk) {
from "${installAndroidSdk.destinationDir}/platforms/${installAndroidSdk.components['platforms']}/android.jar" from "${installAndroidSdk.destinationDir}/platforms/${installAndroidSdk.components['platforms']}/android.jar"