Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Side by Side Diff: third_party/libxml/libxml.gyp

Issue 10251004: Move libxml_utils from chrome/common to third_party/libxml/chromium. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Nit and fix use_system_libxml condition. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/libxml/chromium/libxml_utils.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'variables': { 6 'variables': {
7 'conditions': [ 7 'conditions': [
8 # Define an "os_include" variable that points at the OS-specific generated 8 # Define an "os_include" variable that points at the OS-specific generated
9 # headers. These were generated by running the configure script offline. 9 # headers. These were generated by running the configure script offline.
10 ['os_posix == 1 and OS != "mac"', { 10 ['os_posix == 1 and OS != "mac"', {
11 'os_include': 'linux' 11 'os_include': 'linux'
12 }], 12 }],
13 ['OS=="mac"', {'os_include': 'mac'}], 13 ['OS=="mac"', {'os_include': 'mac'}],
14 ['OS=="win"', {'os_include': 'win32'}], 14 ['OS=="win"', {'os_include': 'win32'}],
15 ], 15 ],
16 'use_system_libxml%': 0, 16 'use_system_libxml%': 0,
17 }, 17 },
18 'targets': [ 18 'targets': [
19 { 19 {
20 'target_name': 'libxml', 20 'target_name': 'libxml',
21 'conditions': [ 21 'conditions': [
22 ['os_posix == 1 and OS != "mac" and use_system_libxml', { 22 ['os_posix == 1 and OS != "mac" and use_system_libxml', {
23 'type': 'none', 23 'type': 'static_library',
24 'sources': [
25 'chromium/include/libxml/libxml_utils.h',
26 'chromium/libxml_utils.cc',
27 ],
28 'cflags': [
29 '<!@(pkg-config --cflags libxml-2.0)',
30 ],
31 'include_dirs': [
32 'chromium/include',
33 ],
24 'direct_dependent_settings': { 34 'direct_dependent_settings': {
25 'cflags': [ 35 'cflags': [
26 '<!@(pkg-config --cflags libxml-2.0)', 36 '<!@(pkg-config --cflags libxml-2.0)',
27 ], 37 ],
28 'defines': [ 38 'defines': [
Paweł Hajdan Jr. 2012/05/08 06:41:42 I think you should also have USE_SYSTEM_LIBXML def
dtu 2012/05/10 00:06:03 Done.
29 'USE_SYSTEM_LIBXML', 39 'USE_SYSTEM_LIBXML',
30 ], 40 ],
41 'include_dirs': [
42 'chromium/include',
43 ],
31 }, 44 },
32 'link_settings': { 45 'link_settings': {
33 'ldflags': [ 46 'ldflags': [
34 '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)', 47 '<!@(pkg-config --libs-only-L --libs-only-other libxml-2.0)',
35 ], 48 ],
36 'libraries': [ 49 'libraries': [
37 '<!@(pkg-config --libs-only-l libxml-2.0)', 50 '<!@(pkg-config --libs-only-l libxml-2.0)',
38 ], 51 ],
39 }, 52 },
40 }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml 53 }, { # else: os_posix != 1 or OS == "mac" or ! use_system_libxml
41 'type': 'static_library', 54 'type': 'static_library',
42 'sources': [ 55 'sources': [
56 'chromium/include/libxml/libxml_utils.h',
57 'chromium/libxml_utils.cc',
43 'linux/config.h', 58 'linux/config.h',
44 'linux/include/libxml/xmlversion.h', 59 'linux/include/libxml/xmlversion.h',
45 'mac/config.h', 60 'mac/config.h',
46 'mac/include/libxml/xmlversion.h', 61 'mac/include/libxml/xmlversion.h',
47 'src/include/libxml/c14n.h', 62 'src/include/libxml/c14n.h',
48 'src/include/libxml/catalog.h', 63 'src/include/libxml/catalog.h',
49 'src/include/libxml/chvalid.h', 64 'src/include/libxml/chvalid.h',
50 'src/include/libxml/debugXML.h', 65 'src/include/libxml/debugXML.h',
51 'src/include/libxml/dict.h', 66 'src/include/libxml/dict.h',
52 'src/include/libxml/DOCBparser.h', 67 'src/include/libxml/DOCBparser.h',
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 'defines': [ 167 'defines': [
153 # Define LIBXML_STATIC as nothing to match how libxml.h 168 # Define LIBXML_STATIC as nothing to match how libxml.h
154 # (an internal header) defines LIBXML_STATIC, otherwise 169 # (an internal header) defines LIBXML_STATIC, otherwise
155 # we get the macro redefined warning from GCC. (-DFOO 170 # we get the macro redefined warning from GCC. (-DFOO
156 # defines the macro FOO as 1.) 171 # defines the macro FOO as 1.)
157 'LIBXML_STATIC=', 172 'LIBXML_STATIC=',
158 ], 173 ],
159 'include_dirs': [ 174 'include_dirs': [
160 '<(os_include)', 175 '<(os_include)',
161 '<(os_include)/include', 176 '<(os_include)/include',
177 'chromium/include',
162 'src/include', 178 'src/include',
163 ], 179 ],
164 'dependencies': [ 180 'dependencies': [
165 '../icu/icu.gyp:icuuc', 181 '../icu/icu.gyp:icuuc',
166 '../zlib/zlib.gyp:zlib', 182 '../zlib/zlib.gyp:zlib',
167 ], 183 ],
168 'export_dependent_settings': [ 184 'export_dependent_settings': [
169 '../icu/icu.gyp:icuuc', 185 '../icu/icu.gyp:icuuc',
170 ], 186 ],
171 'direct_dependent_settings': { 187 'direct_dependent_settings': {
172 'defines': [ 188 'defines': [
173 'LIBXML_STATIC', 189 'LIBXML_STATIC',
174 ], 190 ],
175 'include_dirs': [ 191 'include_dirs': [
176 '<(os_include)/include', 192 '<(os_include)/include',
193 'chromium/include',
177 'src/include', 194 'src/include',
178 ], 195 ],
179 }, 196 },
180 'conditions': [ 197 'conditions': [
181 ['OS=="linux"', { 198 ['OS=="linux"', {
182 'link_settings': { 199 'link_settings': {
183 'libraries': [ 200 'libraries': [
184 # We need dl for dlopen() and friends. 201 # We need dl for dlopen() and friends.
185 '-ldl', 202 '-ldl',
186 ], 203 ],
(...skipping 21 matching lines...) Expand all
208 '-Wno-pointer-sign', 225 '-Wno-pointer-sign',
209 '-Wno-empty-body', 226 '-Wno-empty-body',
210 ], 227 ],
211 }], 228 }],
212 ], 229 ],
213 }], 230 }],
214 ], 231 ],
215 }, 232 },
216 ], 233 ],
217 } 234 }
OLDNEW
« no previous file with comments | « third_party/libxml/chromium/libxml_utils.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698