Author: jelmer Date: 2007-09-26 01:34:23 +0000 (Wed, 26 Sep 2007) New Revision: 25334
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25334 Log: Clean up some more files, fix the build. Added: branches/4.0-python/source/lib/python/config.c branches/4.0-python/source/lib/python/pyconfig.h Removed: branches/4.0-python/source/lib/python/Lib/bsddb/ branches/4.0-python/source/lib/python/Lib/ctypes/test/ branches/4.0-python/source/lib/python/Lib/email/ branches/4.0-python/source/lib/python/Lib/idlelib/ branches/4.0-python/source/lib/python/Lib/sqlite3/ branches/4.0-python/source/lib/python/Modules/config.c.in Modified: branches/4.0-python/ branches/4.0-python/source/lib/python/Python/getplatform.c branches/4.0-python/source/lib/python/config.m4 branches/4.0-python/source/lib/python/config.mk Changeset: Property changes on: branches/4.0-python ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Deleted: branches/4.0-python/source/lib/python/Modules/config.c.in =================================================================== --- branches/4.0-python/source/lib/python/Modules/config.c.in 2007-09-26 01:34:20 UTC (rev 25333) +++ branches/4.0-python/source/lib/python/Modules/config.c.in 2007-09-26 01:34:23 UTC (rev 25334) @@ -1,66 +0,0 @@ -/* -*- C -*- *********************************************** -Copyright (c) 2000, BeOpen.com. -Copyright (c) 1995-2000, Corporation for National Research Initiatives. -Copyright (c) 1990-1995, Stichting Mathematisch Centrum. -All rights reserved. - -See the file "Misc/COPYRIGHT" for information on usage and -redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. -******************************************************************/ - -/* Module configuration */ - -/* !!! !!! !!! This file is edited by the makesetup script !!! !!! !!! */ - -/* This file contains the table of built-in modules. - See init_builtin() in import.c. */ - -#include "Python.h" - -#ifdef __cplusplus -extern "C" { -#endif - - -/* -- ADDMODULE MARKER 1 -- */ - -extern void PyMarshal_Init(void); -extern void initimp(void); -extern void initgc(void); -extern void init_ast(void); -extern void init_types(void); - -struct _inittab _PyImport_Inittab[] = { - -/* -- ADDMODULE MARKER 2 -- */ - - /* This module lives in marshal.c */ - {"marshal", PyMarshal_Init}, - - /* This lives in import.c */ - {"imp", initimp}, - - /* This lives in Python/Python-ast.c */ - {"_ast", init_ast}, - - /* This lives in Python/_types.c */ - {"_types", init_types}, - - /* These entries are here for sys.builtin_module_names */ - {"__main__", NULL}, - {"__builtin__", NULL}, - {"sys", NULL}, - {"exceptions", NULL}, - - /* This lives in gcmodule.c */ - {"gc", initgc}, - - /* Sentinel */ - {0, 0} -}; - - -#ifdef __cplusplus -} -#endif - Modified: branches/4.0-python/source/lib/python/Python/getplatform.c =================================================================== --- branches/4.0-python/source/lib/python/Python/getplatform.c 2007-09-26 01:34:20 UTC (rev 25333) +++ branches/4.0-python/source/lib/python/Python/getplatform.c 2007-09-26 01:34:23 UTC (rev 25334) @@ -1,4 +1,3 @@ - #include "Python.h" #ifndef PLATFORM Added: branches/4.0-python/source/lib/python/config.c =================================================================== --- branches/4.0-python/source/lib/python/config.c 2007-09-26 01:34:20 UTC (rev 25333) +++ branches/4.0-python/source/lib/python/config.c 2007-09-26 01:34:23 UTC (rev 25334) @@ -0,0 +1,69 @@ +/* Generated automatically from ./Modules/config.c.in by makesetup. */ +/* -*- C -*- *********************************************** +Copyright (c) 2000, BeOpen.com. +Copyright (c) 1995-2000, Corporation for National Research Initiatives. +Copyright (c) 1990-1995, Stichting Mathematisch Centrum. +All rights reserved. + +See the file "Misc/COPYRIGHT" for information on usage and +redistribution of this file, and for a DISCLAIMER OF ALL WARRANTIES. +******************************************************************/ + +/* Module configuration */ + +/* !!! !!! !!! This file is edited by the makesetup script !!! !!! !!! */ + +/* This file contains the table of built-in modules. + See init_builtin() in import.c. */ + +#include "Python.h" + +#ifdef __cplusplus +extern "C" { +#endif + + + +/* -- ADDMODULE MARKER 1 -- */ + +extern void PyMarshal_Init(void); +extern void initimp(void); +extern void initgc(void); +extern void init_ast(void); +extern void init_types(void); + +struct _inittab _PyImport_Inittab[] = { + + +/* -- ADDMODULE MARKER 2 -- */ + + /* This module lives in marshal.c */ + {"marshal", PyMarshal_Init}, + + /* This lives in import.c */ + {"imp", initimp}, + + /* This lives in Python/Python-ast.c */ + {"_ast", init_ast}, + + /* This lives in Python/_types.c */ + {"_types", init_types}, + + /* These entries are here for sys.builtin_module_names */ + {"__main__", NULL}, + {"__builtin__", NULL}, + {"sys", NULL}, + {"exceptions", NULL}, + + /* This lives in gcmodule.c */ + {"gc", initgc}, + + /* Sentinel */ + {0, 0} +}; + + +#ifdef __cplusplus +} +#endif + Modified: branches/4.0-python/source/lib/python/config.m4 =================================================================== --- branches/4.0-python/source/lib/python/config.m4 2007-09-26 01:34:20 UTC (rev 25333) +++ branches/4.0-python/source/lib/python/config.m4 2007-09-26 01:34:23 UTC (rev 25334) @@ -2298,16 +2298,6 @@ THREADHEADERS="$THREADHEADERS \$(srcdir)/$h" done -AC_SUBST(SRCDIRS) -SRCDIRS="Parser Grammar Objects Python Modules" -AC_MSG_CHECKING(for build directories) -for dir in $SRCDIRS; do - if test ! -d $dir; then - mkdir $dir - fi -done -AC_MSG_RESULT(done) - # generate output files AC_CONFIG_FILES(lib/python/Modules/Setup.config) @@ -2323,8 +2313,4 @@ echo "# Edit this file for local setup changes" >lib/python/Modules/Setup.local fi -echo "creating Makefile" -$SHELL $srcdir/lib/python/Modules/makesetup -c $srcdir/lib/python/Modules/config.c.in \ - -s lib/python/Modules lib/python/Modules/Setup.config \ - lib/python/Modules/Setup.local lib/python/Modules/Setup -mv config.c Modules +AC_DEFINE_UNQUOTED(PLATFORM, $MACHDEP, [Platforms]) Modified: branches/4.0-python/source/lib/python/config.mk =================================================================== --- branches/4.0-python/source/lib/python/config.mk 2007-09-26 01:34:20 UTC (rev 25333) +++ branches/4.0-python/source/lib/python/config.mk 2007-09-26 01:34:23 UTC (rev 25334) @@ -1,9 +1,3 @@ -MODOBJS= _MODOBJS_ -MODLIBS= _MODLIBS_ - -# Machine-dependent subdirectories -MACHDEP= @MACHDEP@ - # Symbols used for using shared libraries SO= @SO@ LDSHARED= @LDSHARED@ @@ -19,9 +13,6 @@ EXEMODE= 755 FILEMODE= 644 -# Other subdirectories -SUBDIRSTOO= Include Lib Misc Demo - LIBRARY= @LIBRARY@ LDLIBRARY= @LDLIBRARY@ BLDLIBRARY= @BLDLIBRARY@ @@ -74,10 +65,10 @@ ASDLGEN= $(srcdir)/lib/python/Parser/asdl_c.py [LIBRARY::PYTHON] -PRIVATE_DEPENDENCIES = PYTHON_PLATFORM -LDFLAGS = -lm -CFLAGS = -DPy_BUILD_CORE -Ilib/python/Include -Ilib/python +LDFLAGS = -lm -lutil +CFLAGS = -DPy_BUILD_CORE -Ilib/python/Include -Ilib/python -DPYTHONPATH=":plat-linux2" -DVERSION="2.6" OBJ_FILES = \ + Python/getplatform.o \ Modules/_typesmodule.o \ Modules/getbuildinfo.o \ Python/Python-ast.o \ @@ -153,6 +144,15 @@ Modules/getpath.o \ Modules/main.o \ Modules/gcmodule.o \ + Modules/signalmodule.o \ + Modules/posixmodule.o \ + Modules/errnomodule.o \ + Modules/pwdmodule.o \ + Modules/_sre.o \ + Modules/_codecsmodule.o \ + Modules/zipimport.o \ + Modules/symtablemodule.o \ + Modules/xxsubtype.o \ Parser/acceler.o \ Parser/grammar1.o \ Parser/listnode.o \ @@ -203,22 +203,9 @@ oldsharedmods: $(SHAREDMODS) -lib/python/Modules/config.c: $(srcdir)/lib/python/Modules/config.c.in \ - lib/python/Modules/makesetup - ./lib/python/Modules/makesetup -m - - mv config.c lib/python/Modules/config.c - ############################################################################ # Special rules for object files -Modules/getpath.o: $(srcdir)/Modules/getpath.c Makefile - $(CC) -c $(PY_CFLAGS) -DPYTHONPATH='"$(PYTHONPATH)"' \ - -DPREFIX='"$(prefix)"' \ - -DEXEC_PREFIX='"$(exec_prefix)"' \ - -DVERSION='"$(VERSION)"' \ - -DVPATH='"$(VPATH)"' \ - -o $@ $(srcdir)/Modules/getpath.c - $(GRAMMAR_H) $(GRAMMAR_C): bin/pgen $(GRAMMAR_INPUT) -bin/pgen $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) @@ -249,10 +236,6 @@ lib/python/Python/compile.o Python/symtable.o: $(GRAMMAR_H) $(AST_H) -[SUBSYSTEM::PYTHON_PLATFORM] -CFLAGS = -DPLATFORM='"$(MACHDEP)"' -Ilib/python/Include -Ilib/python -DPy_BUILD_CORE -OBJ_FILES = Python/getplatform.o - lib/python/Objects/unicodectype.o: $(srcdir)/lib/python/Objects/unicodectype.c \ $(srcdir)/lib/python/Objects/unicodetype_db.h @@ -354,115 +337,3 @@ export EXE; EXE="$(BUILDEXE)"; \ cd $(srcdir)/Lib/lib/python/$(PLATDIR); ./regen -# Install the include files -INCLDIRSTOMAKE=$(INCLUDEDIR) $(CONFINCLUDEDIR) $(INCLUDEPY) $(CONFINCLUDEPY) -inclinstall: - @for i in $(INCLDIRSTOMAKE); \ - do \ - if test ! -d $(DESTDIR)$$i; then \ - echo "Creating directory $$i"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \ - else true; \ - fi; \ - done - @for i in $(srcdir)/Include/*.h; \ - do \ - echo $(INSTALL_DATA) $$i $(INCLUDEPY); \ - $(INSTALL_DATA) $$i $(DESTDIR)$(INCLUDEPY); \ - done - $(INSTALL_DATA) pyconfig.h $(DESTDIR)$(CONFINCLUDEPY)/pyconfig.h - -# Install the library and miscellaneous stuff needed for extending/embedding -# This goes into $(exec_prefix) -LIBPL= $(LIBP)/config -libainstall: all - @for i in $(LIBDIR) $(LIBP) $(LIBPL); \ - do \ - if test ! -d $(DESTDIR)$$i; then \ - echo "Creating directory $$i"; \ - $(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \ - else true; \ - fi; \ - done - @if test -d $(LIBRARY); then :; else \ - if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \ - if test "$(SO)" = .dll; then \ - $(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(LIBPL) ; \ - else \ - $(INSTALL_DATA) $(LIBRARY) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ - $(RANLIB) $(DESTDIR)$(LIBPL)/$(LIBRARY) ; \ - fi; \ - else \ - echo Skip install of $(LIBRARY) - use make frameworkinstall; \ - fi; \ - fi - $(INSTALL_DATA) Modules/config.c $(DESTDIR)$(LIBPL)/config.c - $(INSTALL_DATA) Modules/python.o $(DESTDIR)$(LIBPL)/python.o - $(INSTALL_DATA) $(srcdir)/Modules/config.c.in $(DESTDIR)$(LIBPL)/config.c.in - $(INSTALL_DATA) Makefile $(DESTDIR)$(LIBPL)/Makefile - $(INSTALL_DATA) Modules/Setup $(DESTDIR)$(LIBPL)/Setup - $(INSTALL_DATA) Modules/Setup.local $(DESTDIR)$(LIBPL)/Setup.local - $(INSTALL_DATA) Modules/Setup.config $(DESTDIR)$(LIBPL)/Setup.config - $(INSTALL_SCRIPT) $(srcdir)/Modules/makesetup $(DESTDIR)$(LIBPL)/makesetup - $(INSTALL_SCRIPT) $(srcdir)/install-sh $(DESTDIR)$(LIBPL)/install-sh - # Substitution happens here, as the completely-expanded BINDIR - # is not available in configure - sed -e "s,@EXENAME@,$(BINDIR)/python$(VERSION)$(EXE)," < $(srcdir)/Misc/python-config.in >python-config - $(INSTALL_SCRIPT) python-config $(DESTDIR)$(BINDIR)/python$(VERSION)-config - rm python-config - @if [ -s Modules/python.exp -a \ - "`echo $(MACHDEP) | sed 's/^\(...\).*/\1/'`" = "aix" ]; then \ - echo; echo "Installing support files for building shared extension modules on AIX:"; \ - $(INSTALL_DATA) Modules/python.exp \ - $(DESTDIR)$(LIBPL)/python.exp; \ - echo; echo "$(LIBPL)/python.exp"; \ - $(INSTALL_SCRIPT) $(srcdir)/Modules/makexp_aix \ - $(DESTDIR)$(LIBPL)/makexp_aix; \ - echo "$(LIBPL)/makexp_aix"; \ - $(INSTALL_SCRIPT) $(srcdir)/Modules/ld_so_aix \ - $(DESTDIR)$(LIBPL)/ld_so_aix; \ - echo "$(LIBPL)/ld_so_aix"; \ - echo; echo "See Misc/AIX-NOTES for details."; \ - else true; \ - fi - @case "$(MACHDEP)" in beos*) \ - echo; echo "Installing support files for building shared extension modules on BeOS:"; \ - $(INSTALL_DATA) Misc/BeOS-NOTES $(DESTDIR)$(LIBPL)/README; \ - echo; echo "$(LIBPL)/README"; \ - $(INSTALL_SCRIPT) Modules/ar_beos $(DESTDIR)$(LIBPL)/ar_beos; \ - echo "$(LIBPL)/ar_beos"; \ - $(INSTALL_SCRIPT) Modules/ld_so_beos $(DESTDIR)$(LIBPL)/ld_so_beos; \ - echo "$(LIBPL)/ld_so_beos"; \ - echo; echo "See Misc/BeOS-NOTES for details."; \ - ;; \ - esac - -# Install the dynamically loadable modules -# This goes into $(exec_prefix) -sharedinstall: - $(RUNSHARED) ./$(BUILDPYTHON) -E $(srcdir)/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --install-platlib=$(DESTSHARED) \ - --root=/$(DESTDIR) - -# This installs a few of the useful scripts in Tools/scripts -scriptsinstall: - SRCDIR=$(srcdir) $(RUNSHARED) \ - ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/setup.py install \ - --prefix=$(prefix) \ - --install-scripts=$(BINDIR) \ - --root=/$(DESTDIR) - -.PRECIOUS: config.status $(BUILDPYTHON) Makefile Makefile.pre - -# Declare targets that aren't real files -.PHONY: all sharedmods oldsharedmods test quicktest memtest -.PHONY: install altinstall oldsharedinstall bininstall altbininstall -.PHONY: maninstall libinstall inclinstall libainstall sharedinstall -.PHONY: frameworkinstall frameworkinstallframework frameworkinstallstructure -.PHONY: frameworkinstallmaclib frameworkinstallapps frameworkinstallunixtools -.PHONY: frameworkaltinstallunixtools recheck autoconf clean clobber distclean -.PHONY: smelly funny - -# IF YOU PUT ANYTHING HERE IT WILL GO AWAY Added: branches/4.0-python/source/lib/python/pyconfig.h =================================================================== --- branches/4.0-python/source/lib/python/pyconfig.h 2007-09-26 01:34:20 UTC (rev 25333) +++ branches/4.0-python/source/lib/python/pyconfig.h 2007-09-26 01:34:23 UTC (rev 25334) @@ -0,0 +1 @@ +#include "config.h"
