codeit
diff --git a/Collapse file
‎tools/build.py‎
Copy file name to clipboardExpand all lines: tools/build.py
+5-2Lines changed: 5 additions & 2 deletions b/Collapse file
‎tools/build.py‎
Copy file name to clipboardExpand all lines: tools/build.py
+5-2Lines changed: 5 additions & 2 deletions
diff --git a/Collapse file
‎tools/installer/cefpython3.setup.py‎
Copy file name to clipboardExpand all lines: tools/installer/cefpython3.setup.py
+20-1Lines changed: 20 additions & 1 deletion b/Collapse file
‎tools/installer/cefpython3.setup.py‎
Copy file name to clipboardExpand all lines: tools/installer/cefpython3.setup.py
+20-1Lines changed: 20 additions & 1 deletion
@@ -678,9 +678,12 @@ def install_and_run():
     # Run examples
     print("[build.py] Run examples")
     os.chdir(EXAMPLES_DIR)
+    kivy_flag = "--kivy" if KIVY_FLAG else ""
     run_examples = os.path.join(TOOLS_DIR, "run_examples.py")
-    ret = os.system("{python} {run_examples}"
-                    .format(python=sys.executable, run_examples=run_examples))
+    ret = os.system("{python} {run_examples} {kivy_flag}"
+                    .format(python=sys.executable,
+                            run_examples=run_examples,
+                            kivy_flag=kivy_flag))
     if ret != 0:
         print("[build.py] ERROR while running examples")
         sys.exit(1)
 
@@ -24,6 +24,7 @@
 import platform
 import subprocess
 import sys
+import sysconfig
 
 # The setuptools package is not installed by default on a clean
 # Ubuntu. Might be also a case on Windows. Also Python Eggs
@@ -92,6 +93,19 @@ def get_tag(self):
             return tag
 
     cmdclass["bdist_wheel"] = custom_bdist_wheel
+elif platform.system() in ["Windows", "Linux"] and "bdist_wheel" in sys.argv:
+    # On Windows and Linux platform tag is always "any".
+    print("[setup.py] Overload bdist_wheel command to fix platform tag")
+    from wheel.bdist_wheel import bdist_wheel
+
+    class custom_bdist_wheel(bdist_wheel):
+        def get_tag(self):
+            tag = bdist_wheel.get_tag(self)
+            platform_tag = sysconfig.get_platform()
+            tag = (tag[0], tag[1], platform_tag)
+            return tag
+
+    cmdclass["bdist_wheel"] = custom_bdist_wheel
 
 
 def main():
@@ -132,7 +146,12 @@ def main():
             "Topic :: Software Development :: User Interfaces",
         ],
     )
-    print("[setup.py] OK installed")
+    if "install" in sys.argv:
+        print("[setup.py] OK installed")
+    elif "bdist_wheel" in sys.argv:
+        print("[setup.py] OK created wheel package in dist/ directory")
+    else:
+        print("[setup.py] Unknown command line arguments")
 
 
 def get_package_data():