From 48fe74cba7f573703849b24350e72ef17cfe8769 Mon Sep 17 00:00:00 2001 From: Ben Liblit Date: Thu, 25 Jan 2018 16:17:14 -0600 Subject: [PATCH] Unpack node.js in the same place that Maven unpacks it This gets rid of some Eclipse warnings that stem from Buildship being confused about what it should treat as a source directory if Maven and Gradle are both being used in the same tree. --- com.ibm.wala.cast.js.nodejs/build.gradle | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/com.ibm.wala.cast.js.nodejs/build.gradle b/com.ibm.wala.cast.js.nodejs/build.gradle index 917191540..e3f16188a 100644 --- a/com.ibm.wala.cast.js.nodejs/build.gradle +++ b/com.ibm.wala.cast.js.nodejs/build.gradle @@ -21,22 +21,25 @@ task verifyNodeJS(type: VerifyWithStamp, dependsOn: downloadNodeJS) { checksum '33c5ba7a5d45644e70d268d8ad3e57df' } -task unpackNodeJSLib(type: Sync, dependsOn: verifyNodeJS) { +task unpackNodeJSLib(type: Copy, dependsOn: verifyNodeJS) { from(zipTree(verifyNodeJS.src)) { - include 'nodejs-node-0a604e9/lib/*' + include 'nodejs-node-0a604e9/lib/*.js' eachFile { - relativePath new RelativePath(!directory, 'core-modules', relativePath.lastName) + relativePath new RelativePath(!directory, relativePath.lastName) } } - into temporaryDir + into 'dat/core-modules' includeEmptyDirs false } +task cleanUnpackNodeJSLib(type: Delete) { + delete fileTree(dir: 'dat/core-modules', include: '*.js') +} + +processResources.dependsOn unpackNodeJSLib + sourceSets.main { java.srcDirs = ['src'] - resources.srcDirs = [ - 'dat', - unpackNodeJSLib - ] + resources.srcDirs = ['dat'] }