mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

make _sre a dynamically loadable module and build xxsubtype

Browse source
This commit is contained in:
Andrew MacIntyre 2002-06-10 08:04:29 +00:00
parent 388fbf3d4a
commit 4a79e36018
2 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
PC/os2emx/Makefile
View file

@ -252,8 +252,7 @@ SRC.MODULES= $(addprefix $(TOP), \
Modules/gcmodule.c \ Modules/gcmodule.c \
Modules/signalmodule.c \ Modules/signalmodule.c \
Modules/posixmodule.c \ Modules/posixmodule.c \
Modules/threadmodule.c \ Modules/threadmodule.c)
Modules/_sre.c)
SRC.PARSER= $(addprefix $(TOP), \ SRC.PARSER= $(addprefix $(TOP), \
Parser/acceler.c \ Parser/acceler.c \
Parser/grammar1.c \ Parser/grammar1.c \
@ -382,11 +381,13 @@ HARDEXTMODULES= binascii \
pcre \ pcre \
regex \ regex \
_socket \ _socket \
_sre \
termios \ termios \
_testcap \ _testcap \
unicoded \ unicoded \
_weakref \ _weakref \
xreadlin xreadlin \
xxsubtyp
# Python external ($(MODULE.EXT)) modules - can be EASY or HARD # Python external ($(MODULE.EXT)) modules - can be EASY or HARD
ifeq ($(ZLIB),yes) ifeq ($(ZLIB),yes)
@ -513,6 +514,9 @@ regex$(MODULE.EXT): $(OUT)regexmodule$O $(OUT)regexpr$O $(OUT)regex_m.def $(PYTH
_socket$(MODULE.EXT): $(OUT)socketmodule$O $(OUT)_socket_m.def $(PYTHON.IMPLIB) _socket$(MODULE.EXT): $(OUT)socketmodule$O $(OUT)_socket_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
_sre$(MODULE.EXT): $(OUT)_sre$O $(OUT)_sre_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
# _symtable needs to be renamed to be useful # _symtable needs to be renamed to be useful
_symtable$(MODULE.EXT): $(OUT)symtablemodule$O $(OUT)_symtable_m.def $(PYTHON.IMPLIB) _symtable$(MODULE.EXT): $(OUT)symtablemodule$O $(OUT)_symtable_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS) $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
@ -547,6 +551,13 @@ xreadlines$(MODULE.EXT): $(OUT)xreadlinesmodule$O $(OUT)xreadlines_m.def $(PYTHO
xreadlin$(MODULE.EXT): xreadlines$(MODULE.EXT) xreadlin$(MODULE.EXT): xreadlines$(MODULE.EXT)
cp $^ $@ cp $^ $@
# xxsubtype needs to be renamed to be useful
xxsubtype$(MODULE.EXT): $(OUT)xxsubtype$O $(OUT)xxsubtype_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) $(LIBS)
xxsubtyp$(MODULE.EXT): xxsubtype$(MODULE.EXT)
cp $^ $@
# - optional modules (requiring other software to be installed) # - optional modules (requiring other software to be installed)
bsddb$(MODULE.EXT): $(OUT)bsddbmodule$O $(OUT)bsddb_m.def $(PYTHON.IMPLIB) bsddb$(MODULE.EXT): $(OUT)bsddbmodule$O $(OUT)bsddb_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) -ldb $(LIBS) $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) -ldb $(LIBS)

4
PC/os2emx/config.c
View file

@ -80,6 +80,7 @@ extern void inittime();
extern void inittiming(); extern void inittiming();
extern void initunicodedata(); extern void initunicodedata();
extern void initxreadlines(); extern void initxreadlines();
extern void initxxsubtype();
extern void initzlib(); extern void initzlib();
/* -- ADDMODULE MARKER 1 -- */ /* -- ADDMODULE MARKER 1 -- */
@ -91,7 +92,6 @@ struct _inittab _PyImport_Inittab[] = {
{"gc", initgc}, {"gc", initgc},
{"os2", initos2}, {"os2", initos2},
{"_sre", init_sre},
{"signal", initsignal}, {"signal", initsignal},
#ifdef WITH_THREAD #ifdef WITH_THREAD
{"thread", initthread}, {"thread", initthread},
@ -102,6 +102,7 @@ struct _inittab _PyImport_Inittab[] = {
{"_curses_panel", init_curses_panel}, {"_curses_panel", init_curses_panel},
{"_hotshot", init_hotshot}, {"_hotshot", init_hotshot},
{"_locale", init_locale}, {"_locale", init_locale},
{"_sre", init_sre},
{"_testcapi", init_testcapi}, {"_testcapi", init_testcapi},
{"_weakref", init_weakref}, {"_weakref", init_weakref},
{"array", initarray}, {"array", initarray},
@ -134,6 +135,7 @@ struct _inittab _PyImport_Inittab[] = {
{"timing", inittiming}, {"timing", inittiming},
{"unicodedata", initunicodedata}, {"unicodedata", initunicodedata},
{"xreadlines", initxreadlines}, {"xreadlines", initxreadlines},
{"xxsubtype", initxxsubtype},
{"zlib", initzlib}, {"zlib", initzlib},
#ifdef USE_SOCKET #ifdef USE_SOCKET
{"_socket", init_socket}, {"_socket", init_socket},