[Python-checkins] python/dist/src/RISCOS Makefile,1.5,1.6 pyconfig.h,1.6,1.7 sleep.c,1.2,1.3
loewis@users.sourceforge.net
loewis@users.sourceforge.net
2003年5月10日 00:36:58 -0700
Update of /cvsroot/python/python/dist/src/RISCOS
In directory sc8-pr-cvs1:/tmp/cvs-serv17284/RISCOS
Modified Files:
Makefile pyconfig.h sleep.c
Log Message:
Patch #734231: Update RiscOS support. In particular, correct
riscospath.extsep, and use os.extsep throughout.
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/RISCOS/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Makefile 14 Jun 2002 20:41:17 -0000 1.5
--- Makefile 10 May 2003 07:36:56 -0000 1.6
***************
*** 8,19 ****
DLKLIB = $(LIBSROOT).dlk
ZLIB = $(LIBSROOT).zlib
EXPAT = $(LIBSROOT).expat.lib
! OBJSCAN = objscan
! MAKEDLK = makedlk
# change from time to time (don't forget to change !Boot also)
! TARGET=Python22
! BUILD=25
--- 8,20 ----
DLKLIB = $(LIBSROOT).dlk
ZLIB = $(LIBSROOT).zlib
+ BZLIB = $(LIBSROOT).bzlib
EXPAT = $(LIBSROOT).expat.lib
! OBJSCAN = $(DLKLIB).objscan
! MAKEDLK = $(DLKLIB).makedlk
# change from time to time (don't forget to change !Boot also)
! TARGET=Python23
! BUILD=40
***************
*** 62,73 ****
@.^.Lib.audioop/pyd\
@.^.Lib.binascii/pyd\
@.^.Lib.cmath/pyd\
@.^.Lib.cPickle/pyd\
@.^.Lib.cStringIO/pyd\
@.^.Lib.errno/pyd\
@.^.Lib.imageop/pyd\
@.^.Lib.math/pyd\
@.^.Lib.md5/pyd\
- @.^.Lib.new/pyd\
@.^.Lib.operator/pyd\
@.^.Lib.parser/pyd\
--- 63,76 ----
@.^.Lib.audioop/pyd\
@.^.Lib.binascii/pyd\
+ @.^.Lib.bz2/pyd\
@.^.Lib.cmath/pyd\
@.^.Lib.cPickle/pyd\
@.^.Lib.cStringIO/pyd\
+ @.^.Lib.datetime/pyd\
@.^.Lib.errno/pyd\
@.^.Lib.imageop/pyd\
+ @.^.Lib.itertools/pyd\
@.^.Lib.math/pyd\
@.^.Lib.md5/pyd\
@.^.Lib.operator/pyd\
@.^.Lib.parser/pyd\
***************
*** 94,98 ****
@.^.Lib._sre/pyd\
@.^.Lib.xxsubtype/pyd\
! @.^.Lib._symtable/pyd
--- 97,104 ----
@.^.Lib._sre/pyd\
@.^.Lib.xxsubtype/pyd\
! @.^.Lib._symtable/pyd\
! @.^.Lib._random/pyd\
! @.^.Lib.zipimport/pyd\
! @.^.Lib._csv/pyd
***************
*** 126,130 ****
@.^.Python.o.bltinmodule\
@.^.Python.o.exceptions\
- @.^.Python.o.hypot\
@.^.Python.o.codecs\
@.^.Python.o.symtable\
--- 132,135 ----
***************
*** 146,149 ****
--- 151,155 ----
@.^.Objects.o.rangeobject\
@.^.Objects.o.object\
+ @.^.Objects.o.obmalloc\
@.^.Objects.o.moduleobject\
@.^.Objects.o.methodobject\
***************
*** 151,154 ****
--- 157,161 ----
@.^.Objects.o.listobject\
@.^.Objects.o.intobject\
+ @.^.Objects.o.boolobject\
@.^.Objects.o.iterobject\
@.^.Objects.o.funcobject\
***************
*** 156,159 ****
--- 163,167 ----
@.^.Objects.o.floatobject\
@.^.Objects.o.fileobject\
+ @.^.Objects.o.enumobject\
@.^.Objects.o.dictobject\
@.^.Objects.o.complexobject\
***************
*** 245,252 ****
--- 253,266 ----
$(MAKEDLK) -d @.^.Lib.cStringIO/pyd -s s.linktab -o @.^.Modules.o.cStringIO -e initcStringIO
+ @.^.Lib._csv/pyd: @.^.Modules.o._csv s.linktab
+ $(MAKEDLK) -d @.^.Lib._csv/pyd -s s.linktab -o @.^.Modules.o._csv -e init_csv
+
@.^.Lib.plat-riscos.drawf/pyd: Modules.o.drawfmodule #s.linktab
$(LINK) -aof -o Modules.o.drawflink Modules.o.drawfmodule $(OSLIB).o.OSLIB32
$(MAKEDLK) -d @.^.Lib.plat-riscos.drawf/pyd -s s.linktab -o Modules.o.drawflink -e initdrawf
+ @.^.Lib.datetime/pyd: @.^.Modules.o.datetimemodule s.linktab
+ $(MAKEDLK) -d @.^.Lib.datetime/pyd -s s.linktab -o @.^.Modules.o.datetimemodule -e initdatetime
+
@.^.Lib.errno/pyd: @.^.Modules.o.errnomodule #s.linktab
$(MAKEDLK) -d @.^.Lib.errno/pyd -s s.linktab -o @.^.Modules.o.errnomodule -e initerrno
***************
*** 255,258 ****
--- 269,275 ----
$(MAKEDLK) -d @.^.Lib.imageop/pyd -s s.linktab -o @.^.Modules.o.imageop -e initimageop
+ @.^.Lib.itertools/pyd: @.^.Modules.o.itertoolsmodule s.linktab
+ $(MAKEDLK) -d @.^.Lib.itertools/pyd -s s.linktab -o @.^.Modules.o.itertoolsmodule -e inititertools
+
@.^.Lib.math/pyd: @.^.Modules.o.mathmodule s.linktab
$(MAKEDLK) -d @.^.Lib.math/pyd -s s.linktab -o @.^.Modules.o.mathmodule -e initmath
***************
*** 325,328 ****
--- 342,348 ----
$(MAKEDLK) -d @.^.Lib.xxsubtype/pyd -s s.linktab -o @.^.Modules.o.xxsubtype -e initxxsubtype
+ @.^.Lib._random/pyd: @.^.Modules.o._randommodule s.linktab
+ $(MAKEDLK) -d @.^.Lib._random/pyd -s s.linktab -o @.^.Modules.o._randommodule -e init_random
+
@.^.Lib._symtable/pyd: @.^.Modules.o.symtablemodule s.linktab
$(MAKEDLK) -d @.^.Lib._symtable/pyd -s s.linktab -o @.^.Modules.o.symtablemodule -e init_symtable
***************
*** 333,337 ****
#
@.^.Lib.select/pyd: @.^.Modules.o.selectmodule s.linktab
! $(LINK) -aof -o @.^.Modules.o.selectlink @.^.Modules.o.selectmodule $(TCPIPLIB).o.socklib
$(MAKEDLK) -d @.^.Lib.select/pyd -s s.linktab -o @.^.Modules.o.selectlink -e initselect
--- 353,357 ----
#
@.^.Lib.select/pyd: @.^.Modules.o.selectmodule s.linktab
! $(LINK) -aof -o @.^.Modules.o.selectlink @.^.Modules.o.selectmodule $(TCPIPLIB).o.socklib5
$(MAKEDLK) -d @.^.Lib.select/pyd -s s.linktab -o @.^.Modules.o.selectlink -e initselect
***************
*** 340,344 ****
@.^.Lib._socket/pyd: @.^.Modules.o.socketmodule s.linktab
! $(LINK) -aof -o @.^.Modules.o._socketlink @.^.Modules.o.socketmodule $(TCPIPLIB).o.inetlib $(TCPIPLIB).o.unixlib $(TCPIPLIB).o.socklib
$(MAKEDLK) -d @.^.Lib._socket/pyd -s s.linktab -o @.^.Modules.o._socketlink -e init_socket
--- 360,364 ----
@.^.Lib._socket/pyd: @.^.Modules.o.socketmodule s.linktab
! $(LINK) -aof -o @.^.Modules.o._socketlink @.^.Modules.o.socketmodule $(TCPIPLIB).o.inetlib $(TCPIPLIB).o.unixlib $(TCPIPLIB).o.socklib5
$(MAKEDLK) -d @.^.Lib._socket/pyd -s s.linktab -o @.^.Modules.o._socketlink -e init_socket
***************
*** 354,357 ****
--- 374,383 ----
$(CC) -I$(ZLIB) -o $@ @.^.Modules.c.zlibmodule
+ @.^.Lib.bz2/pyd: @.^.Modules.o.bz2module s.linktab
+ $(LINK) -aof -o @.^.Modules.o.bz2link @.^.Modules.o.bz2module $(BZLIB).bzlib
+ $(MAKEDLK) -d @.^.Lib.bz2/pyd -s s.linktab -o @.^.Modules.o.bz2link -e initbz2
+
+ @.^.Modules.o.bz2module: @.^.Modules.c.bz2module
+ $(CC) -I$(BZLIB) -o $@ @.^.Modules.c.bz2module
@.^.Lib.time/pyd: @.^.Modules.o.timemodule s.linktab @.o.sleep
***************
*** 370,373 ****
--- 396,403 ----
@.^.Modules.o.pyexpat: @.^.Modules.c.pyexpat
$(CCEXPAT) -o $@ @.^.Modules.c.pyexpat
+
+ @.^.Lib.zipimport/pyd: @.^.Modules.o.zipimport s.linktab
+ $(LINK) -aof -o @.^.Modules.o.zipimportlink @.^.Modules.o.zipimport o.unixstuff $(OSLIB).o.OSLib32
+ $(MAKEDLK) -d @.^.Lib.zipimport/pyd -s s.linktab -o @.^.Modules.o.zipimportlink -e initzipimport
Index: pyconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/RISCOS/pyconfig.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** pyconfig.h 23 Nov 2002 09:13:40 -0000 1.6
--- pyconfig.h 10 May 2003 07:36:56 -0000 1.7
***************
*** 144,148 ****
/* Define this if you have the type long long */
! #undef HAVE_LONG_LONG
/* Define if your compiler supports function prototypes */
--- 144,148 ----
/* Define this if you have the type long long */
! #define HAVE_LONG_LONG
/* Define if your compiler supports function prototypes */
***************
*** 245,248 ****
--- 245,251 ----
#undef WITH_DL_DLD
+ /* Define if you want to read files with foreign newlines. */
+ #define WITH_UNIVERSAL_NEWLINES 1
+
/* Define if you want documentation strings in extension modules */
#define WITH_DOC_STRINGS 1
***************
*** 254,258 ****
/* Define if you want to compile in Python-specific mallocs */
! #undef WITH_PYMALLOC
/* Define if you want to produce an OpenStep/Rhapsody framework
--- 257,261 ----
/* Define if you want to compile in Python-specific mallocs */
! #define WITH_PYMALLOC 1
/* Define if you want to produce an OpenStep/Rhapsody framework
***************
*** 292,296 ****
/* The number of bytes in a long long. */
! #undef SIZEOF_LONG_LONG
/* The number of bytes in a short. */
--- 295,299 ----
/* The number of bytes in a long long. */
! #define SIZEOF_LONG_LONG 8
/* The number of bytes in a short. */
***************
*** 397,401 ****
/* Define if you have the getpeername function. */
! #undef HAVE_GETPEERNAME
/* Define if you have the getpgid function. */
--- 400,404 ----
/* Define if you have the getpeername function. */
! #define HAVE_GETPEERNAME
/* Define if you have the getpgid function. */
***************
*** 424,428 ****
/* Define if you have the hypot function. */
! #undef HAVE_HYPOT
/* Define if you have the inet_pton function. */
--- 427,431 ----
/* Define if you have the hypot function. */
! #define HAVE_HYPOT
/* Define if you have the inet_pton function. */
Index: sleep.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/RISCOS/sleep.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sleep.c 24 Oct 2001 20:12:29 -0000 1.2
--- sleep.c 10 May 2003 07:36:56 -0000 1.3
***************
*** 8,16 ****
! int sleep(double delay)
{
os_t starttime, endtime, time; /* monotonic times (centiseconds) */
int *pollword, ret;
! bool claimed;
/* calculate end time */
--- 8,16 ----
! int riscos_sleep(double delay)
{
os_t starttime, endtime, time; /* monotonic times (centiseconds) */
int *pollword, ret;
! osbool claimed;
/* calculate end time */