Changeset 56936 in vbox for trunk/src/VBox/Installer/darwin

Timestamp:

Jul 14, 2015 10:23:22 PM (9 years ago)

Author:

vboxsync

Message:

Installer/darwin: We now require 10.8 and amd64 architecture (aka x86_64).

Location:

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg

Files:

• Localizable.strings (modified) (1 diff)
• distribution.dist (modified) (2 diffs)

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/Localizable.strings

@@ -14 +14 @@
 
 'UNSUPPORTED_HW_MACHINE_TLE' = "Unsupported hardware architecture detected!";
-'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the x86 and amd64 architectures.";
+'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the amd64 architecture.";
 
 'UNSUPPORTED_OS_TLE' = "Unsupported OS version detected!";
-'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. VirtualBox requires Mac OS X 10.6 or later.";
+'UNSUPPORTED_OS_MSG' = "The installer has detected an unsupported operation system. VirtualBox requires Mac OS X 10.8 or later.";
 

trunk/src/VBox/Installer/darwin/VirtualBox_mpkg/distribution.dist

@@ -25 +25 @@
        try
        {
+           test = system.version['ProductVersion'];
+           system.log("OS version detected: " + test);
+           result = (system.compareVersions(test, '10.8') >= 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;
+       }
+
+       try
+       {
            test = system.sysctl('hw.machine');
            system.log("Hardware architecture detected: " + test);
-           result = (test == 'i386' || test == 'x86_64');
+           result = (test == 'x86_64');
        } catch (e) { system.log(e); result = false; }
 
@@ -35 +50 @@
            my.result.title = system.localizedString('UNSUPPORTED_HW_MACHINE_TLE');
            my.result.message = system.localizedString('UNSUPPORTED_HW_MACHINE_MSG');
-           return result;
-       }
-
-       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;
        }