diff options
Diffstat (limited to 'Makefile.pre.in')
| -rw-r--r-- | Makefile.pre.in | 81 |
1 files changed, 67 insertions, 14 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index 50ba086..8ed1590 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -34,7 +34,6 @@ MAINCC= @MAINCC@ LINKCC= @LINKCC@ AR= @AR@ RANLIB= @RANLIB@ -SVNVERSION= @SVNVERSION@ SOABI= @SOABI@ LDVERSION= @LDVERSION@ HGVERSION= @HGVERSION@ @@ -74,7 +73,7 @@ PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to # be able to build extension modules using the directories specified in the # environment variables -PY_CPPFLAGS= -I. -IInclude -I$(srcdir)/Include $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) +PY_CPPFLAGS= -I. -IInclude $(CONFIGURE_CPPFLAGS) $(CPPFLAGS) PY_LDFLAGS= $(CONFIGURE_LDFLAGS) $(LDFLAGS) NO_AS_NEEDED= @NO_AS_NEEDED@ LDLAST= @LDLAST@ @@ -240,14 +239,13 @@ POBJS= \ Parser/listnode.o \ Parser/node.o \ Parser/parser.o \ - Parser/parsetok.o \ Parser/bitset.o \ Parser/metagrammar.o \ Parser/firstsets.o \ Parser/grammar.o \ Parser/pgen.o -PARSER_OBJS= $(POBJS) Parser/myreadline.o Parser/tokenizer.o +PARSER_OBJS= $(POBJS) Parser/myreadline.o Parser/parsetok.o Parser/tokenizer.o PGOBJS= \ Objects/obmalloc.o \ @@ -256,10 +254,12 @@ PGOBJS= \ Python/pyctype.o \ Parser/tokenizer_pgen.o \ Parser/printgrammar.o \ + Parser/parsetok_pgen.o \ Parser/pgenmain.o PARSER_HEADERS= \ Parser/parser.h \ + Include/parsetok.h \ Parser/tokenizer.h PGENOBJS= $(PGENMAIN) $(POBJS) $(PGOBJS) @@ -274,7 +274,7 @@ AST_ASDL= $(srcdir)/Parser/Python.asdl ASDLGEN_FILES= $(srcdir)/Parser/asdl.py $(srcdir)/Parser/asdl_c.py # XXX Note that a build now requires Python exist before the build starts -ASDLGEN= $(srcdir)/Parser/asdl_c.py +ASDLGEN= @DISABLE_ASDLGEN@ $(srcdir)/Parser/asdl_c.py ########################################################################## # Python @@ -554,7 +554,6 @@ Modules/getbuildinfo.o: $(PARSER_OBJS) \ $(MODOBJS) \ $(srcdir)/Modules/getbuildinfo.c $(CC) -c $(PY_CORE_CFLAGS) \ - -DSVNVERSION="\"`LC_ALL=C $(SVNVERSION)`\"" \ -DHGVERSION="\"`LC_ALL=C $(HGVERSION)`\"" \ -DHGTAG="\"`LC_ALL=C $(HGTAG)`\"" \ -DHGBRANCH="\"`LC_ALL=C $(HGBRANCH)`\"" \ @@ -599,6 +598,7 @@ Parser/grammar.o: $(srcdir)/Parser/grammar.c \ Parser/metagrammar.o: $(srcdir)/Parser/metagrammar.c Parser/tokenizer_pgen.o: $(srcdir)/Parser/tokenizer.c +Parser/parsetok_pgen.o: $(srcdir)/Parser/parsetok.c Parser/pgenmain.o: $(srcdir)/Include/parsetok.h @@ -706,7 +706,6 @@ PYTHON_HEADERS= \ Include/objimpl.h \ Include/opcode.h \ Include/osdefs.h \ - Include/parsetok.h \ Include/patchlevel.h \ Include/pgen.h \ Include/pgenheaders.h \ @@ -759,6 +758,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) TESTOPTS= -l $(EXTRATESTOPTS) TESTPROG= $(srcdir)/Lib/test/regrtest.py TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS) +TESTTIMEOUT= 3600 test: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) @@ -790,7 +790,7 @@ buildbottest: all platform -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTPYTHON) $(TESTPROG) -uall -rwW $(TESTOPTS) + $(TESTPYTHON) $(TESTPROG) -uall -rwW --timeout=$(TESTTIMEOUT) $(TESTOPTS) QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multibytecodec test_urllib2_localnet test_itertools \ @@ -889,6 +889,8 @@ bininstall: altbininstall (cd $(DESTDIR)$(BINDIR); $(LN) -s pydoc$(VERSION) pydoc3) -rm -f $(DESTDIR)$(BINDIR)/2to3 (cd $(DESTDIR)$(BINDIR); $(LN) -s 2to3-$(VERSION) 2to3) + -rm -f $(DESTDIR)$(BINDIR)/pysetup3 + (cd $(DESTDIR)$(BINDIR); $(LN) -s pysetup$(VERSION) pysetup3) # Install the manual page maninstall: @@ -910,20 +912,72 @@ MACHDEPS= $(PLATDIR) $(EXTRAPLATDIR) XMLLIBSUBDIRS= xml xml/dom xml/etree xml/parsers xml/sax LIBSUBDIRS= tkinter tkinter/test tkinter/test/test_tkinter \ tkinter/test/test_ttk site-packages test \ - test/cjkencodings test/decimaltestdata test/xmltestdata test/subprocessdata \ + test/cjkencodings test/decimaltestdata test/xmltestdata \ + test/subprocessdata \ test/tracedmodules test/encoded_modules \ - concurrent concurrent/futures encodings \ - email email/mime email/test email/test/data \ + collections concurrent concurrent/futures encodings \ + email email/mime test/test_email test/test_email/data \ html json test/json_tests http dbm xmlrpc \ sqlite3 sqlite3/test \ logging csv wsgiref urllib \ lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \ - lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \ + lib2to3/tests/data lib2to3/tests/data/fixers \ + lib2to3/tests/data/fixers/myfixes \ ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \ distutils distutils/command distutils/tests $(XMLLIBSUBDIRS) \ importlib importlib/test importlib/test/builtin \ importlib/test/extension importlib/test/frozen \ importlib/test/import_ importlib/test/source \ + packaging packaging/command packaging/compiler \ + packaging/pypi packaging/tests \ + packaging/tests/fake_dists \ + packaging/tests/fake_dists/babar-0.1.dist-info \ + packaging/tests/fake_dists/bacon-0.1.egg-info \ + packaging/tests/fake_dists/banana-0.4.egg \ + packaging/tests/fake_dists/banana-0.4.egg/EGG-INFO \ + packaging/tests/fake_dists/choxie-2.0.0.9 \ + packaging/tests/fake_dists/choxie-2.0.0.9/choxie \ + packaging/tests/fake_dists/choxie-2.0.0.9.dist-info \ + packaging/tests/fake_dists/coconuts-aster-10.3.egg-info \ + packaging/tests/fake_dists/grammar-1.0a4 \ + packaging/tests/fake_dists/grammar-1.0a4.dist-info \ + packaging/tests/fake_dists/grammar-1.0a4/grammar \ + packaging/tests/fake_dists/towel_stuff-0.1 \ + packaging/tests/fake_dists/towel_stuff-0.1.dist-info \ + packaging/tests/fake_dists/towel_stuff-0.1/towel_stuff \ + packaging/tests/fixer packaging/tests/pypiserver \ + packaging/tests/pypiserver/downloads_with_md5 \ + packaging/tests/pypiserver/downloads_with_md5/packages \ + packaging/tests/pypiserver/downloads_with_md5/packages/source \ + packaging/tests/pypiserver/downloads_with_md5/packages/source/f \ + packaging/tests/pypiserver/downloads_with_md5/packages/source/f/foobar \ + packaging/tests/pypiserver/downloads_with_md5/simple \ + packaging/tests/pypiserver/downloads_with_md5/simple/badmd5 \ + packaging/tests/pypiserver/downloads_with_md5/simple/foobar \ + packaging/tests/pypiserver/foo_bar_baz \ + packaging/tests/pypiserver/foo_bar_baz/simple \ + packaging/tests/pypiserver/foo_bar_baz/simple/bar \ + packaging/tests/pypiserver/foo_bar_baz/simple/baz \ + packaging/tests/pypiserver/foo_bar_baz/simple/foo \ + packaging/tests/pypiserver/project_list \ + packaging/tests/pypiserver/project_list/simple \ + packaging/tests/pypiserver/test_found_links \ + packaging/tests/pypiserver/test_found_links/simple \ + packaging/tests/pypiserver/test_found_links/simple/foobar \ + packaging/tests/pypiserver/test_pypi_server \ + packaging/tests/pypiserver/test_pypi_server/external \ + packaging/tests/pypiserver/test_pypi_server/simple \ + packaging/tests/pypiserver/with_externals \ + packaging/tests/pypiserver/with_externals/external \ + packaging/tests/pypiserver/with_externals/simple \ + packaging/tests/pypiserver/with_externals/simple/foobar \ + packaging/tests/pypiserver/with_norel_links \ + packaging/tests/pypiserver/with_norel_links/external \ + packaging/tests/pypiserver/with_norel_links/simple \ + packaging/tests/pypiserver/with_norel_links/simple/foobar \ + packaging/tests/pypiserver/with_real_externals \ + packaging/tests/pypiserver/with_real_externals/simple \ + packaging/tests/pypiserver/with_real_externals/simple/foobar \ turtledemo \ multiprocessing multiprocessing/dummy \ unittest unittest/test \ @@ -948,7 +1002,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) else true; \ fi; \ done - @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.egg-info ; \ + @for i in $(srcdir)/Lib/*.py $(srcdir)/Lib/*.cfg ; \ do \ if test -x $$i; then \ $(INSTALL_SCRIPT) $$i $(DESTDIR)$(LIBDEST); \ @@ -1279,7 +1333,6 @@ smelly: all # Find files with funny names funny: find $(DISTDIRS) \ - -name .svn -prune \ -o -type d \ -o -name '*.[chs]' \ -o -name '*.py' \ |