Author: Tobias Pape <[email protected]>
Branch:
Changeset: r62:2fd7f3f6574e
Date: 2013-02-19 15:37 +0100
http://bitbucket.org/pypy/lang-smalltalk/changeset/2fd7f3f6574e/
Log: re-layout sources. images to own directory
diff --git a/images/bootstrapped.changes.xz b/images/bootstrapped.changes.xz
new file mode 100644
index
0000000000000000000000000000000000000000..735fc4cc1abdb061d63a5235f6418128faebf6d7
GIT binary patch
[cut]
diff --git a/images/bootstrapped.image b/images/bootstrapped.image
new file mode 100644
index
0000000000000000000000000000000000000000..f344005f8f168c645ac07fe82dbf985d5a767b02
GIT binary patch
[cut]
diff --git a/spyvm/mini.image b/images/mini.image
rename from spyvm/mini.image
rename to images/mini.image
diff --git a/spyvm/minitest.image b/images/minitest.image
rename from spyvm/minitest.image
rename to images/minitest.image
diff --git a/spyvm/running-something-mini.image
b/images/running-something-mini.image
rename from spyvm/running-something-mini.image
rename to images/running-something-mini.image
diff --git a/spyvm/test/test_miniimage.py b/spyvm/test/test_miniimage.py
--- a/spyvm/test/test_miniimage.py
+++ b/spyvm/test/test_miniimage.py
@@ -12,7 +12,8 @@
def setup_module(module, filename='mini.image'):
space = objspace.ObjSpace()
- module.mini_image =
py.path.local(__file__).dirpath().dirpath().join(filename)
+ from spyvm.tool.analyseimage import image_dir
+ module.mini_image = image_dir.join(filename)
module.reader = open_miniimage(space)
reader.initialize()
module.image = squeakimage.SqueakImage()
diff --git a/spyvm/tool/analyseimage.py b/spyvm/tool/analyseimage.py
--- a/spyvm/tool/analyseimage.py
+++ b/spyvm/tool/analyseimage.py
@@ -5,8 +5,10 @@
from spyvm import interpreter
import sys
-mini_image = py.path.local(__file__).dirpath().dirpath().join('mini.image')
-minitest_image =
py.path.local(__file__).dirpath().dirpath().join('minitest.image')
+image_dir = py.path.local(__file__).dirpath().dirpath().dirpath('images')
+
+mini_image = image_dir.join('mini.image')
+minitest_image = image_dir.join('minitest.image')
def get_miniimage(space):
return squeakimage.ImageReader(space,
squeakimage.Stream(mini_image.open()))
diff --git a/spyvm/targetimageloadingsmalltalk.py
b/targetimageloadingsmalltalk.py
rename from spyvm/targetimageloadingsmalltalk.py
rename to targetimageloadingsmalltalk.py
--- a/spyvm/targetimageloadingsmalltalk.py
+++ b/targetimageloadingsmalltalk.py
@@ -1,4 +1,3 @@
-import autopath1
import sys
import os
from spyvm import model, interpreter, primitives, shadow
diff --git a/spyvm/targettinybenchsmalltalk.py b/targettinybenchsmalltalk.py
rename from spyvm/targettinybenchsmalltalk.py
rename to targettinybenchsmalltalk.py
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
