[Scipy-svn] r4823 - trunk/tools/win32/build_scripts

scipy-svn@scip... scipy-svn@scip...
Tue Oct 21 05:51:25 CDT 2008


Author: cdavid
Date: 2008-10-21 05:51:18 -0500 (Tue, 21 Oct 2008)
New Revision: 4823

Removed:
   trunk/tools/win32/build_scripts/build.py
   trunk/tools/win32/build_scripts/prepare_bootstrap.py
Log:
Remove unused code.

Deleted: trunk/tools/win32/build_scripts/build.py
===================================================================
--- trunk/tools/win32/build_scripts/build.py	2008-10-21 10:46:57 UTC (rev 4822)
+++ trunk/tools/win32/build_scripts/build.py	2008-10-21 10:51:18 UTC (rev 4823)
@@ -1,176 +0,0 @@
-"""Python script to build windows binaries to be fed to the "superpack".
-
-The script is pretty dumb: it assumes python executables are installed the
-standard way, and the location for blas/lapack/atlas is harcoded."""
-
-import sys
-import subprocess
-import os
-import shutil
-from os.path import join as pjoin, split as psplit, dirname, exists as pexists
-import re
-
-PYEXECS = {"2.5" : "C:\python25\python.exe",
-        "2.4" : "C:\python24\python24.exe",
-        "2.3" : "C:\python23\python23.exe"}
-
-_SSE3_CFG = r"""[atlas]
-library_dirs = C:\local\lib\yop\sse3"""
-_SSE2_CFG = r"""[atlas]
-library_dirs = C:\local\lib\yop\sse2"""
-_NOSSE_CFG = r"""[DEFAULT]
-library_dirs = C:\local\lib\yop\nosse"""
-
-SITECFG = {"sse2" : _SSE2_CFG, "sse3" : _SSE3_CFG, "nosse" : _NOSSE_CFG}
-
-def get_svn_version(chdir):
-    out = subprocess.Popen(['svn', 'info'], 
-                           stdout = subprocess.PIPE, cwd = chdir).communicate()[0]
-    r = re.compile('Revision: ([0-9]+)')
-    svnver = None
-    for line in out.split('\n'):
-        m = r.match(line)
-        if m:
-            svnver = m.group(1)
-
-    if not svnver:
-        raise ValueError("Error while parsing svn version ?")
-
-    return svnver
-
-def get_scipy_version(src_root):
-    version_file = pjoin(src_root, "scipy", "version.py")
-    if not pexists(version_file):
-        raise IOError("file %s not found" % version_file)
-
-    fid = open(version_file, "r")
-    vregex = re.compile("version\s*=\s*'(\d+)\.(\d+)\.(\d+)'")
-    isrelregex = re.compile("release\s*=\s*True")
-    isdevregex = re.compile("release\s*=\s*False")
-    isdev = None
-    version = None
-    for line in fid.readlines():
-        m = vregex.match(line)
-        if m:
-            version = [int(i) for i in m.groups()]
-        if isrelregex.match(line):
-            if isdev is None:
-                isdev = False
-            else:
-                raise RuntimeError("isdev already set ?")
-        if isdevregex.match(line):
-            if isdev is None:
-                isdev = True
-            else:
-                raise RuntimeError("isdev already set ?")
-            
-    verstr = ".".join([str(i) for i in version])
-    if isdev:
-        verstr += ".dev"
-        verstr += get_svn_version(src_root)
-    return verstr
-
-def get_python_exec(ver):
-    """Return the executable of python for the given version."""
-    # XXX Check that the file actually exists
-    try:
-        return PYEXECS[ver]
-    except KeyError:
-        raise ValueError("Version %s not supported/recognized" % ver)
-
-def get_clean():
-    if os.path.exists("build"):
-        shutil.rmtree("build")
-    if os.path.exists("dist"):
-        shutil.rmtree("dist")
-
-def write_site_cfg(arch):
-    if os.path.exists("site.cfg"):
-        os.remove("site.cfg")
-    f = open("site.cfg", 'w')
-    f.writelines(SITECFG[arch])
-    f.close()
-
-def build(arch, pyver):
-    print "Building scipy binary for python %s, arch is %s" % (get_python_exec(pyver), arch)
-    get_clean()
-    write_site_cfg(arch)
-
-    if BUILD_MSI:
-        cmd = "%s setup.py build -c mingw32 bdist_msi" % get_python_exec(pyver)
-    else:
-        cmd = "%s setup.py build -c mingw32 bdist_wininst" % get_python_exec(pyver)
-    build_log = "build-%s-%s.log" % (arch, pyver)
-    f = open(build_log, 'w')
-
-    try:
-        try:
-            subprocess.check_call(cmd, shell = True, stderr = subprocess.STDOUT, stdout = f)
-        finally:
-            f.close()
-    except subprocess.CalledProcessError, e:
-        msg = """
-There was an error while executing the following command:
-
-    %s
-
-Error was : %s
-
-Look at the build log (%s).""" % (cmd, str(e), build_log)
-        raise Exception(msg)
-
-    move_binary(arch, pyver)
-
-def move_binary(arch, pyver):
-    if not os.path.exists("binaries"):
-        os.makedirs("binaries")
-
-    shutil.move(os.path.join('dist', get_windist_exec(pyver)),
-            os.path.join("binaries", get_binary_name(arch)))
-
-def get_binary_name(arch):
-    if BUILD_MSI:
-        ext = '.msi'
-    else:
-        ext = '.exe'
-    return "scipy-%s-%s%s" % (get_scipy_version(), arch, ext)
-
-def get_windist_exec(pyver):
-    """Return the name of the installer built by wininst command."""
-    # Yeah, the name logic is harcoded in distutils. We have to reproduce it
-    # here
-    if BUILD_MSI:
-        ext = '.msi'
-    else:
-        ext = '.exe'
-    name = "scipy-%s.win32-py%s%s" % (get_scipy_version(ROOT), pyver, ext)
-    return name
-
-if __name__ == '__main__':
-    ROOT = pjoin("..", "..", "..", "..")
-    from optparse import OptionParser
-    parser = OptionParser()
-    parser.add_option("-a", "--arch", dest="arch",
-                      help = "Architecture to build (sse2, sse3, nosse, etc...)")
-    parser.add_option("-p", "--pyver", dest="pyver",
-                      help = "Python version (2.4, 2.5, etc...)")
-    parser.add_option("-m", "--build-msi", dest="msi",
-                      help = "0 or 1. If 1, build a msi instead of an exe.")
-
-    opts, args = parser.parse_args()
-    arch = opts.arch
-    pyver = opts.pyver
-    msi = opts.msi
-
-    if not pyver:
-        pyver = "2.5"
-    if not msi:
-        BUILD_MSI = False
-    else:
-        BUILD_MSI = True
-
-    if not arch:
-        for arch in SITECFG.keys():
-            build(arch, pyver)
-    else:
-        build(arch, pyver)

