Update distrib directory names on various platforms

cztomczak · cztomczak · commit b89b93ff9ea6 · 2017-04-21T07:58:47.000+02:00
diff --git a/tools/automate.py b/tools/automate.py
@@ -224,11 +224,11 @@ def build_cef():
           % Options.binary_distrib)
 
     if Options.x86:
-        print("[automate.py] INFO: to build CEF projects and create prebuilt"
-              " binaries you have to use 32-bit chroot. Copy the binary"
+        print("[automate.py] INFO: Build CEF projects and create prebuilt"
+              " binaries on Linux 32-bit using eg. VirtualBox. Copy the binary"
               " distrib's cef_binary_*/ directory (path displayed above) to"
               " cefpython's build/ directory. Then run automate.py"
-              " --prebuilt-cef using 32-bit chroot.")
+              " --prebuilt-cef on Linux 32-bit.")
         sys.exit(0)
     else:
         # Build cefclient, cefsimple, ceftests, libcef_dll_wrapper
diff --git a/tools/common.py b/tools/common.py
@@ -27,8 +27,14 @@
 ARCH_STR = platform.architecture()[0]
 
 # OS_POSTFIX is for directories/files names in cefpython sources
+#            and doesn't include architecture type, just OS name.
+
 # OS_POSTFIX2 is for platform name in cefpython binaries
+#             and includes architecture type (32bit/64bit).
+
 # CEF_POSTFIX2 is for platform name in upstream CEF binaries
+#              and includes architecture type (32bit/64bit).
+
 OS_POSTFIX = ("win" if platform.system() == "Windows" else
               "linux" if platform.system() == "Linux" else
               "mac" if platform.system() == "Darwin" else "unknown")
@@ -353,17 +359,23 @@ def _detect_distrib_dir():
         # Will only be set when called from scripts that had version
         # number arg passed on command line: build.py, build_distrib.py,
         # make_installer.py, etc.
-        if LINUX:
-            # On Linux buildig 32bit and 64bit separately, so don't
+        if LINUX or MAC:
+            # - On Linux buildig 32bit and 64bit separately, so don't
             # delete eg. 64bit distrib when building 32bit distrib.
             # Keep them in different directories.
+            # - On Mac only 64bit is supported.
             dirname = ("distrib_{version}_{postfix2}"
                        .format(version=version, postfix2=OS_POSTFIX2))
-        else:
+        elif WINDOWS:
             # On Windows both 32bit and 64bit distribs are built at
             # the same time.
-            # On Mac only 64bit is supported.
-            dirname = "distrib_{version}".format(version=version)
+            dirname = ("distrib_{version}_{win32}_{win64}"
+                       .format(version=version,
+                               win32=OS_POSTFIX2_ARCH[WINDOWS]["32bit"],
+                               win64=OS_POSTFIX2_ARCH[WINDOWS]["64bit"]))
+        else:
+            dirname = ("distrib_{version}_{postfix}"
+                       .format(version=version, postfix=OS_POSTFIX))
         DISTRIB_DIR = os.path.join(BUILD_DIR, dirname)
 
 
