Greetings, The typecache in subversion repository is missing the 32bit windows platform that I am running the windows tests against, and on occasion (like today) I noticed it caused a update conflict due to Armin's changes in r44398. If someone could add this one, thanks. -Scott Index: pypy/rpython/lltypesystem/typecache.py =================================================================== --- pypy/rpython/lltypesystem/typecache.py (revision 44403) +++ pypy/rpython/lltypesystem/typecache.py (working copy) @@ -1,6 +1,7 @@ # this is automatically generated cache files for c types platforms = { ('', ('32bit', 'ELF'), 'Linux'):{'short': 16, 'int': 32, 'unsigned char': 8, 'long': 32, 'char': 8, 'unsigned short': 16, 'unsigned long': 32, 'long long': 64, 'mode_t': 32, 'unsigned long long': 64, 'size_t': 32, 'unsigned int': 32}, +('', ('32bit', 'WindowsPE'), 'Windows'):{'short': 16, 'int': 32, 'unsigned char': 8, 'long': 32, 'char': 8, 'unsigned short': 16, 'unsigned long': 32, 'long long': 64, 'unsigned long long': 64, 'size_t': 32, 'unsigned int': 32}, ('i386', ('32bit', ''), 'Darwin'):{'short': 16, 'int': 32, 'unsigned char': 8, 'long': 32, 'char': 8, 'unsigned short': 16, 'unsigned long': 32, 'long long': 64, 'mode_t': 16, 'unsigned long long': 64, 'size_t': 32, 'unsigned int': 32}, ('Intel(R) Pentium(R) M processor 1.73GHz', ('32bit', ''), 'Linux'):{'short': 16, 'int': 32, 'unsigned char': 8, 'long': 32, 'char': 8, 'unsigned short': 16, 'unsigned long': 32, 'long long': 64, 'mode_t': 32, 'unsigned long long': 64, 'size_t': 32, 'unsigned int': 32} } -- Scott Dial scott@scottdial.com scodial@cs.indiana.edu
Hi Scott, On Thu, Jun 21, 2007 at 03:11:15AM -0400, Scott Dial wrote:
(like today) I noticed it caused a update conflict due to Armin's changes in r44398.
My checkin was mostly accidental. I think that the way the typecache is both a regular svn-controlled file deep within the hierarchy, and modified automatically, will keep causing conflicts in the future. Also, the entry that was generated on my laptop and that I checked in while doing other stuff is:
('Intel(R) Pentium(R) M processor 1.73GHz', ('32bit', ''), 'Linux'):...
That looks like a far too precise key. I don't have a nice alternative, I'm just saying that the current way it works is a bit troublesome :-) A bientot, Armin.
Armin Rigo wrote:
I thought this as well, but I am not familiar with its purpose. If it is merely a cache, then I don't understand why it is under SVN control at all. I suppose it allows developers without those other platforms available to know about types, but that seems like a marginal reason. -Scott -- Scott Dial scott@scottdial.com scodial@cs.indiana.edu
Hum. The idea was to keep this stuff in svn in order to keep type information to-be-copied around. If this is troublesome, I propose to kill whole idea of having cache-per-platform, since we cannot specify good platform key and have it in svn:ignore (or move to _cache) and just keep it on a platform level. Than one would need to have gcc installed at least once to import rffi. I don't know if it's good or bad.
Hi Scott, On Thu, Jun 21, 2007 at 03:11:15AM -0400, Scott Dial wrote:
(like today) I noticed it caused a update conflict due to Armin's changes in r44398.
My checkin was mostly accidental. I think that the way the typecache is both a regular svn-controlled file deep within the hierarchy, and modified automatically, will keep causing conflicts in the future. Also, the entry that was generated on my laptop and that I checked in while doing other stuff is:
('Intel(R) Pentium(R) M processor 1.73GHz', ('32bit', ''), 'Linux'):...
That looks like a far too precise key. I don't have a nice alternative, I'm just saying that the current way it works is a bit troublesome :-) A bientot, Armin.
Armin Rigo wrote:
I thought this as well, but I am not familiar with its purpose. If it is merely a cache, then I don't understand why it is under SVN control at all. I suppose it allows developers without those other platforms available to know about types, but that seems like a marginal reason. -Scott -- Scott Dial scott@scottdial.com scodial@cs.indiana.edu
Hum. The idea was to keep this stuff in svn in order to keep type information to-be-copied around. If this is troublesome, I propose to kill whole idea of having cache-per-platform, since we cannot specify good platform key and have it in svn:ignore (or move to _cache) and just keep it on a platform level. Than one would need to have gcc installed at least once to import rffi. I don't know if it's good or bad.
participants (4)
-
Armin Rigo -
Maciek Fijalkowski -
Michael Hudson -
Scott Dial