[vbox-dev] Patches for OSX 10.12 and 10.13 guests

[Kalogrianitis Socratis]

The templates for OSX 10.12, 10.13 were added in rev. https://www.virtualbox.org/changeset/68314/vbox. Thank you! And for backporting it to the 5.1.x series as well!

However, I think that there may be more that need to be changed. Here's a series of patches that I believe should be applied:

- In 'configure' add support for building VirtualBox in 10.13. Haven't tested it fully, there may be more needed. Will know by tomorrow.

- In 'doc/manual/en_US/user_Introduction.xml' include 10.13 as a supported guest (I know, forward looking statement).

- In 'src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h' and 'src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp' the definitions were missing.

- In 'src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp' copy/paste errors in the 3-letter auto-recognition of the OS.

- In 'src/libs/xpcom18a4/python/Makefile.kmk' a slight change to a comment to let you know that 10.13 still uses Python 2.7.

- There are two more questions:
1) Is there anything that needs to be done in terms of font substitution in 'src/VBox/Frontends/VirtualBox/src/main.cpp:382' (r68467), and

2) I assume that in lines 336 and 436 of 'src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp' (r68467) this is where the zoom button for the VM window is handled, according to the 1st bullet item of the 5.0.8 changelog. That should stay as is, I'm just asking if there is anything for me to test.

Socratis



Index: configure
===================================================================
--- configure	(revision 68467)
+++ configure	(working copy)
@@ -2191,6 +2191,14 @@
   test_header "Darwin version"
   darwin_ver=`uname -r`
   case "$darwin_ver" in
+    17\.*)
+      check_xcode_sdk_path "$WITH_XCODE_DIR"
+      [ $? -eq 1 ] || fail
+      darwin_ver="10.13" # High Sierra
+      sdk=$WITH_XCODE_DIR/Developer/SDKs/MacOSX10.6.sdk
+      cnf_append "VBOX_WITH_MACOSX_COMPILERS_FROM_DEVEL" "1"
+      cnf_append "VBOX_PATH_MACOSX_DEVEL_ROOT" "$WITH_XCODE_DIR/Developer"
+      ;;
     16\.*)
       check_xcode_sdk_path "$WITH_XCODE_DIR"
       [ $? -eq 1 ] || fail


Index: doc/manual/en_US/user_Introduction.xml
===================================================================
--- doc/manual/en_US/user_Introduction.xml	(revision 68467)
+++ doc/manual/en_US/user_Introduction.xml	(working copy)
@@ -469,6 +469,10 @@
             <para>10.12 (Sierra)</para>
           </listitem>
 
+          <listitem>
+            <para>10.13 (High Sierra)</para>
+          </listitem>
+
         </itemizedlist>
 
         <para>Intel hardware is required; please see <xref


Index: src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h
===================================================================
--- src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(revision 68467)
+++ src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h	(working copy)
@@ -101,6 +101,8 @@
     MacOSXRelease_Mavericks,
     MacOSXRelease_Yosemite,
     MacOSXRelease_ElCapitan,
+    MacOSXRelease_Sierra,
+    MacOSXRelease_HighSierra,
     MacOSXRelease_New,
 };
 #endif /* VBOX_WS_MAC */


Index: src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(revision 68467)
+++ src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp	(working copy)
@@ -327,6 +327,8 @@
         release[13] = MacOSXRelease_Mavericks;
         release[14] = MacOSXRelease_Yosemite;
         release[15] = MacOSXRelease_ElCapitan;
+        release[16] = MacOSXRelease_Sierra;
+        release[17] = MacOSXRelease_HighSierra;
 
         /* Cut the major release index of the string we have, s.a. 'man uname': */
         const int iRelease = QString(info.release).section('.', 0, 0).toInt();


Index: src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
===================================================================
--- src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(revision 68467)
+++ src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp	(working copy)
@@ -111,9 +111,9 @@
     { QRegExp( "(mac.*10[.,]{0,1}8)|(os.*x.*10[.,]{0,1}8)|(Lion)",                              Qt::CaseInsensitive), "MacOS107_64" },
     { QRegExp( "(mac.*10[.,]{0,1}9)|(os.*x.*10[.,]{0,1}9)|(mac.*mav)|(os.*x.*mav)|(Mavericks)", Qt::CaseInsensitive), "MacOS109_64" },
     { QRegExp( "(mac.*yos)|(os.*x.*yos)|(Yosemite)",                                            Qt::CaseInsensitive), "MacOS1010_64" },
-    { QRegExp( "(mac.*yos)|(os.*x.*capit)|(Capitan)",                                           Qt::CaseInsensitive), "MacOS1011_64" },
-    { QRegExp( "(mac.*yos)|(os.*x.*high.*sierr)|(High Sierra)",                                 Qt::CaseInsensitive), "MacOS1013_64" },
-    { QRegExp( "(mac.*yos)|(os.*x.*sierr)|(Sierra)",                                            Qt::CaseInsensitive), "MacOS1012_64" },
+    { QRegExp( "(mac.*cap)|(os.*x.*capit)|(Capitan)",                                           Qt::CaseInsensitive), "MacOS1011_64" },
+    { QRegExp( "(mac.*hig)|(os.*x.*high.*sierr)|(High Sierra)",                                 Qt::CaseInsensitive), "MacOS1013_64" },
+    { QRegExp( "(mac.*sie)|(os.*x.*sierr)|(Sierra)",                                            Qt::CaseInsensitive), "MacOS1012_64" },
     { QRegExp("((Mac)|(Tig)|(Leop)|(Yose)|(os[ ]*x)).*64",                                      Qt::CaseInsensitive), "MacOS_64" },
     { QRegExp("((Mac)|(Tig)|(Leop)|(Yose)|(os[ ]*x)).*32",                                      Qt::CaseInsensitive), "MacOS" },
 


Index: src/libs/xpcom18a4/python/Makefile.kmk
===================================================================
--- src/libs/xpcom18a4/python/Makefile.kmk	(revision 68467)
+++ src/libs/xpcom18a4/python/Makefile.kmk	(working copy)
@@ -66,7 +66,7 @@
    VBOX_PYTHON27_LIB =
   endif
  endif
- # No Python 3.x yet as part of OSX versions including El Capitan, 10.11.
+ # No Python 3.x yet as part of OSX versions including High Sierra, 10.13.
 
 else
  # Use the script.