[pypy-svn] r71644 - pypy/build/ubuntu/debian
getxsick at codespeak.net
getxsick at codespeak.net
Tue Mar 2 16:33:59 CET 2010
Author: getxsick
Date: Tue Mar 2 16:33:58 2010
New Revision: 71644
Modified:
pypy/build/ubuntu/debian/Makefile.in
pypy/build/ubuntu/debian/changelog
pypy/build/ubuntu/debian/configure.py
pypy/build/ubuntu/debian/pypy-dev.install
pypy/build/ubuntu/debian/pypy-dev.links
pypy/build/ubuntu/debian/pypy-dev.override
pypy/build/ubuntu/debian/pypy-lib.install
pypy/build/ubuntu/debian/rules
Log:
update to 1.2 release and merge some changes done by Chris Lamby
Modified: pypy/build/ubuntu/debian/Makefile.in
==============================================================================
--- pypy/build/ubuntu/debian/Makefile.in (original)
+++ pypy/build/ubuntu/debian/Makefile.in Tue Mar 2 16:33:58 2010
@@ -1,15 +1,24 @@
TARGET=pypy/translator/goal/targetpypystandalone
TRANSLATE=pypy/translator/goal/translate.py
-TRANSLATEOPTS=--text --batch -b c --source --thread
+TRANSLATEOPTS=--batch --source --Ojit
TARGETOPTS=%(TARGETOPTS)s
PREFIX=%(PREFIX)s
OUTPUTDIR=debian/tmp/usr/bin
LOGIC=-o logic
-BINARIES=bin/pypy
+BINARIES=%(BINARIES)s
-all: $(BINARIES)
+all: $(BINARIES) test
+
+test: export TMPDIR = $(CURDIR)/tests-tmp
+test:
+ @rm -rf $(TMPDIR)
+ mkdir $(TMPDIR)
+ set -e; for SECTION in interpreter lib; do \
+ time py/bin/py.test pypy/$$SECTION || true; \
+ echo Finished tsting section $$SECTION; \
+ done
.NOTPARALLEL: $(BINARIES)
@@ -17,13 +26,14 @@
bin/pypy:
@rm -rf $(TMPDIR)
mkdir $(TMPDIR)
- $(TRANSLATE) $(TRANSLATEOPTS) $(TARGET) $(TARGETOPTS)
+ $(TRANSLATE) $(TRANSLATEOPTS) $(TARGET) $(TARGETOPTS)
make -C $(TMPDIR)/debian-pypy-usession-0/testing_1
install -D $(TMPDIR)/debian-pypy-usession-0/testing_1/testing_1 $@
clean:
rm -rf bin
rm -rf build-*
+ rm -rf tests-tmp
rm -rf pypy/_cache
rm -rf py/c-extension/greenlet/build
rm -f py/c-extension/greenlet/greenlet.so
Modified: pypy/build/ubuntu/debian/changelog
==============================================================================
--- pypy/build/ubuntu/debian/changelog (original)
+++ pypy/build/ubuntu/debian/changelog Tue Mar 2 16:33:58 2010
@@ -1,3 +1,26 @@
+pypy (1.2.0-svn71592-1) unstable; urgency=low
+
+ * New upstream release.
+ * New maintainer.
+
+ -- Bartosz Skowron <getxsick at gmail.com> Mon, 01 Mar 2010 18:30:44 +0100
+
+pypy (1.0.0-svn55443-2) unstable; urgency=low
+
+ * Bump MEMTHRESHOLD to 1400MB.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Sat, 21 Jun 2008 21:42:09 +0100
+
+pypy (1.0.0-svn55443-1) unstable; urgency=low
+
+ * New upstream snapshot.
+ - Doesn't hardcode libc6.so.6; fixes FTBFS on ia64 (Closes: #440331)
+ * Don't build pypy-stackless on platforms the greenlet module has not been
+ ported to. (Closes: #475868)
+ * Run tests after build on request by upstream.
+
+ -- Chris Lamb <chris at chris-lamb.co.uk> Sat, 31 May 2008 18:50:58 +0100
+
pypy (1.0.0-svn51288-1) unstable; urgency=low
* New upstream release. (Closes: #459118)
Modified: pypy/build/ubuntu/debian/configure.py
==============================================================================
--- pypy/build/ubuntu/debian/configure.py (original)
+++ pypy/build/ubuntu/debian/configure.py Tue Mar 2 16:33:58 2010
@@ -2,7 +2,7 @@
import sys
import os
-MEMTHRESHOLD = 1024
+MEMTHRESHOLD = 1400
LOWMEM = """\
The translation of pypy requires a large amount of physical
@@ -24,20 +24,15 @@
def gen_make(make_in, build_arch, host_arch, prefix):
- options = {'default': {'TARGETOPTS': '--allworkingmodules',
- 'TARGETOPTS_LOGIC': '--allworkingmodules',
- },
-
- 'i386': {'TARGETOPTS': '--allworkingmodules --faassen',
- 'TARGETOPTS_LOGIC': '--allworkingmodules',
- },
-
- 'amd64':{'TARGETOPTS': '--allworkingmodules --faassen',
- 'TARGETOPTS_LOGIC': '--allworkingmodules',
- },
- }
- substitutions = options.get(build_arch, options['default'])
- substitutions['PREFIX'] = prefix
+ default = {'TARGETOPTS': '--allworkingmodules',
+ 'TARGETOPTS_LOGIC': '--allworkingmodules',
+ 'BINARIES': 'bin/pypy',
+ }
+ options = {}
+ #options['i386'] = {'TARGETOPTS': '--allworkingmodules -Ojit'}
+
+ substitutions = dict(PREFIX=prefix, **default)
+ substitutions.update(options.get(build_arch, {}))
return make_in % substitutions
def run():
Modified: pypy/build/ubuntu/debian/pypy-dev.install
==============================================================================
--- pypy/build/ubuntu/debian/pypy-dev.install (original)
+++ pypy/build/ubuntu/debian/pypy-dev.install Tue Mar 2 16:33:58 2010
@@ -1,17 +1,17 @@
-pypy/annotation usr/share/pypy-1.0/pypy
-pypy/bin usr/share/pypy-1.0/pypy
-pypy/config usr/share/pypy-1.0/pypy
-pypy/__init__.py usr/share/pypy-1.0/pypy
-pypy/interpreter usr/share/pypy-1.0/pypy
-pypy/jit usr/share/pypy-1.0/pypy
-pypy/lang usr/share/pypy-1.0/pypy
-pypy/module usr/share/pypy-1.0/pypy
-pypy/objspace usr/share/pypy-1.0/pypy
-pypy/rlib usr/share/pypy-1.0/pypy
-pypy/rpython usr/share/pypy-1.0/pypy
-pypy/tool usr/share/pypy-1.0/pypy
-pypy/translator usr/share/pypy-1.0/pypy
-pypy/conftest.py usr/share/pypy-1.0/pypy
+pypy/annotation usr/share/pypy-1.2/pypy
+pypy/bin usr/share/pypy-1.2/pypy
+pypy/config usr/share/pypy-1.2/pypy
+pypy/__init__.py usr/share/pypy-1.2/pypy
+pypy/interpreter usr/share/pypy-1.2/pypy
+pypy/jit usr/share/pypy-1.2/pypy
+pypy/lang usr/share/pypy-1.2/pypy
+pypy/module usr/share/pypy-1.2/pypy
+pypy/objspace usr/share/pypy-1.2/pypy
+pypy/rlib usr/share/pypy-1.2/pypy
+pypy/rpython usr/share/pypy-1.2/pypy
+pypy/tool usr/share/pypy-1.2/pypy
+pypy/translator usr/share/pypy-1.2/pypy
+pypy/conftest.py usr/share/pypy-1.2/pypy
debian/scripts/py.py usr/bin
debian/scripts/pypy-translate usr/bin
debian/scripts/jscompile usr/bin
Modified: pypy/build/ubuntu/debian/pypy-dev.links
==============================================================================
--- pypy/build/ubuntu/debian/pypy-dev.links (original)
+++ pypy/build/ubuntu/debian/pypy-dev.links Tue Mar 2 16:33:58 2010
@@ -1 +1 @@
-/var/cache/pypy/_cache /usr/share/pypy-1.0/pypy/_cache
+/var/cache/pypy/_cache /usr/share/pypy-1.2/pypy/_cache
Modified: pypy/build/ubuntu/debian/pypy-dev.override
==============================================================================
--- pypy/build/ubuntu/debian/pypy-dev.override (original)
+++ pypy/build/ubuntu/debian/pypy-dev.override Tue Mar 2 16:33:58 2010
@@ -1,5 +1,5 @@
# Gentoo specific file. We will keep it.
-pypy-dev: unusual-interpreter ./usr/share/pypy-0.9/pypy/tool/build/bin/gentoo_init.d #!/sbin/runscript
+#pypy-dev: unusual-interpreter ./usr/share/pypy-0.9/pypy/tool/build/bin/gentoo_init.d #!/sbin/runscript
# This is the name of the interpreted interpreter. Renaming it to py makes no sense
pypy-dev: script-with-language-extension usr/bin/py.py
Modified: pypy/build/ubuntu/debian/pypy-lib.install
==============================================================================
--- pypy/build/ubuntu/debian/pypy-lib.install (original)
+++ pypy/build/ubuntu/debian/pypy-lib.install Tue Mar 2 16:33:58 2010
@@ -1,2 +1,2 @@
-lib-python usr/share/pypy-1.0
-pypy/lib usr/share/pypy-1.0/pypy
+lib-python usr/share/pypy-1.2
+pypy/lib usr/share/pypy-1.2/pypy
Modified: pypy/build/ubuntu/debian/rules
==============================================================================
--- pypy/build/ubuntu/debian/rules (original)
+++ pypy/build/ubuntu/debian/rules Tue Mar 2 16:33:58 2010
@@ -9,14 +9,14 @@
DEB_BUILD_ARCH := $(shell dpkg-architecture -qDEB_BUILD_ARCH)
DEB_HOST_ARCH := $(shell dpkg-architecture -qDEB_HOST_ARCH)
-VERSION=1.0
+VERSION=1.2
get-orig-source:
set -e ; \
- svn co http://codespeak.net/svn/pypy/dist pypy-svn ; \
+ svn co http://codespeak.net/svn/pypy/trunk pypy-svn ; \
REVISION=`svnversion pypy-svn/` ; \
find pypy-svn/ -depth -type d -name ".svn" | xargs rm -rf ; \
- tar cfz pypy_1.0.0-svn$$REVISION.orig.tar.gz pypy-svn/ ; \
+ tar cfz pypy_$(VERSION).0-svn$$REVISION.orig.tar.gz pypy-svn/ ; \
rm -rf pypy-svn/
Makefile: debian/Makefile.in
More information about the Pypy-commit
mailing list