[Python-checkins] python/dist/src/PC/os2emx Makefile,1.6,1.7
aimacintyre@users.sourceforge.net
aimacintyre@users.sourceforge.net
2002年12月31日 03:18:11 -0800
Update of /cvsroot/python/python/dist/src/PC/os2emx
In directory sc8-pr-cvs1:/tmp/cvs-serv10348
Modified Files:
Makefile
Log Message:
Build process updates:
- add new modules (zipimport, datetime, _random, bz2, _symtable)
- build pyexpat with expat sources from Python distribution
- regression test with and without compiled bytecode
Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/PC/os2emx/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Makefile 4 Dec 2002 12:37:17 -0000 1.6
--- Makefile 31 Dec 2002 11:18:08 -0000 1.7
***************
*** 46,50 ****
# I have had no success trying to use a DLL version, even with
# the multithreading switch.
! GREADLINE= no
# Do you have the BSD DB library (v1.85) as included in the EMXBSD package?
# NOTE: this library needs to be recompiled with a structure member
--- 46,50 ----
# I have had no success trying to use a DLL version, even with
# the multithreading switch.
! GREADLINE= yes
# Do you have the BSD DB library (v1.85) as included in the EMXBSD package?
# NOTE: this library needs to be recompiled with a structure member
***************
*** 55,62 ****
# Do you have the ncurses library installed? EMX's BSD curses aren't enough!
CURSES= no
- # Do you have the expat XML parsing library installed?
- EXPAT= no
# Do you have the GDBM library installed?
GDBM= no
# === The Tools ===
--- 55,62 ----
# Do you have the ncurses library installed? EMX's BSD curses aren't enough!
CURSES= no
# Do you have the GDBM library installed?
GDBM= no
+ # Do you have the BZ2 compression library installed?
+ BZ2= no
# === The Tools ===
***************
*** 240,243 ****
--- 240,244 ----
DESCRIPTION._curses$(MODULE.EXT)= Python Extension DLL for access to ncurses library
DESCRIPTION.pyexpat$(MODULE.EXT)= Python Extension DLL for access to expat library
+ DESCRIPTION.bz2$(MODULE.EXT)= Python Extension DLL for accessing the bz2 compression library
# Source files
***************
*** 365,368 ****
--- 366,370 ----
cmath \
_codecs \
+ datetime \
dl \
errno \
***************
*** 374,377 ****
--- 376,380 ----
parser \
pwd \
+ _random \
rgbimg \
rotor \
***************
*** 397,400 ****
--- 400,404 ----
_socket \
_sre \
+ _symtabl \
termios \
_testcap \
***************
*** 402,406 ****
_weakref \
xreadlin \
! xxsubtyp
# Python external ($(MODULE.EXT)) modules - can be EASY or HARD
--- 406,411 ----
_weakref \
xreadlin \
! xxsubtyp \
! zipimpor
# Python external ($(MODULE.EXT)) modules - can be EASY or HARD
***************
*** 428,438 ****
HARDEXTMODULES+= _curses _curses_
endif
- ifeq ($(EXPAT),yes)
- HARDEXTMODULES+= pyexpat
- endif
ifeq ($(GDBM),yes)
HARDEXTMODULES+= gdbm dbm
endif
EXTERNDLLS= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(EASYEXTMODULES)))
EXTERNDLLS+= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(HARDEXTMODULES)))
--- 433,454 ----
HARDEXTMODULES+= _curses _curses_
endif
ifeq ($(GDBM),yes)
HARDEXTMODULES+= gdbm dbm
endif
+ ifeq ($(BZ2),yes)
+ HARDEXTMODULES+= bz2
+ endif
+
+ # Expat is now distributed with the Python source
+ HARDEXTMODULES+= pyexpat
+ EXPAT.INC= -I../../Modules/expat
+ EXPAT.DEF= -DHAVE_EXPAT_H -DXML_NS=1 -DXML_DTD=1 -DXML_BYTE_ORDER=12 \
+ -DXML_CONTENT_BYTES=1024
+ EXPAT.SRC= $(addprefix ../../Modules/expat/, \
+ xmlparse.c \
+ xmlrole.c \
+ xmltok.c)
+ # all the external modules
EXTERNDLLS= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(EASYEXTMODULES)))
EXTERNDLLS+= $(addsuffix $(MODULE.EXT),$(patsubst %module,%,$(HARDEXTMODULES)))
***************
*** 575,578 ****
--- 591,601 ----
cp $^ $@
+ # zipimport needs to be renamed to be useful
+ zipimport$(MODULE.EXT): $(OUT)zipimport$O $(OUT)zipimport_m.def $(PYTHON.IMPLIB)
+ $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
+
+ zipimpor$(MODULE.EXT): zipimport$(MODULE.EXT)
+ cp $^ $@
+
# - optional modules (requiring other software to be installed)
bsddb185$(MODULE.EXT): $(OUT)bsddbmodule$O $(OUT)bsddb185_m.def $(PYTHON.IMPLIB)
***************
*** 632,637 ****
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lgmp
! pyexpat$(MODULE.EXT): $(OUT)pyexpat$O $(OUT)pyexpat_m.def $(PYTHON.IMPLIB)
! $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lexpat
readline$(MODULE.EXT): $(OUT)readline$O $(OUT)readline_m.def $(PYTHON.IMPLIB)
--- 655,670 ----
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lgmp
! # Expat is now distributed with Python, so use the included version
! $(OUT)pyexpat$O: ../../Modules/pyexpat.c
! $(CC) $(CFLAGS) $(EXPAT.INC) -c -o $@ $^
! $(OUT)xmlparse$O: ../../Modules/expat/xmlparse.c
! $(CC) $(CFLAGS) $(EXPAT.INC) $(EXPAT.DEF) -c -o $@ $^
! $(OUT)xmlrole$O: ../../Modules/expat/xmlrole.c
! $(CC) $(CFLAGS) $(EXPAT.INC) $(EXPAT.DEF) -c -o $@ $^
! $(OUT)xmltok$O: ../../Modules/expat/xmltok.c
! $(CC) $(CFLAGS) $(EXPAT.INC) $(EXPAT.DEF) -c -o $@ $^
! pyexpat$(MODULE.EXT): $(OUT)pyexpat$O $(OUT)xmlparse$O $(OUT)xmlrole$O \
! $(OUT)xmltok$O $(OUT)pyexpat_m.def $(PYTHON.IMPLIB)
! $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
readline$(MODULE.EXT): $(OUT)readline$O $(OUT)readline_m.def $(PYTHON.IMPLIB)
***************
*** 646,651 ****
--- 679,689 ----
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lz
+ bz2$(MODULE.EXT): $(OUT)bz2module$O $(OUT)bz2_m.def $(PYTHON.IMPLIB)
+ $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) -lbz2
+
# the test target
test:
+ -find ../../Lib -name "*.py[co]" -exec rm {} ";"
+ -./python -E -tt ../../lib/test/regrtest.py -l -u "network"
./python -E -tt ../../lib/test/regrtest.py -l -u "network"