#762 Correction of paths

nemerosa · Apr 10, 2020 · 7bd7427 · 7bd7427
1 parent 406697d
commit 7bd7427
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 57 deletions.
diff --git a/buildSrc/src/main/kotlin/net/nemerosa/ontrack/gradle/extension/OntrackExtensionPlugin.kt b/buildSrc/src/main/kotlin/net/nemerosa/ontrack/gradle/extension/OntrackExtensionPlugin.kt
@@ -86,7 +86,7 @@ class OntrackExtensionPlugin : Plugin<Project> {
             }
 
             setWorkingDir(target.projectDir)
-            script = target.file("node_modules/gulp/bin/gulp")
+            script = target.file("node_modules/gulp/bin/gulp.js")
             addArgs(
                     "default",
                     "--extension", ontrack.id(project),

diff --git a/ontrack-web/build.gradle.kts b/ontrack-web/build.gradle.kts
@@ -1,47 +1,38 @@
-//import com.liferay.gradle.plugins.node.NodeExtension
-//import com.liferay.gradle.plugins.node.tasks.ExecuteNodeScriptTask
-//import com.liferay.gradle.plugins.node.tasks.NpmInstallTask
+import com.moowork.gradle.node.NodeExtension
+import com.moowork.gradle.node.npm.NpmInstallTask
+import com.moowork.gradle.node.task.NodeTask
 
 plugins {
     base
-//    id("com.liferay.node") version "6.0.1"
+    id("com.github.node-gradle.node")
 }
 
 // Node environment
 
-//configure<NodeExtension> {
-//    isGlobal = true
-//    setNodeVersion("8.10.0")
-//    setNpmVersion("5.7.1")
-//    isDownload = true
-//}
-
-// NPM cache
-
-//tasks.named<NpmInstallTask>("npmInstall") {
-//    setNodeModulesCacheDir("$rootDir/.gradle/node_modules_cache")
-//    inputs.file("package.json")
-//    outputs.dir("node_modules")
-//}
+configure<NodeExtension> {
+    version = "8.10.0"
+    npmVersion = "5.7.1"
+    isDownload = true
+}
 
 // Installing the Bower packages
 
-//val bowerInstall by tasks.registering(ExecuteNodeScriptTask::class) {
-//    dependsOn("npmInstall")
-//    setScriptFile("node_modules/bower/bin/bower")
-//    val bowerArgs = mutableListOf(
-//            "--config.storage.cache=$rootDir/.gradle/bower/cache",
-//            "--config.storage.packages=$rootDir/.gradle/bower/packages",
-//            "--config.storage.registry=$rootDir/.gradle/bower/registry",
-//            "install"
-//    )
-//    if (project.properties.containsKey("bowerOptions")) {
-//        bowerArgs += project.properties["bowerOptions"].toString()
-//    }
-//    args(bowerArgs)
-//    inputs.file("bower.json")
-//    outputs.dir("vendor")
-//}
+val bowerInstall by tasks.registering(NodeTask::class) {
+    dependsOn("npmInstall")
+    script = file("node_modules/bower/bin/bower")
+    val bowerArgs = mutableListOf(
+            "--config.storage.cache=$rootDir/.gradle/bower/cache",
+            "--config.storage.packages=$rootDir/.gradle/bower/packages",
+            "--config.storage.registry=$rootDir/.gradle/bower/registry",
+            "install"
+    )
+    if (project.properties.containsKey("bowerOptions")) {
+        bowerArgs += project.properties["bowerOptions"].toString()
+    }
+    setArgs(bowerArgs)
+    inputs.file("bower.json")
+    outputs.dir("vendor")
+}
 
 // Cleanup
 
@@ -51,28 +42,28 @@ tasks.named<Delete>("clean") {
 
 // Web packaging
 
-//val dev by tasks.registering(ExecuteNodeScriptTask::class) {
-//    dependsOn(bowerInstall)
-//    setScriptFile("node_modules/gulp/bin/gulp")
-//    args("dev")
-//}
+val dev by tasks.registering(NodeTask::class) {
+    dependsOn(bowerInstall)
+    script = file("node_modules/gulp/bin/gulp.js")
+    addArgs("dev")
+}
 
-//val prod by tasks.registering(ExecuteNodeScriptTask::class) {
-//    dependsOn(bowerInstall)
-//    setScriptFile("node_modules/gulp/bin/gulp")
-//    args("default", "--version", version)
-//    inputs.dir("src")
-//    inputs.file("bower.json")
-//    inputs.file("package.json")
-//    outputs.dir("build/web/prod")
-//}
+val prod by tasks.registering(NodeTask::class) {
+    dependsOn(bowerInstall)
+    script = file("node_modules/gulp/bin/gulp.js")
+    addArgs("default", "--version", version)
+    inputs.dir("src")
+    inputs.file("bower.json")
+    inputs.file("package.json")
+    outputs.dir("build/web/prod")
+}
 
-//tasks.named<Task>("build") {
-//    dependsOn(prod)
-//}
+tasks.named<Task>("build") {
+    dependsOn(prod)
+}
 
-//val watch by tasks.registering(ExecuteNodeScriptTask::class) {
-//    dependsOn(dev)
-//    setScriptFile("node_modules/gulp/bin/gulp")
-//    args("watch")
-//}
+val watch by tasks.registering(NodeTask::class) {
+    dependsOn(dev)
+    script = file("node_modules/gulp/bin/gulp.js")
+    addArgs("watch")
+}