Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 1994c7f

Browse files
author
Andrew MacIntyre
committed
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.
1 parent ffcf899 commit 1994c7f

1 file changed

Lines changed: 39 additions & 34 deletions

File tree

‎PC/os2vacpp/makefile‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
# for OS/2 compiler, version 3.0, with Fixpack 8 applied. It uses
77
# version 4.0 of the NMAKE tool that comes with that package.
88
#
9-
# The output of the build is a largish Python15.DLL containing the
9+
# The output of the build is a largish Python23.DLL containing the
1010
# essential modules of Python and a small Python.exe program to start
1111
# the interpreter. When embedding Python within another program, only
12-
# Python15.DLL is needed.
12+
# Python23.DLL is needed.
1313
#
1414
# These two binaries can be statically linked with the VisualAge C/C++
1515
# runtime library (producing larger binaries), or dynamically linked
@@ -133,24 +133,33 @@ PYTHON = \
133133
PARSER = \
134134
$(PATHOBJ)\Acceler.obj \
135135
$(PATHOBJ)\Grammar1.obj \
136-
$(PATHOBJ)\MyReadline.obj \
136+
$(PATHOBJ)\ListNode.obj \
137137
$(PATHOBJ)\Node.obj \
138138
$(PATHOBJ)\Parser.obj \
139139
$(PATHOBJ)\ParseTok.obj \
140-
$(PATHOBJ)\Tokenizer.obj
140+
$(PATHOBJ)\BitSet.obj \
141+
$(PATHOBJ)\MetaGrammar.obj \
142+
$(PATHOBJ)\Tokenizer.obj \
143+
$(PATHOBJ)\MyReadline.obj
141144

142145
# Python Object Types
143146
OBJECTS = \
144147
$(PATHOBJ)\Abstract.obj \
148+
$(PATHOBJ)\BoolObject.obj \
149+
$(PATHOBJ)\BufferObject.obj \
150+
$(PATHOBJ)\CellObject.obj \
145151
$(PATHOBJ)\ClassObject.obj \
146152
$(PATHOBJ)\CObject.obj \
147153
$(PATHOBJ)\ComplexObject.obj \
154+
$(PATHOBJ)\DescrObject.obj \
148155
$(PATHOBJ)\DictObject.obj \
156+
$(PATHOBJ)\EnumObject.obj \
149157
$(PATHOBJ)\FileObject.obj \
150158
$(PATHOBJ)\FloatObject.obj \
151159
$(PATHOBJ)\FrameObject.obj \
152160
$(PATHOBJ)\FuncObject.obj \
153161
$(PATHOBJ)\IntObject.obj \
162+
$(PATHOBJ)\IterObject.obj \
154163
$(PATHOBJ)\ListObject.obj \
155164
$(PATHOBJ)\LongObject.obj \
156165
$(PATHOBJ)\MethodObject.obj \
@@ -159,14 +168,12 @@ OBJECTS = \
159168
$(PATHOBJ)\RangeObject.obj \
160169
$(PATHOBJ)\SliceObject.obj \
161170
$(PATHOBJ)\StringObject.obj \
171+
$(PATHOBJ)\StructSeq.obj \
162172
$(PATHOBJ)\TupleObject.obj \
163173
$(PATHOBJ)\TypeObject.obj \
164-
$(PATHOBJ)\unicodeobject.obj \
165-
$(PATHOBJ)\unicodectype.obj \
166-
$(PATHOBJ)\cellobject.obj \
167-
$(PATHOBJ)\descrobject.obj \
168-
$(PATHOBJ)\weakrefobject.obj \
169-
$(PATHOBJ)\structseq.obj
174+
$(PATHOBJ)\UnicodeObject.obj \
175+
$(PATHOBJ)\UnicodeCType.obj \
176+
$(PATHOBJ)\WeakrefObject.obj
170177

171178
# Extension Modules (Built-In or as Separate DLLs)
172179
MODULES = \
@@ -176,6 +183,7 @@ MODULES = \
176183
$(PATHOBJ)\cPickle.obj \
177184
$(PATHOBJ)\cStringIO.obj \
178185
$(PATHOBJ)\ErrnoModule.obj \
186+
$(PATHOBJ)\GCModule.obj \
179187
$(PATHOBJ)\GetBuildInfo.obj \
180188
$(PATHOBJ)\GetPathP.obj \
181189
$(PATHOBJ)\Main.obj \
@@ -196,20 +204,17 @@ MODULES = \
196204
$(PATHOBJ)\StructModule.obj \
197205
$(PATHOBJ)\TimeModule.obj \
198206
$(PATHOBJ)\ThreadModule.obj \
199-
$(PATHOBJ)\YUVConvert.obj \
200-
$(PATHOBJ)\bufferobject.obj \
201-
$(PATHOBJ)\gcmodule.obj
207+
$(PATHOBJ)\YUVConvert.obj
202208

203209
# Standalone Parser Generator Program (Shares Some of Python's Modules)
204210
PGEN = \
205-
$(PATHOBJ)\PGenMain.obj \
206211
$(PATHOBJ)\PGen.obj \
212+
$(PATHOBJ)\PGenMain.obj \
213+
$(PATHOBJ)\MySNPrintf.obj \
214+
$(PATHOBJ)\Tokenizer_Pgen.obj \
207215
$(PATHOBJ)\PrintGrammar.obj \
208-
$(PATHOBJ)\ListNode.obj \
209216
$(PATHOBJ)\Grammar.obj \
210-
$(PATHOBJ)\BitSet.obj \
211-
$(PATHOBJ)\FirstSets.obj \
212-
$(PATHOBJ)\MetaGrammar.obj
217+
$(PATHOBJ)\FirstSets.obj
213218

