[Python-checkins] python/dist/src/PC/os2emx Makefile, 1.16, 1.17 config.c, 1.6, 1.7

Wed Jul 7 15:55:27 CEST 2004

Update of /cvsroot/python/python/dist/src/PC/os2emx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5051

Modified Files:
	Makefile config.c 
Log Message:
bring OS/2 EMX port build environment up to date

Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Makefile	25 Dec 2003 13:25:20 -0000	1.16
--- Makefile	7 Jul 2004 13:55:24 -0000	1.17
***************
*** 1,15 ****
  #####################==================----------------
  #
! # Top-Level Makefile for Building Python 2.3 for OS/2 using GCC/EMX
  # Originally written by Andrew Zabolotny, <bit at eltech.ru> for Python 1.5.2
! # Modified by Andrew MacIntyre, <andymac at pcug.org.au> for Python 2.3
  #
  # This makefile was developed for use with [P]GCC/EMX compiler any
  # version and GNU Make.
  #
! # The output of the build is a largish Python23.DLL containing the
  # essential modules of Python and a small Python.exe program to start
  # the interpreter. When embedding Python within another program, only
! # Python23.DLL is needed. We also build python_s.a static library (which
  # can be converted into OMF (.lib) format using emxomf tool) and both
  # python.a and python.lib import libraries.  Then the optional 
--- 1,15 ----
  #####################==================----------------
  #
! # Top-Level Makefile for Building Python 2.4 for OS/2 using GCC/EMX
  # Originally written by Andrew Zabolotny, <bit at eltech.ru> for Python 1.5.2
! # Modified by Andrew MacIntyre, <andymac at pcug.org.au> for Python 2.4
  #
  # This makefile was developed for use with [P]GCC/EMX compiler any
  # version and GNU Make.
  #
! # The output of the build is a largish Python24.DLL containing the
  # essential modules of Python and a small Python.exe program to start
  # the interpreter. When embedding Python within another program, only
! # Python24.DLL is needed. We also build python_s.a static library (which
  # can be converted into OMF (.lib) format using emxomf tool) and both
  # python.a and python.lib import libraries.  Then the optional 
***************
*** 65,69 ****
  # === install locations ===
  # default value of PYTHONHOME
! LIB_DIR=C:/Python23
  # default is to have everything in or under PYTHONHOME
  EXE_DIR=$(LIB_DIR)
--- 65,69 ----
  # === install locations ===
  # default value of PYTHONHOME
! LIB_DIR=C:/Python24
  # default is to have everything in or under PYTHONHOME
  EXE_DIR=$(LIB_DIR)
***************
*** 221,226 ****
  
  # Output file names
! PYTHON_VER=	2.3
! PYTHON_LIB=	python23
  PYTHON.LIB=	$(PYTHON_LIB)_s$A
  PYTHON.IMPLIB=	$(PYTHON_LIB)$A
--- 221,226 ----
  
  # Output file names
! PYTHON_VER=	2.4
! PYTHON_LIB=	python24
  PYTHON.LIB=	$(PYTHON_LIB)_s$A
  PYTHON.IMPLIB=	$(PYTHON_LIB)$A
***************
*** 273,276 ****
--- 273,277 ----
  		Modules/cmathmodule.c \
  		Modules/_codecsmodule.c \
+ 		Modules/collectionsmodule.c \
  		Modules/cPickle.c \
  		Modules/cStringIO.c \
***************
*** 280,283 ****
--- 281,285 ----
  		Modules/errnomodule.c \
  		Modules/fcntlmodule.c \
+ 		Modules/_heapqmodule.c \
  		Modules/imageop.c \
  		Modules/itertoolsmodule.c \
***************
*** 287,292 ****
  		Modules/md5module.c \
  		Modules/operator.c \
- 		Modules/pcremodule.c \
- 		Modules/pypcre.c \
  		Modules/_randommodule.c \
  		Modules/regexmodule.c \
--- 289,292 ----
***************
*** 344,347 ****
--- 344,348 ----
  		Python/pyfpe.c \
  		Python/pystate.c \
+ 		Python/pystrtod.c \
  		Python/pythonrun.c \
  		Python/structmember.c \
***************
*** 367,370 ****
--- 368,372 ----
  		Objects/frameobject.c \
  		Objects/funcobject.c \
+ 		Objects/genobject.c \
  		Objects/intobject.c \
  		Objects/iterobject.c \
***************
*** 376,379 ****
--- 378,382 ----
  		Objects/obmalloc.c \
  		Objects/rangeobject.c \
+ 		Objects/setobject.c \
  		Objects/sliceobject.c \
  		Objects/stringobject.c \
***************
*** 492,496 ****
  	rm -f $(OUT)*
  	rm -f $(PYTHON.LIB) $(PYTHON.IMPLIB) $(PYTHON.EXEIMP) $(PYTHON.DLL) \
! 	  $(PYTHON.EXE) $(PYTHONPM.EXE) $(PGEN.EXE) *$(MODULE.EXT)
  	find ../../Lib -name "*.py[co]" -exec rm {} ";"
  
--- 495,499 ----
  	rm -f $(OUT)*
  	rm -f $(PYTHON.LIB) $(PYTHON.IMPLIB) $(PYTHON.EXEIMP) $(PYTHON.DLL) \
! 	  $(PYTHON.EXE) $(PYTHONPM.EXE) $(PGEN.EXE) *$(MODULE.EXT) *.dll
  	find ../../Lib -name "*.py[co]" -exec rm {} ";"
  

Index: config.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.c	9 Jun 2003 08:16:02 -0000	1.6
--- config.c	7 Jul 2004 13:55:25 -0000	1.7
***************
*** 53,56 ****
--- 53,57 ----
  extern void initcPickle();
  extern void initcStringIO();
+ extern void initcollections();
  extern void initcmath();
  extern void initdatetime();
***************
*** 58,61 ****
--- 59,63 ----
  extern void initerrno();
  extern void initfcntl();
+ extern void init_heapq();
  extern void initimageop();
  extern void inititertools();
***************
*** 63,67 ****
  extern void initmd5();
  extern void initoperator();
- extern void initpcre();
  extern void initregex();
  extern void initrgbimg();
--- 65,68 ----
***************
*** 118,121 ****
--- 119,123 ----
  	{"cPickle", initcPickle},
  	{"cStringIO", initcStringIO},
+ 	{"collections", initcollections},
  	{"cmath", initcmath},
  	{"datetime", initdatetime},
***************
*** 123,126 ****
--- 125,129 ----
  	{"errno", initerrno},
  	{"fcntl", initfcntl},
+ 	{"_heapq", init_heapq},
  	{"imageop", initimageop},
  	{"itertools", inititertools},
***************
*** 128,132 ****
  	{"md5", initmd5},
  	{"operator", initoperator},
- 	{"pcre", initpcre},
  	{"regex", initregex},
  	{"rgbimg", initrgbimg},
--- 131,134 ----