diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2009-11-16 14:13:16 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2009-11-16 14:13:16 -0800 |
| commit | f55c0c01370cc38544e10d637c2ad9797c40bc09 (patch) | |
| tree | c4e961e5ede826804660d07e2e80c94d8c680206 | |
| parent | 073e9bbd1c40eef1f1f97495ed2a6c89375427b1 (diff) | |
| download | DotNetOpenAuth-f55c0c01370cc38544e10d637c2ad9797c40bc09.zip DotNetOpenAuth-f55c0c01370cc38544e10d637c2ad9797c40bc09.tar.gz DotNetOpenAuth-f55c0c01370cc38544e10d637c2ad9797c40bc09.tar.bz2 | |
Revert "Fixed $(ChmDir)"
This reverts commit 88591c76a735bf21cf26f3c81910f908dab0ce97.
Apparently chmbuilder.exe cannot consume trailing backslashes in its /out: parameter.
Conflicts:
tools/sandcastle.targets
| -rw-r--r-- | tools/sandcastle.targets | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets index fc758a0..8bed080 100644 --- a/tools/sandcastle.targets +++ b/tools/sandcastle.targets @@ -17,15 +17,15 @@ <DocIntermediatePath>$(ProjectRoot)obj\Doc\$(Configuration)\</DocIntermediatePath> <FxReflectionIntermediatePath>$(ProjectRoot)obj\Doc\Tmp\</FxReflectionIntermediatePath> <FxReflectionOutputPath>$(ProjectRoot)obj\Doc\Reflection\</FxReflectionOutputPath> - <ChmDir>$(DocIntermediatePath)chm\</ChmDir> + <ChmDir>$(DocIntermediatePath)chm</ChmDir> - <TocFile>$(ChmDir)toc.xml</TocFile> + <TocFile>$(ChmDir)\toc.xml</TocFile> <ChmFile>$(DocOutputPath)$(OutputAssembly).chm</ChmFile> <HxtFile>$(DocOutputPath)$(OutputAssembly).HxT</HxtFile> <HxsFile>$(DocOutputPath)$(OutputAssembly).hxs</HxsFile> <HxcFile>$(DocOutputPath)$(OutputAssembly).hxc</HxcFile> - <HhkFile>$(ChmDir)$(OutputAssembly).hhk</HhkFile> - <HhpFile>$(ChmDir)$(OutputAssembly).hhp</HhpFile> + <HhkFile>$(chmDir)\$(OutputAssembly).hhk</HhkFile> + <HhpFile>$(chmDir)\$(OutputAssembly).hhp</HhpFile> <ReflectionFile>$(DocIntermediatePath)reflection.xml</ReflectionFile> <ManifestFile>$(DocIntermediatePath)manifest.xml</ManifestFile> <ReflectionBaseFile>$(DocIntermediatePath)reflection_base.xml</ReflectionBaseFile> @@ -117,20 +117,20 @@ <Target Name="Chm" Inputs="$(SampleHtmlOutputForUpToDateCheck);$(ReflectionFile)" Outputs="$(ChmFile)" DependsOnTargets="Html"> <MakeDir Directories="$(chmDir)" Condition="!Exists('$(chmDir)')" /> - <MakeDir Directories="$(ChmDir)Html" Condition="!Exists('$(ChmDir)Html')" /> - <MakeDir Directories="$(ChmDir)Icons" Condition="!Exists('$(ChmDir)Icons')" /> - <MakeDir Directories="$(ChmDir)Scripts" Condition="!Exists('$(ChmDir)Scripts')" /> - <MakeDir Directories="$(ChmDir)Styles" Condition="!Exists('$(ChmDir)Styles')" /> - <MakeDir Directories="$(ChmDir)Local" Condition="!Exists('$(ChmDir)Local')" /> + <MakeDir Directories="$(chmDir)\Html" Condition="!Exists('$(chmDir)\Html')" /> + <MakeDir Directories="$(chmDir)\Icons" Condition="!Exists('$(chmDir)\Icons')" /> + <MakeDir Directories="$(chmDir)\Scripts" Condition="!Exists('$(chmDir)\Scripts')" /> + <MakeDir Directories="$(chmDir)\Styles" Condition="!Exists('$(chmDir)\Styles')" /> + <MakeDir Directories="$(chmDir)\Local" Condition="!Exists('$(chmDir)\Local')" /> <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)CreatePrototypeToc.xsl" "$(ReflectionFile)" /out:"$(TocFile)"' /> <Exec Condition="'$(PresentationStyle)' != 'prototype'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)CreateVSToc.xsl" "$(ReflectionFile)" /out:"$(TocFile)"' /> <!--copy directories from hxs --> - <Copy SourceFiles="@(IconFiles)" DestinationFolder="$(ChmDir)icons\%(RecursiveDir)" SkipUnchangedFiles="true"/> - <Copy SourceFiles="@(ScriptFiles)" DestinationFolder="$(ChmDir)scripts\%(RecursiveDir)" SkipUnchangedFiles="true"/> - <Copy SourceFiles="@(StyleFiles)" DestinationFolder="$(ChmDir)styles\%(RecursiveDir)" SkipUnchangedFiles="true"/> - <Exec Condition="Exists('$(chmDir)s\Local')" Command='xcopy.exe "$(ChmDir)Local\*" "$(ChmDir)Local\" /y /r'/> + <Copy SourceFiles="@(IconFiles)" DestinationFolder="$(chmDir)\icons\%(RecursiveDir)" SkipUnchangedFiles="true"/> + <Copy SourceFiles="@(ScriptFiles)" DestinationFolder="$(chmDir)\scripts\%(RecursiveDir)" SkipUnchangedFiles="true"/> + <Copy SourceFiles="@(StyleFiles)" DestinationFolder="$(chmDir)\styles\%(RecursiveDir)" SkipUnchangedFiles="true"/> + <Exec Condition="Exists('$(chmDir)s\Local')" Command='xcopy.exe "$(chmDir)\Local\*" "$(chmDir)\Local\" /y /r'/> <!-- generate CHM-specific HTML and HH* files --> <Exec Command='"$(ProductionTools)ChmBuilder.exe" /project:$(OutputAssembly) /html:"$(DocOutputApiPath)html" /lcid:1033 /toc:"$(TocFile)" /out:"$(chmDir)"'/> @@ -140,7 +140,7 @@ <Exec Command='"$(HHC)" "$(HhpFile)"' IgnoreExitCode="true" /> - <Copy SourceFiles="$(ChmDir)$(OutputAssembly).chm" DestinationFiles="$(ChmFile)" /> + <Copy SourceFiles="$(ChmDir)\$(OutputAssembly).chm" DestinationFiles="$(ChmFile)" /> </Target> <Target Name="HxS" |