From e8da8f73464def0ebf6114da197639479535a5ad Mon Sep 17 00:00:00 2001 From: "tc@google.com" Date: Fri, 10 Oct 2008 07:25:28 +0000 Subject: libxml DerivedSources put libxml's config.h and xmlversion.h in Hammer/third_party/libxml/DerivedSources instead of scons. Review URL: http://codereview.chromium.org/7040 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3204 0039d316-1c4b-4281-b951-d872f2087c98 --- third_party/libxml/SConscript | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'third_party') diff --git a/third_party/libxml/SConscript b/third_party/libxml/SConscript index 6533abd..f952a96 100644 --- a/third_party/libxml/SConscript +++ b/third_party/libxml/SConscript @@ -36,8 +36,8 @@ env.Prepend( '$ICU38_DIR/public/common', '$ICU38_DIR/public/18n', '$ZLIB_DIR', - 'scons', - 'scons/include', + 'DerivedSources', + 'DerivedSources/include', 'include', ], ) @@ -138,10 +138,11 @@ if env['PLATFORM'] == 'win32': copied_files = [] for cf in config_files: - result = env.Command('scons/' + cf, cf, Copy('$TARGET', '$SOURCE')) + result = env.Command('DerivedSources/' + cf, cf, Copy('$TARGET', '$SOURCE')) copied_files.extend(result) - env.Command(['scons/config.h', 'scons/include/libxml/xmlversion.h'], + env.Command(['DerivedSources/config.h', + 'DerivedSources/include/libxml/xmlversion.h'], copied_files, 'cd ${SOURCE.dir} && $CSCRIPT ${SOURCE.file} $CONFIG_OPTIONS', CONFIG_OPTIONS='compiler=msvc iconv=no icu=yes') @@ -152,5 +153,5 @@ elif env['PLATFORM'] == 'posix': 'xml2-config', ] for cf in config_files: - result = env.Command('scons/' + cf, 'linux/' + cf, + result = env.Command('DerivedSources/' + cf, 'linux/' + cf, Copy('$TARGET', '$SOURCE')) -- cgit v1.1