Fix platform tag in wheel package on Windows 64-bit

cztomczak · cztomczak · commit 8664386f6736 · 2017-03-11T18:32:57.000+01:00
diff --git a/tools/build_distrib.py b/tools/build_distrib.py
@@ -6,6 +6,7 @@
 Build distribution packages for all architectures and all supported
 python versions.
 
+TODO: test_wheel_package_installation()
 TODO: Linux/Mac support. Currently runs only on Windows.
 
 Usage:
@@ -89,6 +90,7 @@ def main():
         make_packages(pythons_32bit[0], "32bit")
     if pythons_64bit:
         make_packages(pythons_64bit[0], "64bit")
+    test_wheel_package_installation()
     show_summary(pythons_32bit, pythons_64bit)
 
 
@@ -415,6 +417,11 @@ def make_packages(python, arch):
     shutil.rmtree(setup_dir)
 
 
+def test_wheel_package_installation():
+    # PYPI_POSTFIX2_ARCH
+    pass  # TODO
+
+
 def show_summary(pythons_32bit, pythons_64bit):
     print("[build_distrib.py] SUMMARY:")
     print("  Pythons 32bit ({count})".format(count=len(pythons_32bit)))
diff --git a/tools/common.py b/tools/common.py
@@ -50,6 +50,11 @@
     Linux={"32bit": "linux32", "64bit": "linux64"},
     Darwin={"32bit": "mac32", "64bit": "mac64"},
 )
+PYPI_POSTFIX2_ARCH = dict(
+    Windows={"32bit": "win32", "64bit": "win-amd64"},
+    Linux={"32bit": "i686", "64bit": "x86_64"},
+    Darwin={"64bit": "x86_64"},
+)
 
 # Python version eg. 27
 PYVERSION = str(sys.version_info[0])+str(sys.version_info[1])
diff --git a/tools/installer/cefpython3.setup.py b/tools/installer/cefpython3.setup.py
@@ -81,11 +81,11 @@ class custom_bdist_wheel(bdist_wheel):
         def get_tag(self):
             tag = bdist_wheel.get_tag(self)
             platform_tag = sysconfig.get_platform()
+            platform_tag = platform_tag.replace("-", "_")
             if platform.system() == "Linux":
                 assert "linux" in platform_tag
                 # "linux-x86_64" replace with "manylinux1_x86_64"
                 platform_tag = platform_tag.replace("linux", "manylinux1")
-                platform_tag = platform_tag.replace("-", "_")
             elif platform.system() == "Darwin":
                 # For explanation of Mac platform tags, see:
                 # http://lepture.com/en/2014/python-on-a-hard-wheel