214219
##################
215220
# Macros and Flags
@@ -223,7 +228,7 @@ _GEN = /G4 /Gm /Gd-
223228
# /Gm = Use Multithread Runtime
224229
# /Gd = Dynamically Load Runtime
225230
# /Ms = Use _System Calling Convention (vs _Optlink)
226-
# (to allow non-VAC++ code to call into Python22.dll)
231+
# (to allow non-VAC++ code to call into Python23.dll)
227232

228233
_OPT = /O /Gl
229234
# /O = Enable Speed-Optimizations
@@ -258,8 +263,8 @@ CFLAGS = $(_BASE) $(_GEN) $(_OPT) $(_DBG) $(_OUT) $(_EXE) /Ss
258263
###################
259264
# Primary Target(s)
260265
###################
261-
All: obj noise PyCore.lib Python22.lib PGen.exe \
262-
Python.exe PythonPM.exe Python22.dll # _tkinter.dll
266+
All: obj noise PyCore.lib Python23.lib PGen.exe \
267+
Python.exe PythonPM.exe Python23.dll # _tkinter.dll
263268

264269
Modules: $(MODULES)
265270
Objects: $(OBJECTS)
@@ -279,7 +284,7 @@ noise:
279284
##############
280285

281286
# Python Extension DLL: Tcl/Tk Interface
282-
#_tkinter.dll: $(PATHOBJ)\_tkinter.obj Python22.lib _tkinter.def
287+
#_tkinter.dll: $(PATHOBJ)\_tkinter.obj Python23.lib _tkinter.def
283288
# @ Echo Linking $@ As DLL
284289
# @ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
285290

@@ -292,7 +297,7 @@ PyCore.lib: $(MODULES) $(OBJECTS) $(PARSER) $(PYTHON) $(PATHOBJ)\Config.obj
292297
@ Echo Adding Updated Object Files to Link Library $@
293298
@ ! ILIB $@ /NOLOGO /NOBACKUP -+$? ; >>$(ERRS)
294299

295-
Python22.dll: $(PATHOBJ)\Compile.obj PyCore.lib Python.def
300+
Python23.dll: $(PATHOBJ)\Compile.obj PyCore.lib Python.def
296301
@ Echo Linking $@ As DLL
297302
@ $(CC) $(CFLAGS) /B"/NOE" $(_DLL) /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
298303
# @ Echo Compressing $@ with LxLite
@@ -303,19 +308,19 @@ $(PATHOBJ)\Compile.obj: $(PY_PYTHON)\Compile.c
303308
@ Echo Compiling $**
304309
@ $(CC) -c $(CFLAGS) $(_DLL) -Fo$@ $** >>$(ERRS)
305310

306-
# Import Library for Using the Python22.dll
307-
Python22.lib: Python.def
311+
# Import Library for Using the Python23.dll
312+
Python23.lib: Python.def
308313
@ Echo Making $@
309314
@ IMPLIB /NOLOGO /NOIGNORE $@ $** >>$(ERRS)
310315
@ ILIB /NOLOGO /CONVFORMAT /NOEXTDICTIONARY /NOBROWSE /NOBACKUP $@; >>$(ERRS)
311316

312-
# Small Command-Line Program to Start Interpreter in Python22.dll
313-
Python.exe: $(PATHOBJ)\Python.obj Python22.lib
317+
# Small Command-Line Program to Start Interpreter in Python23.dll
318+
Python.exe: $(PATHOBJ)\Python.obj Python23.lib
314319
@ Echo Linking $@ As EXE
315320
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:VIO /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
316321

317-
# Small PM-GUI Program to Start Interpreter in Python22.dll
318-
PythonPM.exe: $(PATHOBJ)\Python.obj Python22.lib
322+
# Small PM-GUI Program to Start Interpreter in Python23.dll
323+
PythonPM.exe: $(PATHOBJ)\Python.obj Python23.lib
319324
@ Echo Linking $@ As EXE
320325
@ $(CC) $(CFLAGS) $(_EXE) /B"/PM:PM /STACK:360000" /Fe$@ $(_MAP) $** $(OTHERLIBS) >>$(ERRS)
321326

@@ -335,13 +340,13 @@ clean:
335340

336341
# Remove All Targets, Including Final Binaries
337342
distclean: clean
338-
-- Del /Q PyCore.lib Python22.lib >NUL 2>&1
339-
-- Del /Q Python22.dll Python.exe PGen.exe >NUL 2>&1
343+
-- Del /Q PyCore.lib Python23.lib >NUL 2>&1
344+
-- Del /Q Python23.dll Python.exe PGen.exe >NUL 2>&1
340345

341-
release: Python.exe Python22.dll Python22.lib
346+
release: Python.exe Python23.dll Python23.lib
342347
-- @Echo Y | copy /U Python.exe D:\EXEs
343-
-- @Echo Y | copy /U Python22.dll D:\DLLs
344-
-- @Echo Y | copy /U Python22.lib E:\Tau\Lib
348+
-- @Echo Y | copy /U Python23.dll D:\DLLs
349+
-- @Echo Y | copy /U Python23.lib E:\Tau\Lib
345350
-- @Echo Y | copy /U _tkinter.dll D:\Python
346351

347352
test:

0 commit comments

Comments
 (0)