[Python-checkins] python/dist/src/PC/os2vacpp makefile,1.7,1.8
aimacintyre@users.sourceforge.net
aimacintyre@users.sourceforge.net
Sat, 17 Aug 2002 23:31:03 -0700
Update of /cvsroot/python/python/dist/src/PC/os2vacpp
In directory usw-pr-cvs1:/tmp/cvs-serv14360
Modified Files:
makefile
Log Message:
Prep for 2.3:
- update DLL version number
- add files required for 2.3 (no changes to modules though)
- restructure build of pgen.exe
NOTE: As I don't have the VACPP compiler, these changes are untested.
Apart from slightly re-ordering some file lists, and matching file name
casing, I believe these changes are the minimum necessary to build 2.3
with VACPP.
Index: makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2vacpp/makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** makefile 14 Jun 2002 20:41:15 -0000 1.7
--- makefile 18 Aug 2002 06:31:01 -0000 1.8
***************
*** 7,14 ****
# version 4.0 of the NMAKE tool that comes with that package.
#
! # The output of the build is a largish Python15.DLL containing the
# essential modules of Python and a small Python.exe program to start
# the interpreter. When embedding Python within another program, only
! # Python15.DLL is needed.
#
# These two binaries can be statically linked with the VisualAge C/C++
--- 7,14 ----
# version 4.0 of the NMAKE tool that comes with that package.
#
! # 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.
#
# These two binaries can be statically linked with the VisualAge C/C++
***************
*** 134,150 ****
$(PATHOBJ)\Acceler.obj \
$(PATHOBJ)\Grammar1.obj \
! $(PATHOBJ)\MyReadline.obj \
$(PATHOBJ)\Node.obj \
$(PATHOBJ)\Parser.obj \
$(PATHOBJ)\ParseTok.obj \
! $(PATHOBJ)\Tokenizer.obj
# Python Object Types
OBJECTS = \
$(PATHOBJ)\Abstract.obj \
$(PATHOBJ)\ClassObject.obj \
$(PATHOBJ)\CObject.obj \
$(PATHOBJ)\ComplexObject.obj \
$(PATHOBJ)\DictObject.obj \
$(PATHOBJ)\FileObject.obj \
$(PATHOBJ)\FloatObject.obj \
--- 134,158 ----
$(PATHOBJ)\Acceler.obj \
$(PATHOBJ)\Grammar1.obj \
! $(PATHOBJ)\ListNode.obj \
$(PATHOBJ)\Node.obj \
$(PATHOBJ)\Parser.obj \
$(PATHOBJ)\ParseTok.obj \
! $(PATHOBJ)\BitSet.obj \
! $(PATHOBJ)\MetaGrammar.obj \
! $(PATHOBJ)\Tokenizer.obj \
! $(PATHOBJ)\MyReadline.obj
# Python Object Types
OBJECTS = \
$(PATHOBJ)\Abstract.obj \
+ $(PATHOBJ)\BoolObject.obj \
+ $(PATHOBJ)\BufferObject.obj \
+ $(PATHOBJ)\CellObject.obj \
$(PATHOBJ)\ClassObject.obj \
$(PATHOBJ)\CObject.obj \
$(PATHOBJ)\ComplexObject.obj \
+ $(PATHOBJ)\DescrObject.obj \
$(PATHOBJ)\DictObject.obj \
+ $(PATHOBJ)\EnumObject.obj \
$(PATHOBJ)\FileObject.obj \
$(PATHOBJ)\FloatObject.obj \
***************
*** 152,155 ****
--- 160,164 ----
$(PATHOBJ)\FuncObject.obj \
$(PATHOBJ)\IntObject.obj \
+ $(PATHOBJ)\IterObject.obj \
$(PATHOBJ)\ListObject.obj \
$(PATHOBJ)\LongObject.obj \
***************
*** 160,171 ****
$(PATHOBJ)\SliceObject.obj \
$(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)
--- 169,178 ----
$(PATHOBJ)\SliceObject.obj \
$(PATHOBJ)\StringObject.obj \
+ $(PATHOBJ)\StructSeq.obj \
$(PATHOBJ)\TupleObject.obj \
$(PATHOBJ)\TypeObject.obj \
! $(PATHOBJ)\UnicodeObject.obj \
! $(PATHOBJ)\UnicodeCType.obj \
! $(PATHOBJ)\WeakrefObject.obj
# Extension Modules (Built-In or as Separate DLLs)
***************
*** 177,180 ****
--- 184,188 ----
$(PATHOBJ)\cStringIO.obj \
$(PATHOBJ)\ErrnoModule.obj \
+ $(PATHOBJ)\GCModule.obj \
$(PATHOBJ)\GetBuildInfo.obj \
$(PATHOBJ)\GetPathP.obj \
***************
*** 197,214 ****
$(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)
PGEN = \
- $(PATHOBJ)\PGenMain.obj \
$(PATHOBJ)\PGen.obj \
$(PATHOBJ)\PrintGrammar.obj \
- $(PATHOBJ)\ListNode.obj \
$(PATHOBJ)\Grammar.obj \
! $(PATHOBJ)\BitSet.obj \
! $(PATHOBJ)\FirstSets.obj \
! $(PATHOBJ)\MetaGrammar.obj
##################
--- 205,219 ----
$(PATHOBJ)\TimeModule.obj \
$(PATHOBJ)\ThreadModule.obj \
! $(PATHOBJ)\YUVConvert.obj
# Standalone Parser Generator Program (Shares Some of Python's Modules)
PGEN = \
$(PATHOBJ)\PGen.obj \
+ $(PATHOBJ)\PGenMain.obj \
+ $(PATHOBJ)\MySNPrintf.obj \
+ $(PATHOBJ)\Tokenizer_Pgen.obj \
$(PATHOBJ)\PrintGrammar.obj \
$(PATHOBJ)\Grammar.obj \
! $(PATHOBJ)\FirstSets.obj
##################
***************
*** 224,228 ****
# /Gd = Dynamically Load Runtime
# /Ms = Use _System Calling Convention (vs _Optlink)
! # (to allow non-VAC++ code to call into Python22.dll)
_OPT = /O /Gl
--- 229,233 ----
# /Gd = Dynamically Load Runtime
# /Ms = Use _System Calling Convention (vs _Optlink)
! # (to allow non-VAC++ code to call into Python23.dll)
_OPT = /O /Gl
***************
*** 259,264 ****
# Primary Target(s)
###################
! All: obj noise PyCore.lib Python22.lib PGen.exe \
! Python.exe PythonPM.exe Python22.dll # _tkinter.dll
Modules: $(MODULES)
--- 264,269 ----
# Primary Target(s)
###################
! All: obj noise PyCore.lib Python23.lib PGen.exe \
! Python.exe PythonPM.exe Python23.dll # _tkinter.dll
Modules: $(MODULES)
***************
*** 280,284 ****
# 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)
--- 285,289 ----
# Python Extension DLL: Tcl/Tk Interface
! #_tkinter.dll: $(PATHOBJ)\_tkinter.obj Python23.lib _tkinter.def
# @ Echo Linking $@ As DLL
# @ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
***************
*** 293,297 ****
@ ! 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)
--- 298,302 ----
@ ! ILIB $@ /NOLOGO /NOBACKUP -+$? ; >>$(ERRS)
! Python23.dll: $(PATHOBJ)\Compile.obj PyCore.lib Python.def
@ Echo Linking $@ As DLL
@ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
***************
*** 304,320 ****
@ $(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)
--- 309,325 ----
@ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS)
! # Import Library for Using the Python23.dll
! Python23.lib: Python.def
@ Echo Making $@
@ IMPLIB /NOLOGO /NOIGNORE $@ $** >>$(ERRS)
@ ILIB /NOLOGO /CONVFORMAT /NOEXTDICTIONARY /NOBROWSE /NOBACKUP $@; >>$(ERRS)
! # Small Command-Line Program to Start Interpreter in Python23.dll
! Python.exe: $(PATHOBJ)\Python.obj Python23.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 Python23.dll
! PythonPM.exe: $(PATHOBJ)\Python.obj Python23.lib
@ Echo Linking $@ As EXE
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:PM /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
***************
*** 336,346 ****
# 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
--- 341,351 ----
# Remove All Targets, Including Final Binaries
distclean: clean
! -- Del /Q PyCore.lib Python23.lib >NUL 2>&1
! -- Del /Q Python23.dll Python.exe PGen.exe >NUL 2>&1
! release: Python.exe Python23.dll Python23.lib
-- @Echo Y | copy /U Python.exe D:\EXEs
! -- @Echo Y | copy /U Python23.dll D:\DLLs
! -- @Echo Y | copy /U Python23.lib E:\Tau\Lib
-- @Echo Y | copy /U _tkinter.dll D:\Python