make.py: make_all function now allows to build any Python 2.x or 3.x distro

PierreRaybaut · PierreRaybaut · commit 91519c9ec74b · 2013-01-29T10:34:34.000+01:00
with a single/simple command. It is recommended to set the WINPYTHONROOTDIR
environment variable so that the `rootdir` option may be skipped.
diff --git a/build_dist.bat b/build_dist.bat
@@ -2,8 +2,4 @@ rmdir /S /Q build
 rmdir /S /Q dist
 python setup.py build bdist_wininst --plat-name=win32
 python setup.py build bdist_wininst --plat-name=win-amd64
-del %WINPYTHONBASEDIR%\packages.win32\winpython-*.exe
-del %WINPYTHONBASEDIR%\packages.win-amd64\winpython-*.exe
-move dist\winpython-*.win-amd64.exe %WINPYTHONBASEDIR%\packages.win-amd64
-move dist\winpython-*.win32.exe %WINPYTHONBASEDIR%\packages.win32
 pause
diff --git a/make.py b/make.py
@@ -594,21 +594,33 @@ def rebuild_winpython(basedir=None, verbose=False):
                             architecture=architecture, verbose=verbose)
 
 
-def make_winpython(build_number, release_level, architecture,
-                   basedir=None, verbose=False, remove_existing=True,
-                   create_installer=True, simulation=False):
-    """Make WinPython distribution, assuming that the following folders exist
-    in *basedir* directory (if basedir is None, the WINPYTHONBASEDIR environ-
-    ment variable is assumed to be basedir):
-    
+ROOTDIR_DOC = """
+
+    The WinPython root directory (WINPYTHONROOTDIR environment variable which 
+    may be overriden with the `rootdir` option) contains the following folders:
       * (required) `packages.win32`: contains distutils 32-bit packages
       * (required) `packages.win-amd64`: contains distutils 64-bit packages
       * (optional) `packages.src`: contains distutils source distributions
       * (required) `tools`: contains architecture-independent tools
       * (optional) `tools.win32`: contains 32-bit-specific tools
-      * (optional) `tools.win-amd64`: contains 64-bit-specific tools
+      * (optional) `tools.win-amd64`: contains 64-bit-specific tools"""
+
+def make_winpython(build_number, release_level, architecture,
+                   basedir=None, verbose=False, remove_existing=True,
+                   create_installer=True, simulation=False):
+    """Make WinPython distribution, for a given base directory and 
+    architecture:
+
+    make_winpython(build_number, release_level, architecture,
+                   basedir=None, verbose=False, remove_existing=True,
+                   create_installer=True, simulation=False)
     
-    architecture: integer (32 or 64)"""
+    `build_number`: build number [int]
+    `release_level`: release level (e.g. 'beta1', '') [str]
+    `architecture`: [int] (32 or 64)
+    `basedir`: [str] if None, WINPYTHONBASEDIR env var must be set
+    (rootdir: root directory containing 'basedir27', 'basedir33', etc.)
+    """ + ROOTDIR_DOC
     basedir = basedir if basedir is not None else utils.BASE_DIR
     assert basedir is not None, "The *basedir* directory must be specified"
     assert architecture in (32, 64)
@@ -635,19 +647,30 @@ def make_winpython(build_number, release_level, architecture,
         dist.create_installer()
     return dist
 
-
-def make_all(build_number, release_level, basedir=None, simulation=False,
-             create_installer=True, verbose=False, remove_existing=True):
-    """Make WinPython for both 32 and 64bit architectures"""
+def make_all(build_number, release_level, pyver,
+             rootdir=None, simulation=False, create_installer=True,
+             verbose=False, remove_existing=True):
+    """Make WinPython for both 32 and 64bit architectures:
+    
+    make_all(build_number, release_level, pyver, rootdir, simulation=False,
+             create_installer=True, verbose=False, remove_existing=True)
+
+    `build_number`: build number [int]
+    `release_level`: release level (e.g. 'beta1', '') [str]
+    `pyver`: Python version (X.Y format) [str]
+    `rootdir`: [str] if None, WINPYTHONROOTDIR env var must be set
+    (rootdir: root directory containing 'basedir27', 'basedir33', etc.)
+    """ + ROOTDIR_DOC
+    assert re.match(r'[0-9]+\.[0-9]+', pyver) is not None
+    rootdir = rootdir if rootdir is not None else utils.ROOT_DIR
+    assert rootdir is not None, "The *rootdir* directory must be specified"
+    basedir = osp.join(rootdir, 'basedir%s' % pyver[::2])
+    rebuild_winpython(basedir=basedir)
     for architecture in (64, 32):
-        make_winpython(build_number, release_level, architecture,
-                       basedir, verbose, remove_existing, create_installer,
-                       simulation)
+        make_winpython(build_number, release_level, architecture, basedir,
+                       verbose, remove_existing, create_installer, simulation)
 
 
 if __name__ == '__main__':
-    rebuild_winpython(basedir=r'D:\winpython\basedir33')
-#    make_winpython(0, 'alpha1', 32, basedir=r'D:\winpython\basedir33',
-#                   create_installer=False)#, simulation=True)
-                   #remove_existing=False, create_installer=False)
-    make_all(0, 'beta1', basedir=r'D:\winpython\basedir33')#, simulation=True)#, remove_existing=False, create_installer=False)
+#    make_all(0, 'beta2', pyver='3.3')
+    make_all(3, '', pyver='2.7')
diff --git a/winpython/__init__.py b/winpython/__init__.py
@@ -27,7 +27,7 @@
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
-__version__ = '0.10'
+__version__ = '0.11'
 __license__ = __doc__
 __project_url__ = 'http://code.google.com/p/winpython'
 __forum_url__   = 'http://groups.google.com/group/winpython'
diff --git a/winpython/utils.py b/winpython/utils.py
@@ -31,6 +31,7 @@
 TOOLS_DIR = osp.abspath(osp.join(osp.dirname(__file__), os.pardir, 'tools'))
 if osp.isdir(TOOLS_DIR):
     os.environ['PATH'] += ';%s' % TOOLS_DIR
+ROOT_DIR = os.environ.get('WINPYTHONROOTDIR')
 BASE_DIR = os.environ.get('WINPYTHONBASEDIR')
 
 
