diff options
author | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 00:35:08 +0000 |
---|---|---|
committer | sgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-27 00:35:08 +0000 |
commit | a08682513accd76f09e46283ca9850e47eb04516 (patch) | |
tree | f66c620a986bc88c96b8ce1098bb3763ac4fe5de /third_party/libxslt | |
parent | a2eb164258e813b983663b21167d4a57b8b54da0 (diff) | |
download | chromium_src-a08682513accd76f09e46283ca9850e47eb04516.zip chromium_src-a08682513accd76f09e46283ca9850e47eb04516.tar.gz chromium_src-a08682513accd76f09e46283ca9850e47eb04516.tar.bz2 |
Generation of .vcproj files for remaining third_party components.
Updates the .vcproj files themselves for stylistic consistency
with the rest. Affected .vcproj files:
* No change (byte-for-byte identical):
third_party\libxml\build\libxml.vcproj
third_party\bsdiff\bsdiff.vcproj
third_party\sqlite\sqlite.vcproj
* Add empty <ToolFiles>, <References> and <Globals> sections:
third_party\libxslt\build\libxslt.vcproj
third_party\bspatch\bspatch.vcproj
third_party\bzip2\bzip2.vcproj
third_party\lzma\7z_C.vcproj
third_party\modp_b64\modp_b64.vcproj
third_party\libjpeg\libjpeg.vcproj
* Add explicit RootNamspace attribute:
third_party\bzip2\bzip2.vcproj
* Reorder DisableSpecificWarnings and PreprocessorDefinitions attributes
in VCCLCompilerTool:
third_party\bzip2\bzip2.vcproj
Review URL: http://codereview.chromium.org/18785
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxslt')
-rw-r--r-- | third_party/libxslt/build/libxslt.vcproj | 6 | ||||
-rw-r--r-- | third_party/libxslt/libxslt.scons | 71 |
2 files changed, 64 insertions, 13 deletions
diff --git a/third_party/libxslt/build/libxslt.vcproj b/third_party/libxslt/build/libxslt.vcproj index f9fbee4..3180b18 100644 --- a/third_party/libxslt/build/libxslt.vcproj +++ b/third_party/libxslt/build/libxslt.vcproj @@ -12,6 +12,8 @@ Name="Win32" /> </Platforms> + <ToolFiles> + </ToolFiles> <Configurations> <Configuration Name="Debug|Win32" @@ -38,6 +40,8 @@ /> </Configuration> </Configurations> + <References> + </References> <Files> <Filter Name="libxslt" @@ -216,4 +220,6 @@ </File> </Filter> </Files> + <Globals> + </Globals> </VisualStudioProject> diff --git a/third_party/libxslt/libxslt.scons b/third_party/libxslt/libxslt.scons index 6e95764..0a9337b 100644 --- a/third_party/libxslt/libxslt.scons +++ b/third_party/libxslt/libxslt.scons @@ -64,39 +64,85 @@ if env.Bit('windows'): ) -input_files = [ +input_files = ChromeFileList([ + MSVSFilter('libxslt', [ 'libxslt/attributes.c', + 'libxslt/attributes.h', 'libxslt/attrvt.c', 'libxslt/documents.c', + 'libxslt/documents.h', 'libxslt/extensions.c', + 'libxslt/extensions.h', 'libxslt/extra.c', + 'libxslt/extra.h', 'libxslt/functions.c', + 'libxslt/functions.h', 'libxslt/imports.c', + 'libxslt/imports.h', 'libxslt/keys.c', + 'libxslt/keys.h', + 'libxslt/libxslt.h', 'libxslt/namespaces.c', + 'libxslt/namespaces.h', 'libxslt/numbers.c', + 'libxslt/numbersInternals.h', 'libxslt/pattern.c', + 'libxslt/pattern.h', 'libxslt/preproc.c', + 'libxslt/preproc.h', 'libxslt/security.c', + 'libxslt/security.h', 'libxslt/templates.c', + 'libxslt/templates.h', 'libxslt/transform.c', + 'libxslt/transform.h', + 'libxslt/trio.h', + 'libxslt/triodef.h', 'libxslt/variables.c', + 'libxslt/variables.h', + 'libxslt/win32config.h', 'libxslt/xslt.c', + 'libxslt/xslt.h', + 'libxslt/xsltconfig.h', + 'libxslt/xsltexports.h', + 'libxslt/xsltInternals.h', 'libxslt/xsltutils.c', -] + 'libxslt/xsltutils.h', + 'libxslt/xsltwin32config.h', + ]), +]) env.ChromeLibrary('libxslt', input_files) -env.ChromeMSVSProject('$LIBXSLT_DIR/build/libxslt.vcproj', - dependencies = [ - '$LIBXSLT_DIR/build/libxslt_config.vcproj', - '$LIBXML_DIR/build/libxml.vcproj', - ], - guid='{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}') - -env.ChromeMSVSProject('$LIBXSLT_DIR/build/libxslt_config.vcproj', - guid='{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}') - +p = env.ChromeMSVSProject('build/libxslt.vcproj', + dest=('$CHROME_SRC_DIR/third_party/libxslt' + + '/build/libxslt.vcproj'), + guid='{FC0E1FD0-5DD7-4041-A1C9-CD3C376E4EED}', + dependencies = [ + '$LIBXML_DIR/build/libxml.vcproj', + ], + keyword='Win32Proj', + # TODO(sgk): when we can intuit the hierarchy + # from the built targets. + #buildtargets=TODO, + files=input_files, + tools=[ + 'VCLibrarianTool', + 'VCCLCompilerTool', + ], + ConfigurationType='4') + +p.AddConfig('Debug|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/debug.vsprops', + './libxslt.vsprops', + ]) + +p.AddConfig('Release|Win32', + InheritedPropertySheets=[ + '$(SolutionDir)../build/release.vsprops', + './libxslt.vsprops', + ]) if env.Bit('windows'): config_files = [ @@ -141,4 +187,3 @@ elif env.Bit('linux'): for cf in config_files: result = env.Command('scons/' + cf, 'linux/' + cf, Copy('$TARGET', '$SOURCE')) - |