diff options
Diffstat (limited to 'third_party')
| -rw-r--r-- | third_party/libxslt/README.google | 3 | ||||
| -rwxr-xr-x | third_party/libxslt/build/generate-win32-headers.bat | 6 | ||||
| -rw-r--r-- | third_party/libxslt/build/libxslt.vcproj | 4 | ||||
| -rw-r--r-- | third_party/libxslt/build/libxslt.vsprops | 11 | ||||
| -rw-r--r-- | third_party/libxslt/build/libxslt_config.bat | 13 | ||||
| -rw-r--r-- | third_party/libxslt/build/libxslt_config.rules | 17 | ||||
| -rw-r--r-- | third_party/libxslt/build/libxslt_config.vcproj | 74 |
7 files changed, 21 insertions, 107 deletions
diff --git a/third_party/libxslt/README.google b/third_party/libxslt/README.google index 3a3ccfe..792f0f0 100644 --- a/third_party/libxslt/README.google +++ b/third_party/libxslt/README.google @@ -12,7 +12,8 @@ To import a new snapshot of libxslt: distribution. - Copy the files into this directory, omitting files which have been omitted here. -- Remove libxslt/xsltconfig.h and libexslt/exsltconfig.h. +- Run build/generate-win32-headers.bat to re-generate the configuration + headers. - 'cd linux && sh ../configure --with-libxml-src=../../libxml/linux/' to re-generate configuration headers. - Perform the modification above. diff --git a/third_party/libxslt/build/generate-win32-headers.bat b/third_party/libxslt/build/generate-win32-headers.bat new file mode 100755 index 0000000..efa8acf --- /dev/null +++ b/third_party/libxslt/build/generate-win32-headers.bat @@ -0,0 +1,6 @@ +REM Generate libxslt/xsltconfig.h. +REM We don't need config.h on windows, so we delete that file. + +cd %~dp0\..\win32 +cscript //E:jscript configure.js compiler=msvc +del ..\config.h diff --git a/third_party/libxslt/build/libxslt.vcproj b/third_party/libxslt/build/libxslt.vcproj index 123b8b1..f9fbee4 100644 --- a/third_party/libxslt/build/libxslt.vcproj +++ b/third_party/libxslt/build/libxslt.vcproj @@ -16,7 +16,7 @@ <Configuration Name="Debug|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\debug.vsprops;.\libxslt.vsprops" > <Tool Name="VCLibrarianTool" @@ -28,7 +28,7 @@ <Configuration Name="Release|Win32" ConfigurationType="4" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\release.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\zlib\using_zlib.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops" + InheritedPropertySheets="$(SolutionDir)..\build\release.vsprops;.\libxslt.vsprops" > <Tool Name="VCLibrarianTool" diff --git a/third_party/libxslt/build/libxslt.vsprops b/third_party/libxslt/build/libxslt.vsprops new file mode 100644 index 0000000..4a41281 --- /dev/null +++ b/third_party/libxslt/build/libxslt.vsprops @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="Windows-1252"?> +<VisualStudioPropertySheet + ProjectType="Visual C++" + Version="8.00" + Name="libxslt" + InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\third_party\libxml\build\using_libxml.vsprops;$(SolutionDir)..\third_party\libxslt\build\using_libxslt.vsprops;$(SolutionDir)..\third_party\icu38\build\using_icu.vsprops;$(SolutionDir)..\build\external_code.vsprops" + > + <Tool + Name="VCCLCompilerTool" + /> +</VisualStudioPropertySheet> diff --git a/third_party/libxslt/build/libxslt_config.bat b/third_party/libxslt/build/libxslt_config.bat deleted file mode 100644 index 00c4ff9..0000000 --- a/third_party/libxslt/build/libxslt_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 -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/libxslt/build/libxslt_config.rules b/third_party/libxslt/build/libxslt_config.rules deleted file mode 100644 index d603893..0000000 --- a/third_party/libxslt/build/libxslt_config.rules +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<VisualStudioToolFile - Name="libxslt config file" - Version="8.00" - > - <Rules> - <CustomBuildRule - Name="libxslt config file" - DisplayName="libxslt config file" - CommandLine=".\libxslt_config.bat [inputs] $(SolutionDir)" - Outputs="$(ProjectDir)..\config.h" - FileExtensions="*.js" - ExecutionDescription="Generating config.h..." - > - </CustomBuildRule> - </Rules> -</VisualStudioToolFile> diff --git a/third_party/libxslt/build/libxslt_config.vcproj b/third_party/libxslt/build/libxslt_config.vcproj deleted file mode 100644 index a208228..0000000 --- a/third_party/libxslt/build/libxslt_config.vcproj +++ /dev/null @@ -1,74 +0,0 @@ -<?xml version="1.0" encoding="Windows-1252"?> -<VisualStudioProject - ProjectType="Visual C++" - Version="8.00" - Name="libxslt_config" - ProjectGUID="{4BD929D4-494B-4EE8-91F6-FD0277A51D2B}" - RootNamespace="libxslt_config" - Keyword="Win32Proj" - > - <Platforms> - <Platform - Name="Win32" - /> - </Platforms> - <ToolFiles> - <ToolFile - RelativePath=".\libxslt_config.rules" - /> - </ToolFiles> - <Configurations> - <Configuration - Name="Debug|Win32" - ConfigurationType="10" - InheritedPropertySheets="$(SolutionDir)..\build\common.vsprops;$(SolutionDir)..\build\debug.vsprops" - > - <Tool - Name="VCPreBuildEventTool" - /> - <Tool - Name="libxslt 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="libxslt 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> |