[Python-checkins] CVS: python/dist/src/PC/os2vacpp config.c,1.6,1.7 makefile,1.4,1.5 pyconfig.h,1.2,1.3 python.def,1.3,1.4
Tim Peters
tim_one@users.sourceforge.net
Sun, 04 Nov 2001 18:46:01 -0800
Update of /cvsroot/python/python/dist/src/PC/os2vacpp
In directory usw-pr-cvs1:/tmp/cvs-serv30873/python/PC/os2vacpp
Modified Files:
config.c makefile pyconfig.h python.def
Log Message:
SF patch 473749 compile under OS/2 VA C++, from Michael Muller.
Changes enabling Python to compile under OS/2 Visual Age C++.
Index: config.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/config.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** config.c 2000/07/22 19:25:51 1.6
--- config.c 2001/11/05 02:45:58 1.7
***************
*** 35,39 ****
extern void initselect(void);
extern void init_socket(void);
- extern void initsoundex(void);
extern void initstrop(void);
extern void initstruct(void);
--- 35,38 ----
***************
*** 83,87 ****
{"select", initselect},
#endif
- {"soundex", initsoundex},
{"strop", initstrop},
{"struct", initstruct},
--- 82,85 ----
Index: makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** makefile 2001/07/26 13:41:05 1.4
--- makefile 2001/11/05 02:45:58 1.5
***************
*** 66,71 ****
#.HDRPATH.c := $(PROJINCLUDE,;= ) $(.HDRPATH.c)
#.PATH.c = .;$(PY_MODULES);$(PY_OBJECTS);$(PY_PARSER);$(PY_PYTHON)
! OTHERLIBS = $(OS2TCPIP)\lib\so32dll.lib $(OS2TCPIP)\lib\tcp32dll.lib \
! $(TCLTK)\Lib\Tcl76.lib $(TCLTK)\Lib\Tk42.lib
#################
--- 66,70 ----
#.HDRPATH.c := $(PROJINCLUDE,;= ) $(.HDRPATH.c)
#.PATH.c = .;$(PY_MODULES);$(PY_OBJECTS);$(PY_PARSER);$(PY_PYTHON)
! OTHERLIBS = so32dll.lib tcp32dll.lib # Tcl76.lib Tk42.lib
#################
***************
*** 122,126 ****
$(PATHOBJ)\Thread.obj \
$(PATHOBJ)\TraceBack.obj \
! $(PATHOBJ)\FrozenMain.obj
# Python's Internal Parser
--- 121,132 ----
$(PATHOBJ)\Thread.obj \
$(PATHOBJ)\TraceBack.obj \
! $(PATHOBJ)\FrozenMain.obj \
! $(PATHOBJ)\exceptions.obj \
! $(PATHOBJ)\symtable.obj \
! $(PATHOBJ)\codecs.obj \
! $(PATHOBJ)\future.obj \
! $(PATHOBJ)\dynload_os2.obj \
! $(PATHOBJ)\mysnprintf.obj \
! $(PATHOBJ)\iterobject.obj
# Python's Internal Parser
***************
*** 155,159 ****
$(PATHOBJ)\StringObject.obj \
$(PATHOBJ)\TupleObject.obj \
! $(PATHOBJ)\TypeObject.obj
# Extension Modules (Built-In or as Separate DLLs)
--- 161,171 ----
$(PATHOBJ)\StringObject.obj \
$(PATHOBJ)\TupleObject.obj \
! $(PATHOBJ)\TypeObject.obj \
! $(PATHOBJ)\unicodeobject.obj \
! $(PATHOBJ)\unicodectype.obj \
! $(PATHOBJ)\cellobject.obj \
! $(PATHOBJ)\descrobject.obj \
! $(PATHOBJ)\weakrefobject.obj \
! $(PATHOBJ)\structseq.obj
# Extension Modules (Built-In or as Separate DLLs)
***************
*** 182,191 ****
$(PATHOBJ)\SignalModule.obj \
$(PATHOBJ)\SocketModule.obj \
- $(PATHOBJ)\SoundEx.obj \
$(PATHOBJ)\StropModule.obj \
$(PATHOBJ)\StructModule.obj \
$(PATHOBJ)\TimeModule.obj \
$(PATHOBJ)\ThreadModule.obj \
! $(PATHOBJ)\YUVConvert.obj
# Standalone Parser Generator Program (Shares Some of Python's Modules)
--- 194,204 ----
$(PATHOBJ)\SignalModule.obj \
$(PATHOBJ)\SocketModule.obj \
$(PATHOBJ)\StropModule.obj \
$(PATHOBJ)\StructModule.obj \
$(PATHOBJ)\TimeModule.obj \
$(PATHOBJ)\ThreadModule.obj \
! $(PATHOBJ)\YUVConvert.obj \
! $(PATHOBJ)\bufferobject.obj \
! $(PATHOBJ)\gcmodule.obj
# Standalone Parser Generator Program (Shares Some of Python's Modules)
***************
*** 212,216 ****
# /Gd = Dynamically Load Runtime
# /Ms = Use _System Calling Convention (vs _Optlink)
! # (to allow non-VAC++ code to call into Python15.dll)
_OPT = /O /Gl
--- 225,229 ----
# /Gd = Dynamically Load Runtime
# /Ms = Use _System Calling Convention (vs _Optlink)
! # (to allow non-VAC++ code to call into Python22.dll)
_OPT = /O /Gl
***************
*** 247,252 ****
# Primary Target(s)
###################
! All: obj noise PyCore.lib Python15.lib PGen.exe \
! Python.exe PythonPM.exe Python15.dll _tkinter.dll
Modules: $(MODULES)
--- 260,265 ----
# Primary Target(s)
###################
! All: obj noise PyCore.lib Python22.lib PGen.exe \
! Python.exe PythonPM.exe Python22.dll # _tkinter.dll
Modules: $(MODULES)
***************
*** 268,278 ****
# Python Extension DLL: Tcl/Tk Interface
! _tkinter.dll: $(PATHOBJ)\_tkinter.obj Python15.lib _tkinter.def
! @ Echo Linking $@ As DLL
! @ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
! $(PATHOBJ)\_tkinter.obj: $(PY_MODULES)\_tkinter.c
! @ Echo Compiling $**
! @ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS)
# Object Library of All Essential Python Routines
--- 281,291 ----
# Python Extension DLL: Tcl/Tk Interface
! #_tkinter.dll: $(PATHOBJ)\_tkinter.obj Python22.lib _tkinter.def
! # @ Echo Linking $@ As DLL
! # @ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
! #$(PATHOBJ)\_tkinter.obj: $(PY_MODULES)\_tkinter.c
! # @ Echo Compiling $**
! # @ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS)
# Object Library of All Essential Python Routines
***************
*** 281,289 ****
@ ! ILIB $@ /NOLOGO /NOBACKUP -+$? ; >>$(ERRS)
! Python15.dll: $(PATHOBJ)\Compile.obj PyCore.lib Python.def
@ Echo Linking $@ As DLL
@ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
! @ Echo Compressing $@ with LxLite
! @ lxlite $@
# IBM Linker Requires One Explicit .OBJ To Build a .DLL from a .LIB
--- 294,302 ----
@ ! ILIB $@ /NOLOGO /NOBACKUP -+$? ; >>$(ERRS)
! Python22.dll: $(PATHOBJ)\Compile.obj PyCore.lib Python.def
@ Echo Linking $@ As DLL
@ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
! # @ Echo Compressing $@ with LxLite
! # @ lxlite $@
# IBM Linker Requires One Explicit .OBJ To Build a .DLL from a .LIB
***************
*** 292,308 ****
@ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS)
! # Import Library for Using the Python15.dll
! Python15.lib: Python.def
@ Echo Making $@
@ IMPLIB /NOLOGO /NOIGNORE $@ $** >>$(ERRS)
@ ILIB /NOLOGO /CONVFORMAT /NOEXTDICTIONARY /NOBROWSE /NOBACKUP $@; >>$(ERRS)
! # Small Command-Line Program to Start Interpreter in Python15.dll
! Python.exe: $(PATHOBJ)\Python.obj Python15.lib
@ Echo Linking $@ As EXE
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:VIO /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
! # Small PM-GUI Program to Start Interpreter in Python15.dll
! PythonPM.exe: $(PATHOBJ)\Python.obj Python15.lib
@ Echo Linking $@ As EXE
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:PM /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
--- 305,321 ----
@ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS)
! # Import Library for Using the Python22.dll
! Python22.lib: Python.def
@ Echo Making $@
@ IMPLIB /NOLOGO /NOIGNORE $@ $** >>$(ERRS)
@ ILIB /NOLOGO /CONVFORMAT /NOEXTDICTIONARY /NOBROWSE /NOBACKUP $@; >>$(ERRS)
! # Small Command-Line Program to Start Interpreter in Python22.dll
! Python.exe: $(PATHOBJ)\Python.obj Python22.lib
@ Echo Linking $@ As EXE
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:VIO /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
! # Small PM-GUI Program to Start Interpreter in Python22.dll
! PythonPM.exe: $(PATHOBJ)\Python.obj Python22.lib
@ Echo Linking $@ As EXE
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:PM /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
***************
*** 324,334 ****
# Remove All Targets, Including Final Binaries
distclean: clean
! -- Del /Q PyCore.lib Python15.lib >NUL 2>&1
! -- Del /Q Python15.dll Python.exe PGen.exe >NUL 2>&1
! release: Python.exe Python15.dll Python15.lib
-- @Echo Y | copy /U Python.exe D:\EXEs
! -- @Echo Y | copy /U Python15.dll D:\DLLs
! -- @Echo Y | copy /U Python15.lib E:\Tau\Lib
-- @Echo Y | copy /U _tkinter.dll D:\Python
--- 337,347 ----
# Remove All Targets, Including Final Binaries
distclean: clean
! -- Del /Q PyCore.lib Python22.lib >NUL 2>&1
! -- Del /Q Python22.dll Python.exe PGen.exe >NUL 2>&1
! release: Python.exe Python22.dll Python22.lib
-- @Echo Y | copy /U Python.exe D:\EXEs
! -- @Echo Y | copy /U Python22.dll D:\DLLs
! -- @Echo Y | copy /U Python22.lib E:\Tau\Lib
-- @Echo Y | copy /U _tkinter.dll D:\Python
Index: pyconfig.h
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/pyconfig.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pyconfig.h 2001/07/26 21:34:59 1.2
--- pyconfig.h 2001/11/05 02:45:58 1.3
***************
*** 55,59 ****
* won't have to explicitly specify it anymore
*/
! #pragma library("Python15.lib")
/***************************************************/
--- 55,59 ----
* won't have to explicitly specify it anymore
*/
! #pragma library("Python22.lib")
/***************************************************/
***************
*** 80,83 ****
--- 80,91 ----
/* #define SIZEOF_LONG_LONG 8 */ /* Count of Bytes in a (long long) */
+ /* unicode definines */
+ #define Py_USING_UNICODE
+ #define PY_UNICODE_TYPE wchar_t
+ #define Py_UNICODE_SIZE SIZEOF_SHORT
+
+ /* dynamic loading */
+ #define HAVE_DYNAMIC_LOADING 1
+
/* Define if type char is unsigned and you are not using gcc. */
#ifndef __CHAR_UNSIGNED__
***************
*** 189,193 ****
/* Unix-Specific */
! #define HAVE_SYS_UN_H 1 /* #include <sys/un.h> */
/* #define HAVE_SYS_UTSNAME_H 1 */ /* #include <sys/utsname.h> */
/* #define HAVE_SYS_WAIT_H 1 */ /* #include <sys/wait.h> */
--- 197,201 ----
/* Unix-Specific */
! /* #define HAVE_SYS_UN_H 1 /* #include <sys/un.h> */
/* #define HAVE_SYS_UTSNAME_H 1 */ /* #include <sys/utsname.h> */
/* #define HAVE_SYS_WAIT_H 1 */ /* #include <sys/wait.h> */
Index: python.def
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/python.def,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** python.def 1998/09/28 22:02:39 1.3
--- python.def 2001/11/05 02:45:58 1.4
***************
*** 1,4 ****
! LIBRARY PYTHON15 INITINSTANCE TERMINSTANCE
! DESCRIPTION 'Python 1.5 Core DLL'
PROTMODE
DATA MULTIPLE NONSHARED
--- 1,4 ----
! LIBRARY PYTHON22 INITINSTANCE TERMINSTANCE
! DESCRIPTION 'Python 2.2 Core DLL'
PROTMODE
DATA MULTIPLE NONSHARED
***************
*** 473,475 ****
--- 473,480 ----
_Py_re_set_syntax
; _Py_samebitset
+ PyBuffer_Type
+ PyBuffer_FromObject
+ PyBuffer_FromMemory
+ PyBuffer_FromReadWriteMemory
+ PyBuffer_New