Changeset 76023 in vbox for trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg

Timestamp:

Dec 6, 2018 7:05:37 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

127249

Message:

GAs/darwin/Installer: updates

Location:

trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg

Files:

• Localizable.strings (modified) (1 diff)
• distribution-amd64.dist (moved) (moved from trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg/distribution.dist ) (2 diffs)
• distribution-x86.dist (copied) (copied from trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg/distribution.dist ) (2 diffs)

trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg/Localizable.strings

@@ -7 +7 @@
 'choiceVBoxToolsAndServices_msg' = 'Installs the @VBOX_PRODUCT@ Guest Additions Tools and Services to /Library/Application Support/VirtualBox Guest Additions.';
 
-'UNSUPPORTED_OS_TLE' = "Unsupported OS version detected!";
-'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. VirtualBox Guest Additions require Mac OS X 10.6 or later.";
+'UNSUPPORTED_AMD64_OS_TLE' = "Incompatible OS version detected!";
+'UNSUPPORTED_AMD64_OS_MSG' = "VirtualBox Guest Additions require Mac OS X 10.7 or later running in 64-bit mode.";
+
+'UNSUPPORTED_X86_OS_TLE' = "Incompatible OS version detected!";
+'UNSUPPORTED_X86_OS_MSG' = "The 32-bit VirtualBox Guest Additions are only for Mac OS X 10.7 and earlier running in 32-bit mode.";
+

trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg/distribution-amd64.dist

@@ -15 +15 @@
 <installer-gui-script minSpecVersion="1.0">
     <title>VirtualBox_title</title>
-    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="i386"/>
-    <installation-check script="checkPrerequisite()"></installation-check>
+    <options customize="allow" allow-external-scripts="false" rootVolumeOnly="true" hostArchitectures="i386"/>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
+    <!-- This allowes a better error message compared to allowed-os-versions: -->
+    <installation-check script="checkPrerequisites()"></installation-check>
     <script>
     /* js:pkmk:start */
-    function checkPrerequisite()
+    function checkPrerequisites()
     {
-       try
-       {
-           test = system.version['ProductVersion'];
-           system.log("OS version detected: " + test);
-           result = (system.compareVersions(test, '10.6') >= 0);
-       } catch (e) { system.log(e); result = false; }
-
-       if (!result)
-       {
-           my.result.type = 'Fatal';
-           my.result.title = system.localizedString('UNSUPPORTED_OS_TLE');
-           my.result.message = system.localizedString('UNSUPPORTED_OS_MSG');
-           return result;
-       }
-
-       system.log("result:" + result);
-       return result;
+        sArch = system.sysctl('hw.machine');
+        system.log("Detected hw arch:    " + sArch);
+        sVer  = system.version['ProductVersion'];
+        system.log("Detected OS version: " + sVer);
+        if (sArch == 'x86_64')
+        {
+            if (system.compareVersions(sVer, '10.7') &gt;= 0)
+            {
+                system.log("checkPrerequisites returns true");
+                return true;
+            }
+        }
+        system.log("checkPrerequisites returns false!");
+        my.result.type    = 'Fatal';
+        my.result.title   = system.localizedString('UNSUPPORTED_AMD64_OS_TLE');
+        my.result.message = system.localizedString('UNSUPPORTED_AMD64_OS_MSG');
+        return false;
     }
     /* js:pkmk:end */
@@ -52 +53 @@
         <pkg-ref id="org.virtualbox.pkg.additions.tools-and-services"></pkg-ref>
     </choice>
-    <choice id="choiceVBoxKEXTs"   title="choiceVBoxKEXTs_title"   description="choiceVBoxKEXTs_msg"   start_selected="true" start_enabled="false" start_visible="true">
+    <choice id="choiceVBoxKEXTs" title="choiceVBoxKEXTs_title" description="choiceVBoxKEXTs_msg" start_selected="true" start_enabled="false" start_visible="true">
         <pkg-ref id="org.virtualbox.pkg.additions.kexts"></pkg-ref>
     </choice>

trunk/src/VBox/Additions/darwin/Installer/VBoxGuestAdditions_mpkg/distribution-x86.dist

@@ -15 +15 @@
 <installer-gui-script minSpecVersion="1.0">
     <title>VirtualBox_title</title>
-    <options customize="allow" allow-external-scripts="yes" rootVolumeOnly="true" hostArchitectures="i386"/>
-    <installation-check script="checkPrerequisite()"></installation-check>
+    <options customize="allow" allow-external-scripts="false" rootVolumeOnly="true" hostArchitectures="i386"/>
     <domains enable_anywhere="false" enable_currentUserHome="false" enable_localSystem="true"/>
+    <!-- This allowes a better error message compared to allowed-os-versions: -->
+    <installation-check script="checkPrerequisites()"></installation-check>
     <script>
     /* js:pkmk:start */
-    function checkPrerequisite()
+    function checkPrerequisites()
     {
-       try
-       {
-           test = system.version['ProductVersion'];
-           system.log("OS version detected: " + test);
-           result = (system.compareVersions(test, '10.6') >= 0);
-       } catch (e) { system.log(e); result = false; }
-
-       if (!result)
-       {
-           my.result.type = 'Fatal';
-           my.result.title = system.localizedString('UNSUPPORTED_OS_TLE');
-           my.result.message = system.localizedString('UNSUPPORTED_OS_MSG');
-           return result;
-       }
-
-       system.log("result:" + result);
-       return result;
+        sArch = system.sysctl('hw.machine');
+        system.log("Detected hw arch:    " + sArch);
+        sVer  = system.version['ProductVersion'];
+        system.log("Detected OS version: " + sVer);
+        if (sArch == 'i386')
+        {
+            if (system.compareVersions(sVer, '10.8') &lt; 0)
+            {
+                system.log("checkPrerequisites returns true");
+                return true;
+            }
+        }
+        system.log("checkPrerequisites returns false!");
+        my.result.type    = 'Fatal';
+        my.result.title   = system.localizedString('UNSUPPORTED_X86_OS_TLE');
+        my.result.message = system.localizedString('UNSUPPORTED_X86_OS_MSG');
+        return false;
     }
     /* js:pkmk:end */
@@ -52 +53 @@
         <pkg-ref id="org.virtualbox.pkg.additions.tools-and-services"></pkg-ref>
     </choice>
-    <choice id="choiceVBoxKEXTs"   title="choiceVBoxKEXTs_title"   description="choiceVBoxKEXTs_msg"   start_selected="true" start_enabled="false" start_visible="true">
+    <choice id="choiceVBoxKEXTs" title="choiceVBoxKEXTs_title" description="choiceVBoxKEXTs_msg" start_selected="true" start_enabled="false" start_visible="true">
         <pkg-ref id="org.virtualbox.pkg.additions.kexts"></pkg-ref>
     </choice>