Build DMG image for SDK #82 (#84)

(cherry picked from commit 8c7370d)
cuba-platform · Mar 3, 2022 · 5795d0d · 5795d0d
1 parent f52aeaa
commit 5795d0d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/build.gradle b/build.gradle
@@ -66,11 +66,6 @@ ext.osName = System.getProperty("os.name").toLowerCase()
 
 ext.javaHome = project.hasProperty('targetOsJavaHome') ? project.property('targetOsJavaHome') : System.getProperty("JAVA_HOME") ?: System.getProperty("JAVA11_HOME")
 
-if (ext.javaHome == null
-        || ext.javaHome.isEmpty()) {
-    throw new GradleException('JAVA_HOME is not set')
-}
-
 ext.targetOsPlatform = 'linux'
 if (ext.osName.contains('mac')) {
     ext.targetOsPlatform = 'macos'
@@ -320,4 +315,4 @@ if (project.hasProperty('buildDmgMac')) {
                     "--file", "${dmgAppName}.dmg"
         }
     }
-}
+}
diff --git a/cuba-sdk/build.gradle b/cuba-sdk/build.gradle
@@ -187,6 +187,11 @@ task jarPatch(dependsOn: installDist, group: 'build',
             into patchLibsDir
         }
 
+        if (rootProject.javaHome == null
+            || rootProject.javaHome.isEmpty()) {
+            throw new GradleException('JAVA_HOME is not set')
+        }
+
         for (moduleItem in modulesConfig) {
             def moduleItemName = moduleItem.key
             def moduleItemJar = moduleItem.value
@@ -246,6 +251,11 @@ task bundle(dependsOn: jarPatch, group: 'distribution', description: 'Builds bun
 
         logger.info("Linking")
 
+        if (rootProject.javaHome == null
+            || rootProject.javaHome.isEmpty()) {
+            throw new GradleException('JAVA_HOME is not set')
+        }
+
         def targetOsJavaHome = project.hasProperty('targetOsJavaHome') ? project.property('targetOsJavaHome') : null
         if (targetOsJavaHome == null
                 || targetOsJavaHome.isEmpty()) {