[PyObjC-svn] r2468 - in trunk/pyobjc/pyobjc-core: . PyObjCTest libxml2-src libxml2-src/VxWorks libxml2-src/bakefile libxml2-src/example libxml2-src/include libxml2-src/include/libxml libxml2-src/m4 libxml2-src/macos libxml2-src/macos/src libxml2-src/python libxml2-src/python/tests libxml2-src/vms libxml2-src/win32 libxml2-src/win32/wince libxml2-src/xstc
[email protected] Tue, 04 May 2010 15:09:41 -0500
| Newsgroups | gmane.comp.python.pyobjc.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: ronaldoussoren
Date: Tue May 4 15:09:40 2010
New Revision: 2468
Log:
Ship a local copy of libxml2 to avoid problems
when compiling on 10.6 and running on 10.4.
This can be disabled in setup.py.
Added:
trunk/pyobjc/pyobjc-core/libxml2-src/
trunk/pyobjc/pyobjc-core/libxml2-src/AUTHORS
trunk/pyobjc/pyobjc-core/libxml2-src/COPYING (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/ChangeLog
trunk/pyobjc/pyobjc-core/libxml2-src/Copyright
trunk/pyobjc/pyobjc-core/libxml2-src/DOCBparser.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/HTMLparser.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/HTMLtree.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/INSTALL
trunk/pyobjc/pyobjc-core/libxml2-src/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/Makefile.tests
trunk/pyobjc/pyobjc-core/libxml2-src/NEWS
trunk/pyobjc/pyobjc-core/libxml2-src/README
trunk/pyobjc/pyobjc-core/libxml2-src/README.tests
trunk/pyobjc/pyobjc-core/libxml2-src/ReadMe.PyObjC
trunk/pyobjc/pyobjc-core/libxml2-src/SAX.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/SAX2.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/TODO
trunk/pyobjc/pyobjc-core/libxml2-src/TODO_SCHEMAS
trunk/pyobjc/pyobjc-core/libxml2-src/VxWorks/
trunk/pyobjc/pyobjc-core/libxml2-src/VxWorks/Makefile (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/VxWorks/README
trunk/pyobjc/pyobjc-core/libxml2-src/VxWorks/build.sh (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/acconfig.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/acinclude.m4
trunk/pyobjc/pyobjc-core/libxml2-src/aclocal.m4
trunk/pyobjc/pyobjc-core/libxml2-src/bakefile/
trunk/pyobjc/pyobjc-core/libxml2-src/bakefile/Bakefiles.bkgen
trunk/pyobjc/pyobjc-core/libxml2-src/bakefile/Readme.txt
trunk/pyobjc/pyobjc-core/libxml2-src/bakefile/libxml2.bkl
trunk/pyobjc/pyobjc-core/libxml2-src/c14n.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/catalog.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/check-relaxng-test-suite.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/check-relaxng-test-suite2.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/check-xinclude-test-suite.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/check-xml-test-suite.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/check-xsddata-test-suite.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/chvalid.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/config.guess (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/config.h.in
trunk/pyobjc/pyobjc-core/libxml2-src/config.sub (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/configure (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/configure.in
trunk/pyobjc/pyobjc-core/libxml2-src/dbgen.pl (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/dbgenattr.pl (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/debugXML.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/depcomp (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/dict.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/elfgcchack.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/encoding.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/entities.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/error.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/example/
trunk/pyobjc/pyobjc-core/libxml2-src/example/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/example/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/example/gjobread.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/example/gjobs.xml
trunk/pyobjc/pyobjc-core/libxml2-src/genUnicode.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/gentest.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/globals.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/hash.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/
trunk/pyobjc/pyobjc-core/libxml2-src/include/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/include/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/DOCBparser.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/HTMLparser.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/HTMLtree.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/SAX.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/SAX2.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/c14n.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/catalog.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/chvalid.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/debugXML.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/dict.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/encoding.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/entities.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/globals.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/hash.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/list.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/nanoftp.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/nanohttp.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/parser.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/parserInternals.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/pattern.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/relaxng.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/schemasInternals.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/schematron.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/threads.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/tree.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/uri.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/valid.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xinclude.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xlink.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlIO.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlautomata.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlerror.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlexports.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlmemory.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlmodule.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlreader.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlregexp.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlsave.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlschemas.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlschemastypes.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlstring.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlunicode.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlversion.h.in
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xmlwriter.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xpath.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xpathInternals.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/libxml/xpointer.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/win32config.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/include/wsockcompat.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/install-sh (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/legacy.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/libxml-2.0-uninstalled.pc.in
trunk/pyobjc/pyobjc-core/libxml2-src/libxml-2.0.pc.in
trunk/pyobjc/pyobjc-core/libxml2-src/libxml.3
trunk/pyobjc/pyobjc-core/libxml2-src/libxml.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/libxml.m4
trunk/pyobjc/pyobjc-core/libxml2-src/libxml.spec.in
trunk/pyobjc/pyobjc-core/libxml2-src/libxml2.syms
trunk/pyobjc/pyobjc-core/libxml2-src/list.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/ltmain.sh (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/m4/
trunk/pyobjc/pyobjc-core/libxml2-src/m4/libtool.m4
trunk/pyobjc/pyobjc-core/libxml2-src/m4/ltoptions.m4
trunk/pyobjc/pyobjc-core/libxml2-src/m4/ltsugar.m4
trunk/pyobjc/pyobjc-core/libxml2-src/m4/ltversion.m4
trunk/pyobjc/pyobjc-core/libxml2-src/m4/lt~obsolete.m4
trunk/pyobjc/pyobjc-core/libxml2-src/macos/
trunk/pyobjc/pyobjc-core/libxml2-src/macos/README
trunk/pyobjc/pyobjc-core/libxml2-src/macos/libxml2.mcp.xml.sit.hqx
trunk/pyobjc/pyobjc-core/libxml2-src/macos/src/
trunk/pyobjc/pyobjc-core/libxml2-src/macos/src/XMLTestPrefix.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/macos/src/XMLTestPrefix2.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/macos/src/config-mac.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/macos/src/libxml2_GUSIConfig.cp
trunk/pyobjc/pyobjc-core/libxml2-src/macos/src/macos_main.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/missing (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/mkinstalldirs (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/nanoftp.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/nanohttp.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/parser.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/parserInternals.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/pattern.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/
trunk/pyobjc/pyobjc-core/libxml2-src/python/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/python/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/python/README
trunk/pyobjc/pyobjc-core/libxml2-src/python/TODO
trunk/pyobjc/pyobjc-core/libxml2-src/python/drv_libxml2.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/generator.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/libxml.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/libxml.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/libxml2-python-api.xml
trunk/pyobjc/pyobjc-core/libxml2-src/python/libxml_wrap.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/setup.py.in (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/attribs.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/build.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/compareNodes.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/ctxterror.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/cutnpaste.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/dtdvalid.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/error.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/inbuf.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/indexes.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/invalid.xml
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/nsdel.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/outbuf.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/push.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/pushSAX.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/pushSAXhtml.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader2.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader3.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader4.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader5.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader6.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader7.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/reader8.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/readererr.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/readernext.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/regexp.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/relaxng.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/resolver.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/schema.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/serialize.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/sync.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/test.dtd
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/thread2.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/tst.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/tst.xml
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/tstLastError.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/tstURI.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/tstmem.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/tstxpath.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/valid.xml
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/validDTD.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/validRNG.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/validSchemas.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/validate.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/walker.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/xpath.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/xpathext.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/xpathleak.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/xpathns.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/tests/xpathret.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/python/types.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/regressions.py (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/regressions.xml
trunk/pyobjc/pyobjc-core/libxml2-src/relaxng.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/runsuite.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/runtest.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/runxmlconf.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/schematron.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testAutomata.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testC14N.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testHTML.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testModule.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testReader.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testRegexp.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testRelax.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testSAX.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testSchemas.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testThreads.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testThreadsWin32.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testURI.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testXPath.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testapi.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testchar.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testdict.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testdso.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/testrecurse.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/threads.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/tree.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/trio.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/trio.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/triodef.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/trionan.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/trionan.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/triop.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/triostr.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/triostr.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/uri.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/valid.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/vms/
trunk/pyobjc/pyobjc-core/libxml2-src/vms/build_libxml.com (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/vms/config.vms (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/vms/diffs.vms
trunk/pyobjc/pyobjc-core/libxml2-src/vms/readme.vms
trunk/pyobjc/pyobjc-core/libxml2-src/win32/
trunk/pyobjc/pyobjc-core/libxml2-src/win32/.cvsignore
trunk/pyobjc/pyobjc-core/libxml2-src/win32/Makefile.bcb
trunk/pyobjc/pyobjc-core/libxml2-src/win32/Makefile.mingw
trunk/pyobjc/pyobjc-core/libxml2-src/win32/Makefile.msvc
trunk/pyobjc/pyobjc-core/libxml2-src/win32/Readme.txt
trunk/pyobjc/pyobjc-core/libxml2-src/win32/configure.js
trunk/pyobjc/pyobjc-core/libxml2-src/win32/defgen.xsl
trunk/pyobjc/pyobjc-core/libxml2-src/win32/libxml2.def.src
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/libxml2.vcb
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/libxml2.vcl
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/libxml2.vco (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/libxml2.vcp
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/libxml2.vcw
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/wincecompat.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/win32/wince/wincecompat.h (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xinclude.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xlink.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xml2-config.1
trunk/pyobjc/pyobjc-core/libxml2-src/xml2-config.in
trunk/pyobjc/pyobjc-core/libxml2-src/xml2Conf.sh.in
trunk/pyobjc/pyobjc-core/libxml2-src/xmlIO.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlcatalog.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmllint.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlmemory.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlmodule.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlreader.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlregexp.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlsave.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlschemas.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlschemastypes.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlstring.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlunicode.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xmlwriter.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xpath.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xpointer.c (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xstc/
trunk/pyobjc/pyobjc-core/libxml2-src/xstc/Makefile.am
trunk/pyobjc/pyobjc-core/libxml2-src/xstc/Makefile.in
trunk/pyobjc/pyobjc-core/libxml2-src/xstc/xstc-to-python.xsl (contents, props changed)
trunk/pyobjc/pyobjc-core/libxml2-src/xstc/xstc.py (contents, props changed)
Modified:
trunk/pyobjc/pyobjc-core/PyObjCTest/dejagnu.py
trunk/pyobjc/pyobjc-core/setup.py
Modified: trunk/pyobjc/pyobjc-core/PyObjCTest/dejagnu.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/PyObjCTest/dejagnu.py (original)
+++ trunk/pyobjc/pyobjc-core/PyObjCTest/dejagnu.py Tue May 4 15:09:40 2010
@@ -116,8 +116,9 @@
else:
extra_link = ''
- commandline='MACOSX_DEPLPOYMENT_TARGET=%s cc %s -g -DMACOSX -Ilibffi-src/include -Ilibffi-src/powerpc -o /tmp/test.bin %s %s %s 2>&1'%(
+ commandline='MACOSX_DEPLPOYMENT_TARGET=%s %s %s -g -DMACOSX -Ilibffi-src/include -Ilibffi-src/powerpc -o /tmp/test.bin %s %s %s 2>&1'%(
get_config_var('MACOSX_DEPLOYMENT_TARGET'),
+ get_config_var('CC'),
get_config_var('CFLAGS'), self.filename, ' '.join(libffiobjects),
extra_link)
Modified: trunk/pyobjc/pyobjc-core/setup.py
==============================================================================
--- trunk/pyobjc/pyobjc-core/setup.py (original)
+++ trunk/pyobjc/pyobjc-core/setup.py Tue May 4 15:09:40 2010
@@ -1,9 +1,21 @@
#!/usr/bin/env python
import sys
+import subprocess
+import shutil
+import re
# We need at least Python 2.5
MIN_PYTHON = (2, 5)
+# Set USE_SYSTEM_FFI to True to link to the system version
+# of libffi
+USE_SYSTEM_FFI = False
+
+# Set USE_SYSTEM_LIBXML to True to link to the system version
+# of libxml2 (defaults to False to avoid problems when building
+# on 10.6 and running on an earlier release)
+USE_SYSTEM_LIBXML = False
+
if sys.version_info < MIN_PYTHON:
vstr = '.'.join(map(str, MIN_PYTHON))
raise SystemExit('PyObjC: Need at least Python ' + vstr)
@@ -103,9 +115,6 @@
#os.environ['MACOSX_DEPLOYMENT_TARGET']='10.5'
-# Set USE_SYSTEM_FFI to True to link to the system version
-# of libffi
-USE_SYSTEM_FFI = True
#if int(os.uname()[2].split('.')[0]) >= 10:
# USE_SYSTEM_FFI = True
@@ -146,6 +155,50 @@
class pyobjc_build_ext (build_ext.build_ext):
def run(self):
+ if not USE_SYSTEM_LIBXML:
+ build = self.get_finalized_command('build')
+ xmldir=os.path.join(build.build_base, 'libxml')
+ if not os.path.exists(xmldir):
+ builddir=os.path.join(build.build_base, 'libxml-build')
+ if os.path.exists(builddir):
+ shutil.rmtree(builddir)
+ os.makedirs(builddir)
+
+ cflags = get_config_var('CFLAGS')
+ if '-isysroot' in cflags:
+ cflags = re.sub(r'-isysroot\s*\S*', '-isysroot /', cflags)
+
+ p = subprocess.Popen(
+ ['../../libxml2-src/configure',
+ '--disable-dependency-tracking',
+ '--enable-static',
+ '--disable-shared',
+ '--prefix=%s'%(os.path.abspath(xmldir),),
+ '--with-minimum',
+ 'CFLAGS=%s'%(cflags,),
+ 'CC=%s'%(get_config_var('CC')),
+ ],
+ cwd=builddir)
+ xit=p.wait()
+ if xit != 0:
+ shutil.rmtree(builddir)
+ raise RuntimeError("libxml configure failed")
+ p = subprocess.Popen(
+ ['make', 'install'],
+ cwd=builddir)
+ xit=p.wait()
+ if xit != 0:
+ raise RuntimeError("libxml install failed")
+
+ os.environ['PATH'] = xmldir + "/bin:" + os.environ['PATH']
+
+ for ext in self.extensions:
+ if ext.name == "objc._objc":
+ if not USE_SYSTEM_LIBXML:
+ ext.extra_link_args.append('-Wl,-search_paths_first')
+ ext.extra_compile_args.extend(xml2config('--cflags'))
+ ext.extra_link_args.extend(xml2config('--libs'))
+
build_ext.build_ext.run(self)
extensions = self.extensions
self.extensions = [
@@ -181,47 +234,9 @@
raise SystemExit("ObjC runtime not found")
from distutils.sysconfig import get_config_var
-cc = get_config_var('CC')
CFLAGS=[ ]
-if cc == 'XXXgcc':
- # This is experimental code that tries to avoid refering to files in
- # /Library/Frameworks or /usr/local.
- #
- # NOTE: This is not enabled by default because the linker will still look
- # in /usr/local/lib and /Library/Frameworks...
-
- fp = os.popen('cpp -v </dev/null 2>&1', 'r')
- dirs = []
- started = False
- for ln in fp:
- if not started:
- if ln.startswith('#include <...> search starts here:'):
- started=True
- continue
-
- else:
- ln = ln.strip()
- if not ln.startswith('/'):
- break
-
- if ln == '/usr/local/include':
- continue
-
- elif ln == '/Library/Frameworks':
- continue
-
- if ln.endswith('(framework directory)'):
- dirs.append(('framework', ln.split()[0]))
- else:
- dirs.append(('system', ln))
-
- if dirs:
- CFLAGS.append('-nostdinc')
- for k, d in dirs:
- CFLAGS.append('-i%s%s'%(k,d))
-
# Enable 'PyObjC_STRICT_DEBUGGING' to enable some costly internal
# assertions.
CFLAGS.extend([
@@ -302,8 +317,8 @@
return shlex.split(ln)
-CFLAGS.extend(xml2config('--cflags'))
-OBJC_LDFLAGS.extend(xml2config('--libs'))
+#CFLAGS.extend(xml2config('--cflags'))
+#OBJC_LDFLAGS.extend(xml2config('--libs'))
------------------------------------------------------------------------------