diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml new file mode 100644 index 0000000..54e06bd --- /dev/null +++ b/.idea/jsLibraryMappings.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/gradle.properties b/gradle.properties index 9c71418..49bc55c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -version=0.1.3 +version=0.1.4 diff --git a/src/main/groovy/KWP.groovy b/src/main/groovy/KWP.groovy index c377512..9c3463a 100644 --- a/src/main/groovy/KWP.groovy +++ b/src/main/groovy/KWP.groovy @@ -5,11 +5,12 @@ import org.gradle.api.artifacts.ProjectDependency import java.util.zip.ZipFile class KWP implements Plugin { + private static def loaderText = KWP.class.getResourceAsStream("/kwp.js").text + @Override void apply(Project target) { def rootProject = target.rootProject def targetDir = new File(rootProject.buildDir, "kwp") - def loaderText = getClass().getResourceAsStream("/kwp.js").text rootProject.afterEvaluate { targetDir.mkdirs() diff --git a/src/main/resources/kwp.js b/src/main/resources/kwp.js index dd0acc2..8321824 100644 --- a/src/main/resources/kwp.js +++ b/src/main/resources/kwp.js @@ -18,9 +18,10 @@ module.exports = function(content) { } var buildFile = path.resolve(loader.resourcePath); + var root = path.relative(buildFile, "../") var project = loader.resourceQuery.substr(1) - var gradle = "./gradlew" + var gradle = path.join(root, "gradlew") if (isWin) { gradle += ".bat" } @@ -48,7 +49,7 @@ module.exports = function(content) { } else { // console.log(stdout) - var deps = fs.readFileSync(path.resolve('build/kwp/__deps.txt'), "UTF-8").split("\n") + var deps = fs.readFileSync(path.join(root, 'build/kwp/__deps.txt'), "UTF-8").split("\n") for (var i = 0; i < deps.length; i++) { var t = deps[i].trim() @@ -57,7 +58,7 @@ module.exports = function(content) { } } - success(fs.readFileSync(path.resolve('build/kwp/__modules.js'), "UTF-8")) + success(fs.readFileSync(path.join(root, 'build/kwp/__modules.js'), "UTF-8")) console.timeEnd("Done Gradle") } })