diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 19:24:39 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-15 19:24:39 +0000 |
| commit | 8f12b5681c0dbb4945e9d0d9ee3e0b4bf0d58124 (patch) | |
| tree | 62be7a1b1304b8d2617441abb30013257272ca6c /third_party/libxml/build | |
| parent | b33b54ed935286912384afdce6838cdfe7343874 (diff) | |
| download | chromium_src-8f12b5681c0dbb4945e9d0d9ee3e0b4bf0d58124.zip chromium_src-8f12b5681c0dbb4945e9d0d9ee3e0b4bf0d58124.tar.gz chromium_src-8f12b5681c0dbb4945e9d0d9ee3e0b4bf0d58124.tar.bz2 | |
Remove the build time generation of config.h and xmlversion.h.
This adds a bat file which will generate config.h and xmlversion.h
into the win32 directory. I updated include paths and everything
seems to build.
Review URL: http://codereview.chromium.org/18243
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8105 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libxml/build')
| -rwxr-xr-x | third_party/libxml/build/generate-win32-headers.bat | 9 | ||||
| -rw-r--r-- | third_party/libxml/build/libxml.vsprops | 1 | ||||
| -rw-r--r-- | third_party/libxml/build/libxml_config.bat | 13 | ||||
| -rw-r--r-- | third_party/libxml/build/libxml_config.rules | 17 | ||||
| -rw-r--r-- | third_party/libxml/build/libxml_config.vcproj | 74 | ||||
| -rw-r--r-- | third_party/libxml/build/using_libxml.vsprops | 2 |
6 files changed, 11 insertions, 105 deletions
diff --git a/third_party/libxml/build/generate-win32-headers.bat b/third_party/libxml/build/generate-win32-headers.bat new file mode 100755 index 0000000..1d0f85d --- /dev/null +++ b/third_party/libxml/build/generate-win32-headers.bat @@ -0,0 +1,9 @@ +REM Generate config.h and xmlversion.h. We put the generated files in +REM win32 so they don't get included on other platforms. + +cd %~dp0\..\win32 +cscript //E:jscript configure.js compiler=msvc iconv=no icu=yes +move ..\config.h . + +md include\libxml +move ..\include\libxml\xmlversion.h include\libxml\ diff --git a/third_party/libxml/build/libxml.vsprops b/third_party/libxml/build/libxml.vsprops index 9f01fdf..a8392e2c 100644 --- a/third_party/libxml/build/libxml.vsprops +++ b/third_party/libxml/build/libxml.vsprops @@ -8,5 +8,6 @@ <Tool Name="VCCLCompilerTool" DisableSpecificWarnings="4101;4133" + AdditionalIncludeDirectories=""$(SolutionDir)..\third_party\libxml\win32";"$(SolutionDir)..\third_party\libxml\win32\include"" /> </VisualStudioPropertySheet> diff --git a/third_party/libxml/build/libxml_config.bat b/third_party/libxml/build/libxml_config.bat deleted file mode 100644 index b0ec1e2..0000000 --- a/third_party/libxml/build/libxml_config.bat +++ /dev/null @@ -1,13 +0,0 @@ -:: %1 is the input file js file -:: %2 is the solution directory - -:: Change to the directory of the input file -cd %~p1 - -:: Make config.h -cscript //E:jscript %1 compiler=msvc iconv=no icu=yes -if errorlevel 1 echo %1: error: The javascript file failed to run. - -:: Make sure the timestamp on config.h is current. -%2..\third_party\cygwin\bin\touch.exe ..\config.h - diff --git a/third_party/libxml/build/libxml_config.rules b/third_party/libxml/build/libxml_config.rules deleted file mode 100644 index 46967cc..0000000 --- a/third_party/libxml/build/libxml_config.rules +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<VisualStudioToolFile - Name="libxml config file" - Version="8.00" - > - <Rules> - <CustomBuildRule - Name="libxml config file" - DisplayName="libxml config file" - CommandLine=".\libxml_config.bat [inputs] $(SolutionDir)" - Outputs="$(ProjectDir)..\config.h" - FileExtensions="*.js" - ExecutionDescription="Generating config.h..." - > - </CustomBuildRule> - </Rules> -</VisualStudioToolFile> diff --git a/third_party/libxml/build/libxml_config.vcproj b/third_party/libxml/build/libxml_config.vcproj deleted file mode 100644 index a635f1b..0000000 --- a/third_party/libxml/build/libxml_config.vcproj +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="libxml_config" - ProjectGUID="{31D88CBF-DC28-47A8-8838-BF81D528EE74}" - RootNamespace="libxml_config" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - <ToolFile - RelativePath=".\libxml_config.rules" - /> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="libxml config file" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - <Configuration - Name="Release|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="libxml config file" - /> - <Tool - Name="VCCustomBuildTool" - /> - <Tool - Name="VCMIDLTool" - /> - <Tool - Name="VCPostBuildEventTool" - /> - </Configuration> - </Configurations> - <References> - </References> - <Files> - <File - RelativePath="..\win32\configure.js" - > - </File> - </Files> - <Globals> - </Globals> -</VisualStudioProject> diff --git a/third_party/libxml/build/using_libxml.vsprops b/third_party/libxml/build/using_libxml.vsprops index 7900ced..0c7311c 100644 --- a/third_party/libxml/build/using_libxml.vsprops +++ b/third_party/libxml/build/using_libxml.vsprops @@ -6,7 +6,7 @@ > <Tool Name="VCCLCompilerTool" - AdditionalIncludeDirectories=""$(SolutionDir)..\third_party\libxml\include"" + AdditionalIncludeDirectories=""$(SolutionDir)..\third_party\libxml\include";"$(SolutionDir)..\third_party\libxml\win32\include"" PreprocessorDefinitions="LIBXML_STATIC" /> <Tool |