Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Gradle build cleanup

Rich Turnerfc94618dfa2f
diff --git a/client/build.gradle b/client/build.gradle
index 35f99d84e..845c35eb6 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -161,13 +161,7 @@ gwtSuperDev.dependsOn tasks.getByPath(":yarnInstall")
installDist {
dependsOn resolveTask(":client:src:main:webapp:installDist")
- into "${resolveProject(':deployment').projectDir}/manager/app/manager"
-}
-
-clean {
- doLast {
- delete "${resolveProject(':deployment').projectDir}/manager/app/manager"
- }
+ into "${project(':deployment').buildDir}/manager/app/manager"
}
distributions {
diff --git a/deployment/Dockerfile b/deployment/Dockerfile
index da76a0aa5..b9f8ee8e6 100644
--- a/deployment/Dockerfile
+++ b/deployment/Dockerfile
@@ -6,6 +6,4 @@ ARG GIT_COMMIT=unknown
LABEL git-commit=$GIT_COMMIT
RUN mkdir -p /deployment/extensions
-ADD manager /deployment/manager
-ADD keycloak /deployment/keycloak
-ADD map /deployment/map
\ No newline at end of file
+ADD build /deployment
\ No newline at end of file
diff --git a/deployment/build.gradle b/deployment/build.gradle
index a0377488b..0414012e3 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -1,8 +1,13 @@
-apply plugin: 'idea'
-idea {
- module {
- excludeDirs += file("manager/app")
- excludeDirs += file("keycloak")
- excludeDirs += file("manager/extensions")
+task clean() {
+ doLast {
+ delete "build"
}
+}
+
+task installDist(type: Copy) {
+ dependsOn(rootProject.getTasksByName('installDist', true).findAll {it.project != project && ((parent == rootProject) || (isCustomProject() && it.project.parent != rootProject))})
+ from(projectDir) {
+ exclude "build.gradle", "Dockerfile", "build"
+ }
+ into project(":deployment").buildDir
}
\ No newline at end of file
diff --git a/manager/build.gradle b/manager/build.gradle
index 255df98e2..5b909ba80 100644
--- a/manager/build.gradle
+++ b/manager/build.gradle
@@ -40,19 +40,6 @@ distributions {
from(project.projectDir) {
include("*Dockerfile")
}
- // Populate the /deployment directory in the Manager image
- from("${resolveProject(":deployment").projectDir}") {
- into "deployment"
- exclude "**/build.gradle", "**/package.json", "**/openremote.log*", "**/yarn.lock"
- }
}
}
-}
-
-installDist {
- dependsOn resolveTask(":ui:installDist")
- doLast {
- // Delete the useless start scripts, they have a hardcoded classpath
- delete "${buildDir}/install/$distributions.main.baseName/bin"
- }
}
\ No newline at end of file
diff --git a/project.gradle b/project.gradle
index 343e7887c..374ba3a87 100644
--- a/project.gradle
+++ b/project.gradle
@@ -98,7 +98,7 @@ task npmInstall(type: Exec){
commandLine npmCommand("npm"), "install"
}
task npmClean(type: Exec){
- dependsOn tasks.getByPath(":yarnInstall")
+ dependsOn tasks.getByPath(":yarnInstallForce")
commandLine npmCommand("npm"), "run-script", "clean"
}
task npmBuild(type: Exec){
diff --git a/ui/app/smart-building-v1/build.gradle b/ui/app/smart-building-v1/build.gradle
index 478fd4cc4..9900b0d73 100644
--- a/ui/app/smart-building-v1/build.gradle
+++ b/ui/app/smart-building-v1/build.gradle
@@ -7,11 +7,5 @@ task installDist(type: Copy) {
from(projectDir) {
exclude "gwt", "build.gradle", "package.json", "yarn.lock", ".bowerrc"
}
- into "${resolveProject(':deployment').projectDir}/manager/app/${projectDir.name}"
-}
-
-task clean() {
- doLast {
- delete "${resolveProject(':deployment').projectDir}/manager/app/${projectDir.name}"
- }
+ into "${project(':deployment').buildDir}/manager/app/${projectDir.name}"
}
\ No newline at end of file
diff --git a/ui/app/smart-building/build.gradle b/ui/app/smart-building/build.gradle
index 947b112e3..5f6e722ee 100644
--- a/ui/app/smart-building/build.gradle
+++ b/ui/app/smart-building/build.gradle
@@ -10,11 +10,5 @@
// from(buildDir) {
// exclude "gwt", "build.gradle", "package.json", "yarn.lock", ".bowerrc"
// }
-// into "${resolveProject(':deployment').projectDir}/manager/app/${projectDir.name}"
+// into "${resolveProject(':deployment').buildDir}/manager/app/${projectDir.name}"
//}
-//
-//task clean() {
-// doLast {
-// delete "${resolveProject(':deployment').projectDir}/manager/app/${projectDir.name}"
-// }
-//}
\ No newline at end of file
diff --git a/ui/build.gradle b/ui/build.gradle
index 452456aa9..4ecba2356 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -1,3 +1,15 @@
+afterEvaluate {
+ it.getTasksByName('prepareUi', true).forEach {
+ it.dependsOn resolveTask(":ui:component:model:generateTypeScript"), resolveTask(":ui:component:rest:generateTypeScript")
+ }
+ it.getTasksByName('publishUi', true).forEach {
+ it.dependsOn resolveTask(":ui:component:model:generateTypeScript"), resolveTask(":ui:component:rest:generateTypeScript")
+ }
+ it.getTasksByName('installDist', true).forEach {
+ it.dependsOn resolveTask(":ui:component:model:generateTypeScript"), resolveTask(":ui:component:rest:generateTypeScript")
+ }
+}
+
task deleteNodeModules {
doFirst {
delete "${project(':openremote').projectDir}/node_modules"
@@ -5,25 +17,12 @@ task deleteNodeModules {
}
task clean {
+ // Do this as it will conflict with root project node_modules
if (isCustomProject() && parent == rootProject) {
dependsOn deleteNodeModules
}
}
-task build {
- dependsOn tasks.getByPath(":yarnInstall")
-
- // Add dependency to openremote ui build for custom projects
- // and also remove node_modules dir from openremote repo
- if (isCustomProject() && parent == rootProject) {
- dependsOn resolveTask(":ui:build")
- }
-}
-
-task installDist {
- dependsOn build
-}
-
task modelWatch {
- dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build")
+ dependsOn resolveTask(":ui:component:model:generateTypeScript"), resolveTask(":ui:component:rest:generateTypeScript")
}
\ No newline at end of file
diff --git a/ui/component/core/build.gradle b/ui/component/core/build.gradle
index cba19f5b8..086ece69d 100644
--- a/ui/component/core/build.gradle
+++ b/ui/component/core/build.gradle
@@ -1,6 +1,8 @@
buildDir = "dist"
-npmBuild.dependsOn(resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build"), resolveTask(":ui:component:mdi-icons:build"))
+task generate(type: Exec){
+ commandLine npmCommand("npm"), "run-script", "generate"
+}
task clean() {
doLast {
@@ -8,14 +10,16 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
+}
+
+task installDist(type: Copy) {
+ dependsOn generate
+ from "${buildDir}/mdi-icons.json"
+ into "${project(':deployment').buildDir}/manager/shared"
}
\ No newline at end of file
diff --git a/ui/component/model/build.gradle b/ui/component/model/build.gradle
index aa6856ee7..01d118cdc 100644
--- a/ui/component/model/build.gradle
+++ b/ui/component/model/build.gradle
@@ -78,8 +78,10 @@ clean {
}
}
-build.dependsOn generateTypeScript, npmBuild
+task prepareUi() {
+ dependsOn clean, npmPrepare
+}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-asset-tree/build.gradle b/ui/component/or-asset-tree/build.gradle
index b8eadf4fa..98cdcb8e2 100644
--- a/ui/component/or-asset-tree/build.gradle
+++ b/ui/component/or-asset-tree/build.gradle
@@ -6,16 +6,10 @@ task clean() {
}
}
-npmBuild.dependsOn resolveTask(":ui:component:or-translate:build"), resolveTask(":ui:component:or-select:build"), resolveTask(":ui:component:or-input:build")
-
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-asset-viewer/build.gradle b/ui/component/or-asset-viewer/build.gradle
index b8eadf4fa..98cdcb8e2 100644
--- a/ui/component/or-asset-viewer/build.gradle
+++ b/ui/component/or-asset-viewer/build.gradle
@@ -6,16 +6,10 @@ task clean() {
}
}
-npmBuild.dependsOn resolveTask(":ui:component:or-translate:build"), resolveTask(":ui:component:or-select:build"), resolveTask(":ui:component:or-input:build")
-
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-attribute-history/build.gradle b/ui/component/or-attribute-history/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-attribute-history/build.gradle
+++ b/ui/component/or-attribute-history/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-attribute-input/build.gradle b/ui/component/or-attribute-input/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-attribute-input/build.gradle
+++ b/ui/component/or-attribute-input/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-header/build.gradle b/ui/component/or-header/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-header/build.gradle
+++ b/ui/component/or-header/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-icon/build.gradle b/ui/component/or-icon/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-icon/build.gradle
+++ b/ui/component/or-icon/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-input/build.gradle b/ui/component/or-input/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-input/build.gradle
+++ b/ui/component/or-input/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-map/build.gradle b/ui/component/or-map/build.gradle
index e4af5c3d2..fe40d4a65 100644
--- a/ui/component/or-map/build.gradle
+++ b/ui/component/or-map/build.gradle
@@ -4,14 +4,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-panel/build.gradle b/ui/component/or-panel/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-panel/build.gradle
+++ b/ui/component/or-panel/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-select/build.gradle b/ui/component/or-select/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-select/build.gradle
+++ b/ui/component/or-select/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-smart-notify/build.gradle b/ui/component/or-smart-notify/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-smart-notify/build.gradle
+++ b/ui/component/or-smart-notify/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-survey-results/build.gradle b/ui/component/or-survey-results/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-survey-results/build.gradle
+++ b/ui/component/or-survey-results/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-survey/build.gradle b/ui/component/or-survey/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-survey/build.gradle
+++ b/ui/component/or-survey/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-thermostat/build.gradle b/ui/component/or-thermostat/build.gradle
index 50dc7a216..9522b622e 100644
--- a/ui/component/or-thermostat/build.gradle
+++ b/ui/component/or-thermostat/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-timeline/build.gradle b/ui/component/or-timeline/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-timeline/build.gradle
+++ b/ui/component/or-timeline/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/or-translate/build.gradle b/ui/component/or-translate/build.gradle
index 50dc7a216..98cdcb8e2 100644
--- a/ui/component/or-translate/build.gradle
+++ b/ui/component/or-translate/build.gradle
@@ -6,14 +6,10 @@ task clean() {
}
}
-task build() {
- dependsOn npmBuild
-}
-
task prepareUi() {
- dependsOn clean, build, npmPrepare
+ dependsOn clean, npmPrepare
}
task publishUi() {
- dependsOn clean, build, npmPublish
+ dependsOn clean, npmPublish
}
\ No newline at end of file
diff --git a/ui/component/rest/build.gradle b/ui/component/rest/build.gradle
index f326267f4..af0298f17 100644
--- a/ui/component/rest/build.gradle
+++ b/ui/component/rest/build.gradle
@@ -94,7 +94,7 @@ clean {
}
}
-build.dependsOn generateTypeScript, resolveTask(":ui:component:model:build"), npmBuild
+build.dependsOn generateTypeScript
task prepareUi() {
dependsOn clean, build, npmPrepare
diff --git a/ui/keycloak/build.gradle b/ui/keycloak/build.gradle
index 3d832c48a..ea7d8d96c 100644
--- a/ui/keycloak/build.gradle
+++ b/ui/keycloak/build.gradle
@@ -1,10 +1,4 @@
task installDist(type: Copy) {
from "themes"
- into "${resolveProject(':deployment').projectDir}/${projectDir.name}/themes"
-}
-
-task clean() {
- doLast {
- delete "${resolveProject(':deployment').projectDir}/${projectDir.name}"
- }
+ into "${project(':deployment').buildDir}/${projectDir.name}/themes"
}
\ No newline at end of file