Author: Armin Rigo <[email protected]>
Branch:
Changeset: r59714:ef9572dfacca
Date: 2013-01-05 09:37 +0100
http://bitbucket.org/pypy/pypy/changeset/ef9572dfacca/
Log: Fix more urls. We should at some point grep for 'codespeak' in
pypy/doc and cry.
diff --git a/pypy/module/README.txt b/pypy/module/README.txt
--- a/pypy/module/README.txt
+++ b/pypy/module/README.txt
@@ -3,7 +3,7 @@
that require access to interpreter level. See here
for more information:
- http://codespeak.net/pypy/dist/pypy/doc/coding-guide.html#modules-in-pypy
+ http://doc.pypy.org/en/latest/coding-guide.html#modules-in-pypy
ATTENTION: don't put any '.py' files directly into pypy/module
because you can easily get import mixups on e.g. "import sys"
diff --git a/pypy/tool/option.py b/pypy/tool/option.py
--- a/pypy/tool/option.py
+++ b/pypy/tool/option.py
@@ -6,7 +6,7 @@
import optparse
extra_useage = """For detailed descriptions of all the options see
-http://codespeak.net/pypy/dist/pypy/doc/config/commandline.html""";
+http://doc.pypy.org/en/latest/config/commandline.html""";
def get_standard_options():
config = get_pypy_config()
diff --git a/pypy/tool/release/make_release.py
b/pypy/tool/release/make_release.py
deleted file mode 100755
--- a/pypy/tool/release/make_release.py
+++ /dev/null
@@ -1,99 +0,0 @@
-#!/usr/bin/env python
-
-""" A tool to download correct pypy-c's from nightly build run and package them
-into release packages. Note: you must run apropriate buildbots first and
-make sure there are no failures. Use force-builds.py from the same directory.
-
-Usage: make_release.py <branchname> <version>
- e.g.: make_release.py release-1.4.1 1.4.1
-"""
-
-import autopath
-import sys
-import urllib2
-from xml.dom import minidom
-import re
-import py
-from pypy.tool.udir import udir
-from pypy.tool.release.package import package
-import tarfile
-import os
-import shutil
-
-BASEURL = 'http://buildbot.pypy.org/nightly/'
-PAUSE = False
-
-def browse_nightly(branch,
- baseurl=BASEURL,
- override_xml=None):
- if override_xml is None:
- url = baseurl + branch + '/'
- xml = urllib2.urlopen(url).read()
- else:
- xml = override_xml
- dom = minidom.parseString(xml)
- refs = [node.getAttribute('href') for node in dom.getElementsByTagName('a')
- if 'pypy' in node.getAttribute('href')]
- # all refs are of form: pypy-c-{type}-{revnum}-{hghash}-{platform}.tar.bz2
- r = re.compile('pypy-c-([\w\d]+)-(\d+)-([0-9a-f]+)-([\w\d]+).tar.bz2$')
- d = {}
- for ref in refs:
- kind, revnum, hghash, platform = r.match(ref).groups()
- rev = int(revnum)
- try:
- lastrev, _ = d[(kind, platform)]
- except KeyError:
- lastrev = -1
- if rev > lastrev:
- d[(kind, platform)] = rev, ref
- return d
-
-def main(branch, release):
- to_download = browse_nightly(branch)
- tmpdir = udir.join('download')
- tmpdir.ensure(dir=True)
- alltars = []
- olddir = os.getcwd()
- try:
- os.chdir(str(tmpdir))
- print 'Using tmpdir', str(tmpdir)
- for (kind, platform), (rev, name) in to_download.iteritems():
- if platform == 'win32':
- print 'Ignoring %s, windows unsupported' % name
- else:
- print "Downloading %s at rev %d" % (name, rev)
- url = BASEURL + branch + "/" + name
- data = urllib2.urlopen(url).read()
- tmpdir.join(name).write(data, mode="wb")
- t = tarfile.open(str(tmpdir.join(name)))
- dirname = t.getmembers()[0].name
- t.extractall(path=str(tmpdir))
- if kind == 'jit':
- kind = ''
- else:
- kind = '-' + kind
- topdirname = 'pypy-%s-%s%s' % (release, platform, kind)
- os.system('mv %s %s' % (str(tmpdir.join(dirname)),
- str(tmpdir.join(topdirname))))
- if PAUSE:
- print 'Pausing, press Enter...'
- raw_input()
- name = '%s.tar.bz2' % topdirname
- print "Building %s" % name
- t = tarfile.open(name, 'w:bz2')
- t.add(topdirname)
- alltars.append(name)
- t.close()
- shutil.rmtree(str(tmpdir.join(topdirname)))
- for name in alltars:
- print "Uploading %s" % name
- os.system('scp %s codespeak.net:/www/pypy.org/htdocs/download' %
name)
- finally:
- os.chdir(olddir)
-
-if __name__ == '__main__':
- if len(sys.argv) != 3:
- print __doc__
- sys.exit(1)
- main(sys.argv[1], release=sys.argv[2])
-
diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py
--- a/pypy/tool/release/package.py
+++ b/pypy/tool/release/package.py
@@ -122,7 +122,7 @@
try:
os.chdir(str(builddir))
#
- # 'strip' fun: see https://codespeak.net/issue/pypy-dev/issue587
+ # 'strip' fun: see issue #587
for source, target in binaries:
if sys.platform == 'win32':
pass
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
