libxml: move all upstream code into a src/ subdirectory.

This helps keep our patches, build files, and metadata separate.
(Note that src/ is not purely what upstream has, since it has our
patches applied.)

Review URL: http://codereview.chromium.org/3160012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56107 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 108 insertions, 106 deletions

diff --git a/third_party/libxml/libxml.gyp b/third_party/libxml/libxml.gyp
index 63304de..8d205f1 100644
--- a/third_party/libxml/libxml.gyp
+++ b/third_party/libxml/libxml.gyp
@@ -5,6 +5,8 @@
 {
   'variables': {
     'conditions': [
+      # Define an "os_include" variable that points at the OS-specific generated
+      # headers.  These were generated by running the configure script offline.
       ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
         'os_include': 'linux'
       }],
@@ -39,114 +41,114 @@
           'type': '<(library)',
           'msvs_guid': 'F9810DE8-CBC3-4605-A7B1-ECA2D5292FD7',
           'sources': [
-            'include/libxml/c14n.h',
-            'include/libxml/catalog.h',
-            'include/libxml/chvalid.h',
-            'include/libxml/debugXML.h',
-            'include/libxml/dict.h',
-            'include/libxml/DOCBparser.h',
-            'include/libxml/encoding.h',
-            'include/libxml/entities.h',
-            'include/libxml/globals.h',
-            'include/libxml/hash.h',
-            'include/libxml/HTMLparser.h',
-            'include/libxml/HTMLtree.h',
-            'include/libxml/list.h',
-            'include/libxml/nanoftp.h',
-            'include/libxml/nanohttp.h',
-            'include/libxml/parser.h',
-            'include/libxml/parserInternals.h',
-            'include/libxml/pattern.h',
-            'include/libxml/relaxng.h',
-            'include/libxml/SAX.h',
-            'include/libxml/SAX2.h',
-            'include/libxml/schemasInternals.h',
-            'include/libxml/schematron.h',
-            'include/libxml/threads.h',
-            'include/libxml/tree.h',
-            'include/libxml/uri.h',
-            'include/libxml/valid.h',
-            'include/libxml/xinclude.h',
-            'include/libxml/xlink.h',
-            'include/libxml/xmlautomata.h',
-            'include/libxml/xmlerror.h',
-            'include/libxml/xmlexports.h',
-            'include/libxml/xmlIO.h',
-            'include/libxml/xmlmemory.h',
-            'include/libxml/xmlmodule.h',
-            'include/libxml/xmlreader.h',
-            'include/libxml/xmlregexp.h',
-            'include/libxml/xmlsave.h',
-            'include/libxml/xmlschemas.h',
-            'include/libxml/xmlschemastypes.h',
-            'include/libxml/xmlstring.h',
-            'include/libxml/xmlunicode.h',
-            'include/libxml/xmlwriter.h',
-            'include/libxml/xpath.h',
-            'include/libxml/xpathInternals.h',
-            'include/libxml/xpointer.h',
-            'include/win32config.h',
-            'include/wsockcompat.h',
             'linux/config.h',
             'linux/include/libxml/xmlversion.h',
             'mac/config.h',
             'mac/include/libxml/xmlversion.h',
-            'win32/config.h',
-            'win32/include/libxml/xmlversion.h',
-            'acconfig.h',
-            'c14n.c',
-            'catalog.c',
-            'chvalid.c',
-            'debugXML.c',
-            'dict.c',
-            'DOCBparser.c',
-            'elfgcchack.h',
-            'encoding.c',
-            'entities.c',
-            'error.c',
-            'globals.c',
-            'hash.c',
-            'HTMLparser.c',
-            'HTMLtree.c',
-            'legacy.c',
-            'libxml.h',
-            'list.c',
-            'nanoftp.c',
-            'nanohttp.c',
-            'parser.c',
-            'parserInternals.c',
-            'pattern.c',
-            'relaxng.c',
-            'SAX.c',
-            'SAX2.c',
-            'schematron.c',
-            'threads.c',
-            'tree.c',
-            #'trio.c',
-            #'trio.h',
-            #'triodef.h',
-            #'trionan.c',
-            #'trionan.h',
-            #'triop.h',
-            #'triostr.c',
-            #'triostr.h',
-            'uri.c',
-            'valid.c',
-            'xinclude.c',
-            'xlink.c',
-            'xmlIO.c',
-            'xmlmemory.c',
-            'xmlmodule.c',
-            'xmlreader.c',
-            'xmlregexp.c',
-            'xmlsave.c',
-            'xmlschemas.c',
-            'xmlschemastypes.c',
-            'xmlstring.c',
-            'xmlunicode.c',
-            'xmlwriter.c',
-            'xpath.c',
-            'xpointer.c',
+            'src/include/libxml/c14n.h',
+            'src/include/libxml/catalog.h',
+            'src/include/libxml/chvalid.h',
+            'src/include/libxml/debugXML.h',
+            'src/include/libxml/dict.h',
+            'src/include/libxml/DOCBparser.h',
+            'src/include/libxml/encoding.h',
+            'src/include/libxml/entities.h',
+            'src/include/libxml/globals.h',
+            'src/include/libxml/hash.h',
+            'src/include/libxml/HTMLparser.h',
+            'src/include/libxml/HTMLtree.h',
+            'src/include/libxml/list.h',
+            'src/include/libxml/nanoftp.h',
+            'src/include/libxml/nanohttp.h',
+            'src/include/libxml/parser.h',
+            'src/include/libxml/parserInternals.h',
+            'src/include/libxml/pattern.h',
+            'src/include/libxml/relaxng.h',
+            'src/include/libxml/SAX.h',
+            'src/include/libxml/SAX2.h',
+            'src/include/libxml/schemasInternals.h',
+            'src/include/libxml/schematron.h',
+            'src/include/libxml/threads.h',
+            'src/include/libxml/tree.h',
+            'src/include/libxml/uri.h',
+            'src/include/libxml/valid.h',
+            'src/include/libxml/xinclude.h',
+            'src/include/libxml/xlink.h',
+            'src/include/libxml/xmlautomata.h',
+            'src/include/libxml/xmlerror.h',
+            'src/include/libxml/xmlexports.h',
+            'src/include/libxml/xmlIO.h',
+            'src/include/libxml/xmlmemory.h',
+            'src/include/libxml/xmlmodule.h',
+            'src/include/libxml/xmlreader.h',
+            'src/include/libxml/xmlregexp.h',
+            'src/include/libxml/xmlsave.h',
+            'src/include/libxml/xmlschemas.h',
+            'src/include/libxml/xmlschemastypes.h',
+            'src/include/libxml/xmlstring.h',
+            'src/include/libxml/xmlunicode.h',
+            'src/include/libxml/xmlwriter.h',
+            'src/include/libxml/xpath.h',
+            'src/include/libxml/xpathInternals.h',
+            'src/include/libxml/xpointer.h',
+            'src/include/win32config.h',
+            'src/include/wsockcompat.h',
+            'src/win32/config.h',
+            'src/win32/include/libxml/xmlversion.h',
+            'src/acconfig.h',
+            'src/c14n.c',
+            'src/catalog.c',
+            'src/chvalid.c',
+            'src/debugXML.c',
+            'src/dict.c',
+            'src/DOCBparser.c',
+            'src/elfgcchack.h',
+            'src/encoding.c',
+            'src/entities.c',
+            'src/error.c',
+            'src/globals.c',
+            'src/hash.c',
+            'src/HTMLparser.c',
+            'src/HTMLtree.c',
+            'src/legacy.c',
+            'src/libxml.h',
+            'src/list.c',
+            'src/nanoftp.c',
+            'src/nanohttp.c',
+            'src/parser.c',
+            'src/parserInternals.c',
+            'src/pattern.c',
+            'src/relaxng.c',
+            'src/SAX.c',
+            'src/SAX2.c',
+            'src/schematron.c',
+            'src/threads.c',
+            'src/tree.c',
+            #'src/trio.c',
+            #'src/trio.h',
+            #'src/triodef.h',
+            #'src/trionan.c',
+            #'src/trionan.h',
+            #'src/triop.h',
+            #'src/triostr.c',
+            #'src/triostr.h',
+            'src/uri.c',
+            'src/valid.c',
+            'src/xinclude.c',
+            'src/xlink.c',
+            'src/xmlIO.c',
+            'src/xmlmemory.c',
+            'src/xmlmodule.c',
+            'src/xmlreader.c',
+            'src/xmlregexp.c',
+            'src/xmlsave.c',
+            'src/xmlschemas.c',
+            'src/xmlschemastypes.c',
+            'src/xmlstring.c',
+            'src/xmlunicode.c',
+            'src/xmlwriter.c',
+            'src/xpath.c',
+            'src/xpointer.c',
           ],
           'defines': [
             # Define LIBXML_STATIC as nothing to match how libxml.h
@@ -158,7 +160,7 @@
           'include_dirs': [
             '<(os_include)',
             '<(os_include)/include',
-            'include',
+            'src/include',
           ],
           'dependencies': [
             '../icu/icu.gyp:icuuc',
@@ -173,7 +175,7 @@
             ],
             'include_dirs': [
               '<(os_include)/include',
-              'include',
+              'src/include',
             ],
           },
           'conditions': [