Skip to content

armgit / core

Public Imported from GitHub
0

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

update UI app build config

Rich Turner50de36cb0d46
diff --git a/project.gradle b/project.gradle
index 33d764fcd..3fde41b08 100644
--- a/project.gradle
+++ b/project.gradle
@@ -42,6 +42,32 @@ idea {
excludeDirs += file("build")
}
}
+
+// Helper functions for project/task resolution when the main
+// repo is checked out as a git submodule and therefore a subproject
+def isCustomProject() {
+ findProject(":openremote") != null
+}
+
+def resolvePath(String path) {
+ isCustomProject() ? ":openremote" + path : path
+}
+
+def resolveProject(String path) {
+ project(resolvePath(path))
+}
+
+def resolveTask(String path) {
+ tasks.getByPath(resolvePath(path))
+}
+
+ext {
+ resolvePath = this.&resolvePath
+ resolveProject = this.&resolveProject
+ resolveTask = this.&resolveTask
+ isCustomProject = this.&isCustomProject
+}
+
if (project.convention.findPlugin(JavaPluginConvention)) {
// Change the output directory for the main and test source sets back to the old path
sourceSets.main.java.outputDir = new File(buildDir, "classes/main")
@@ -116,29 +142,4 @@ plugins.withType(JavaPlugin).whenPluginAdded {
// JAR/ZIP base name is the fully qualified subproject name
archivesBaseName = "${rootProject.name}${path.replaceAll(":", "-")}"
-}
-
-// Helper functions for project/task resolution when the main
-// repo is checked out as a git submodule and therefore a subproject
-def isCustomProject() {
- findProject(":openremote") != null
-}
-
-def resolvePath(String path) {
- isCustomProject() ? ":openremote" + path : path
-}
-
-def resolveProject(String path) {
- project(resolvePath(path))
-}
-
-def resolveTask(String path) {
- tasks.getByPath(resolvePath(path))
-}
-
-ext {
- resolvePath = this.&resolvePath
- resolveProject = this.&resolveProject
- resolveTask = this.&resolveTask
- isCustomProject = this.&isCustomProject
}
\ No newline at end of file
diff --git a/ui/app/smart-building/build.gradle b/ui/app/smart-building/build.gradle
index 76f94e17a..958ee7a35 100644
--- a/ui/app/smart-building/build.gradle
+++ b/ui/app/smart-building/build.gradle
@@ -1,5 +1,8 @@
+//buildDir = "dist"
+//npmBuild.dependsOn(resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build"))
+//
//task build {
-// dependsOn resolveTask(":ui:component:model:build"), resolveTask(":ui:component:rest:build"), npmBuild
+// dependsOn npmBuild
//}
//
//task installDist(type: Copy) {
@@ -14,4 +17,4 @@
// doLast {
// delete "${resolveProject(':deployment').projectDir}/manager/app/${projectDir.name}"
// }
-//}
+//}
\ No newline at end of file