Support the case when webpack project is not in the same root as grad…

…le's one.
shafirov · Aug 9, 2016 · 2f65ea0 · 2f65ea0
1 parent eb0fe85
commit 2f65ea0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
diff --git 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<Project> {
  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
@@ -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")
  }
  })