Fix v56.1 build on Mac (cztomczak#335)

cztomczak · cztomczak · commit 9537590c8ff1 · 2017-03-20T13:14:26.000+01:00
diff --git a/src/client_handler/js_dialog_handler.cpp b/src/client_handler/js_dialog_handler.cpp
@@ -27,12 +27,14 @@ bool JSDialogHandler::OnJSDialog(CefRefPtr<CefBrowser> browser,
                                             dialog_type, message_text,
                                             default_prompt_text,
                                             callback, suppress_message);
+#if defined(OS_LINUX)
     if (!ret) {
         // Default implementation
         return dialog_handler_->OnJSDialog(browser, origin_url, dialog_type,
                                            message_text, default_prompt_text,
                                            callback, suppress_message);
     }
+#endif
     return ret;
 }
 
@@ -47,20 +49,24 @@ bool JSDialogHandler::OnBeforeUnloadDialog(
     bool ret = JavascriptDialogHandler_OnBeforeUnloadJavascriptDialog(
                                                 browser, message_text,
                                                 is_reload, callback);
+#if defined(OS_LINUX)
     if (!ret) {
         // Default implementation
         return dialog_handler_->OnBeforeUnloadDialog(browser, message_text,
                                                      is_reload, callback);
     }
+#endif
     return ret;
 }
 
 
 void JSDialogHandler::OnResetDialogState(CefRefPtr<CefBrowser> browser)
 {
     REQUIRE_UI_THREAD();
+#if defined(OS_LINUX)
     // Default implementation
     dialog_handler_->OnResetDialogState(browser);
+#endif
     // User implementation
     JavascriptDialogHandler_OnResetJavascriptDialogState(browser);
 }
diff --git a/src/compile_time_constants.pxi b/src/compile_time_constants.pxi
@@ -1,3 +1,3 @@
 # This file was generated by setup.py
-DEF UNAME_SYSNAME = "Linux"
-DEF PY_MAJOR_VERSION = 2
+DEF UNAME_SYSNAME = "Darwin"
+DEF PY_MAJOR_VERSION = 3
diff --git a/tools/automate.py b/tools/automate.py
@@ -598,7 +598,7 @@ def build_wrapper_library_mac():
     # from cefclient.
     cmake_wrapper = prepare_build_command(build_lib=True)
     cmake_wrapper.extend(["cmake", "-G", "Ninja",
-                          "-DPROJECT_ARCH=x86_64"
+                          "-DPROJECT_ARCH=x86_64",
                           "-DCMAKE_CXX_FLAGS=-stdlib=libc++",
                           "-DCMAKE_BUILD_TYPE=" + Options.build_type,
                           ".."])
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
@@ -6,8 +6,6 @@
 Build distribution packages for all architectures and all supported
 python versions.
 
-TODO: Mac support. Currently runs only on Windows/Linux.
-
 Usage:
     build_distrib.py VERSION [--no-run-examples] [--no-rebuild]
 
@@ -24,9 +22,11 @@
 1. Expects that all supported python versions are installed
    a) On Windows search for Pythons in the multiple default install
       locations
-   b) On Mac use system Python 2.7 and Python 3 from ~/.pyenv/versions/
+   b) On Linux use only Pythons from ~/.pyenv/versions/
       directory
-   c) On Linux use only Pythons from ~/.pyenv/versions/ directory
+   c) On Mac use Pythons from ~/.pyenv/versions/ and /usr/local/bin/python
+      For example will use Python 2.7.13 from /usr/local/bin/ only
+      when 2.7 was not found in ~/.pyenv/versions/.
 2. Expects that all python compilers for supported python versions
    are installed. See docs/Build-instructions.md > Requirements.
 3. Expects cef_binary*/ directories from Spotify Automated Builds
@@ -83,6 +83,10 @@
     LINUX=[
         "%PYENV_ROOT%/versions/*/bin",
     ],
+    MAC=[
+        "%PYENV_ROOT%/versions/*/bin",
+        "/usr/local/bin",
+    ],
 )
 
 
@@ -516,7 +520,7 @@ def test_wheel_packages(pythons):
         print("[build_distrib.py] Test wheel package (install, unittests) for"
               " {python_name}".format(python_name=python["name"]))
         platform_tag = get_pypi_postfix2_for_arch(python["arch"])
-        whl_pattern = (r"*-{platform_tag}.whl"
+        whl_pattern = (r"*{platform_tag}.whl"
                        .format(platform_tag=platform_tag))
         wheels = glob.glob(os.path.join(DISTRIB_DIR, whl_pattern))
         assert len(wheels) == 1, ("No wheels found in distrib dir for %s"
diff --git a/tools/common.py b/tools/common.py
@@ -47,24 +47,26 @@
 
 # Platforms
 SYSTEM = platform.system().upper()
+if SYSTEM == "DARWIN":
+    SYSTEM = "MAC"
 WINDOWS = SYSTEM if SYSTEM == "WINDOWS" else False
 LINUX = SYSTEM if SYSTEM == "LINUX" else False
-MAC = SYSTEM if SYSTEM == "DARWIN" else False
+MAC = SYSTEM if SYSTEM == "MAC" else False
 
 OS_POSTFIX2_ARCH = dict(
     WINDOWS={"32bit": "win32", "64bit": "win64"},
     LINUX={"32bit": "linux32", "64bit": "linux64"},
-    DARWIN={"32bit": "mac32", "64bit": "mac64"},
+    MAC={"32bit": "mac32", "64bit": "mac64"},
 )
 CEF_POSTFIX2_ARCH = dict(
     WINDOWS={"32bit": "windows32", "64bit": "windows64"},
     LINUX={"32bit": "linux32", "64bit": "linux64"},
-    DARWIN={"64bit": "macosx64"},
+    MAC={"64bit": "macosx64"},
 )
 PYPI_POSTFIX2_ARCH = dict(
     WINDOWS={"32bit": "win32", "64bit": "win_amd64"},
     LINUX={"32bit": "manylinux1_i686", "64bit": "manylinux1_x86_64"},
-    DARWIN={"64bit": "x86_64"},
+    MAC={"64bit": "x86_64"},
 )
 
 # Python version eg. 27
