winpython
diff --git a/‎make.py‎
Lines changed: 3 additions & 3 deletions b/‎make.py‎
Lines changed: 3 additions & 3 deletions
diff --git a/‎scripts/2to3.bat‎
Lines changed: 0 additions & 2 deletions b/‎scripts/2to3.bat‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎scripts/wpcp‎
Lines changed: 0 additions & 3 deletions b/‎scripts/wpcp‎
Lines changed: 0 additions & 3 deletions
diff --git a/‎scripts/wpcp.bat‎
Lines changed: 0 additions & 2 deletions b/‎scripts/wpcp.bat‎
Lines changed: 0 additions & 2 deletions
diff --git a/‎setup.py‎
Lines changed: 7 additions & 6 deletions b/‎setup.py‎
Lines changed: 7 additions & 6 deletions
diff --git a/‎winpython/controlpanel.py‎
Lines changed: 1 addition & 1 deletion b/‎winpython/controlpanel.py‎
Lines changed: 1 addition & 1 deletion
@@ -522,7 +522,7 @@ def _create_launchers(self):
 
         self.create_launcher('WinPython Control Panel.exe', 'winpython.ico',
                              command='${WINPYDIR}\pythonw.exe',
-                             args='wpcp', workdir='${WINPYDIR}\Scripts')
+                             args='-m winpython.controlpanel', workdir='${WINPYDIR}\Scripts')
 
         python_lib_dir = osp.join(self.winpydir, self.python_name,
                                   r"Lib\site-packages")
@@ -677,7 +677,7 @@ def _create_batch_scripts(self):
                                  r"""@echo off
 call %~dp0env.bat
 call %~dp0register_python.bat --all""")
-        self.create_python_batch('wpcp.bat', 'wpcp', workdir='Scripts')
+        self.create_python_batch('wpcp.bat', '-m winpython.controlpanel', workdir='Scripts')
         self.create_python_batch('pyqt4_demo.bat', 'qtdemo.pyw',
              workdir=r'Lib\site-packages\PyQt4\examples\demos\qtdemo')
         self.create_python_batch('pyqt5_demo.bat', 'qtdemo.pyw',
@@ -834,7 +834,7 @@ def make_winpython(build_number, release_level, architecture,
         os.mkdir(builddir)
 
     # Create 1 wheel directory to receive all packages whished  for build
-    wheeldir = osp.join(builddir, 'wheels_tmp' + suffix)
+    wheeldir = osp.join(builddir, 'wheels_tmp_%s' % architecture)
     if osp.isdir(wheeldir):
         shutil.rmtree(wheeldir, onerror=utils.onerror)
     os.mkdir(wheeldir)
 
@@ -13,11 +13,6 @@
 
 # for wheels creation
 import setuptools
-try:
-    from wheel.bdist_wheel import bdist_wheel
-except ImportError:
-    pass
-
 
 from distutils.core import setup
 import os
@@ -71,7 +66,13 @@ def get_subpackages(name):
       # requires=["PyQt4 (>=4.5)"],
       scripts=[osp.join('scripts', fname) for fname in
                ('register_python', 'register_python.bat',
-                'wpcp', 'wpcp.bat', 'wppm', 'wppm.bat', '2to3.bat')],
+                'wppm', 'wppm.bat')],
+      # use setuptools functionalities
+      entry_points={
+        'console_scripts': [
+            'wpcp = winpython.controlpanel:main',
+                           ]
+        },
       classifiers=['License :: OSI Approved :: MIT License',
                    'Operating System :: MacOS',
                    'Operating System :: Microsoft :: Windows',
 
@@ -766,4 +766,4 @@ def test():
 
 
 if __name__ == "__main__":
-    test()
+    main()
Original file line number	Diff line number	Diff line change
`@@ -766,4 +766,4 @@ def test():`
`766`	`766`
`767`	`767`
`768`	`768`	`if __name__ == "__main__":`
`769`		`- test()`
	`769`	`+ main()`