Deleted: trunk/tools/win32/build_scripts/prepare_bootstrap.py
===================================================================
--- trunk/tools/win32/build_scripts/prepare_bootstrap.py	2008-10-21 10:46:57 UTC (rev 4822)
+++ trunk/tools/win32/build_scripts/prepare_bootstrap.py	2008-10-21 10:51:18 UTC (rev 4823)
@@ -1,122 +0,0 @@
-import os
-import shutil
-import subprocess
-from os.path import join as pjoin, split as psplit, dirname, exists as pexists
-import re
-from zipfile import ZipFile
-
-def get_sdist_tarball(src_root):
-    """Return the name of the installer built by sdist command."""
-    # Yeah, the name logic is harcoded in distutils. We have to reproduce it
-    # here
-    name = "scipy-%s.zip" % get_scipy_version(src_root)
-    return name
-
-def build_sdist(chdir):
-    cwd = os.getcwd()
-    try:
-        os.chdir(chdir)
-        cmd = ["python", "setup.py", "sdist", "--format=zip"]
-        subprocess.call(cmd)
-    except Exception, e:
-        raise RuntimeError("Error while executing cmd (%s)" % e)
-    finally:
-        os.chdir(cwd)
-
-def prepare_scipy_sources(src_root, bootstrap = 'bootstrap'):
-    zid = ZipFile(pjoin(src_root, 'dist', get_sdist_tarball(src_root)))
-    root = 'scipy-%s' % get_scipy_version(src_root)
-
-    # From the sdist-built tarball, extract all files into bootstrap directory,
-    # but removing the numpy-VERSION head path
-    for name in zid.namelist():
-        cnt = zid.read(name)
-        if name.startswith(root):
-            # XXX: even on windows, the path sep in zip is '/' ?
-            name = name.split('/', 1)[1]
-        newname = pjoin(bootstrap, name)
-
-        if not os.path.exists(dirname(newname)):
-            os.makedirs(dirname(newname))
-        fid = open(newname, 'wb')
-        fid.write(cnt)
-
-def get_svn_version(chdir):
-    out = subprocess.Popen(['svn', 'info'], 
-                           stdout = subprocess.PIPE, cwd = chdir).communicate()[0]
-    r = re.compile('Revision: ([0-9]+)')
-    svnver = None
-    for line in out.split('\n'):
-        m = r.match(line)
-        if m:
-            svnver = m.group(1)
-
-    if not svnver:
-        raise ValueError("Error while parsing svn version ?")
-
-    return svnver
-
-def get_scipy_version(src_root):
-    version_file = pjoin(src_root, "scipy", "version.py")
-    if not pexists(version_file):
-        raise IOError("file %s not found" % version_file)
-
-    fid = open(version_file, "r")
-    vregex = re.compile("version\s*=\s*'(\d+)\.(\d+)\.(\d+)'")
-    isrelregex = re.compile("release\s*=\s*True")
-    isdevregex = re.compile("release\s*=\s*False")
-    isdev = None
-    version = None
-    for line in fid.readlines():
-        m = vregex.match(line)
-        if m:
-            version = [int(i) for i in m.groups()]
-        if isrelregex.match(line):
-            if isdev is None:
-                isdev = False
-            else:
-                raise RuntimeError("isdev already set ?")
-        if isdevregex.match(line):
-            if isdev is None:
-                isdev = True
-            else:
-                raise RuntimeError("isdev already set ?")
-            
-    verstr = ".".join([str(i) for i in version])
-    if isdev:
-        verstr += ".dev"
-        verstr += get_svn_version(src_root)
-    return verstr
-
-def prepare_nsis_script(bootstrap, pyver, numver):
-    tpl = os.path.join('nsis_scripts', 'scipy-superinstaller.nsi.in')
-    source = open(tpl, 'r')
-    target = open(pjoin(bootstrap, 'scipy-superinstaller.nsi'), 'w')
-
-    installer_name = 'scipy-%s-win32-superpack-python%s.exe' % (numver, pyver)
-    cnt = "".join(source.readlines())
-    cnt = cnt.replace('@SCIPY_INSTALLER_NAME@', installer_name)
-    for arch in ['nosse', 'sse2', 'sse3']:
-        cnt = cnt.replace('@%s_BINARY@' % arch.upper(),
-                          get_binary_name(arch))
-
-    target.write(cnt)
-
-def get_binary_name(arch):
-    return "scipy-%s-%s.exe" % (get_scipy_version(ROOT), arch)
-
-def prepare_bootstrap(src_root, pyver):
-    bootstrap = "bootstrap-%s" % pyver
-    if os.path.exists(bootstrap):
-        shutil.rmtree(bootstrap)
-    os.makedirs(bootstrap)
-
-    build_sdist(src_root)
-    prepare_scipy_sources(src_root, bootstrap)
-
-    shutil.copy('build.py', bootstrap)
-    prepare_nsis_script(bootstrap, pyver, get_scipy_version(src_root))
-
-if __name__ == '__main__':
-    ROOT = os.path.join("..", "..", "..")
-    prepare_bootstrap(ROOT, "2.5")



More information about the Scipy-svn mailing list