GNOME.org
 

dasher r3505 - in trunk: . Data/Help Data/Help/Gnome/C Src/Win32

Author: pcowans
Date: Mon Apr 21 17:20:56 2008
New Revision: 3505
URL: http://svn.gnome.org/viewvc/dasher?rev=3505&view=rev

Log:
* Added generation of Windows .chm file as part of the build process

Added:
   trunk/Data/Help/Manual.vcproj
   trunk/Data/Help/compile_help.bat
   trunk/Data/Help/compile_help.cmd
Modified:
   trunk/Data/Help/Gnome/C/dasher.xml
   trunk/Data/Help/Makefile.am
   trunk/INSTALL.Windows
   trunk/Src/Win32/Dasher_vc80.sln

Modified: trunk/Data/Help/Gnome/C/dasher.xml
==============================================================================
--- trunk/Data/Help/Gnome/C/dasher.xml	(original)
+++ trunk/Data/Help/Gnome/C/dasher.xml	Mon Apr 21 17:20:56 2008
@@ -1,7 +1,5 @@
 <?xml version="1.0"?>
-<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
-<!ENTITY version SYSTEM "../version.xml">
-]>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd";>
 <article id="index">
   <articleinfo>
     <title>Dasher Manual</title>

Modified: trunk/Data/Help/Makefile.am
==============================================================================
--- trunk/Data/Help/Makefile.am	(original)
+++ trunk/Data/Help/Makefile.am	Mon Apr 21 17:20:56 2008
@@ -3,3 +3,7 @@
 if GNOME_HELP
   SUBDIRS += Gnome
 endif
+
+EXTRA_DIST = \
+		Manual.vcproj \
+		compile_help.cmd
\ No newline at end of file

Added: trunk/Data/Help/Manual.vcproj
==============================================================================
--- (empty file)
+++ trunk/Data/Help/Manual.vcproj	Mon Apr 21 17:20:56 2008
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="8.00"
+	Name="Manual"
+	ProjectGUID="{C356A954-2E47-4F1E-AE4A-E22B598514F9}"
+	RootNamespace="Manual"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				MinimalRebuild="true"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="3"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="4"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="$(SolutionDir)$(ConfigurationName)"
+			IntermediateDirectory="$(ConfigurationName)"
+			ConfigurationType="1"
+			CharacterSet="2"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				RuntimeLibrary="2"
+				WarningLevel="3"
+				Detect64BitPortabilityProblems="true"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				GenerateDebugInformation="true"
+				OptimizeReferences="2"
+				EnableCOMDATFolding="2"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCWebDeploymentTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\Gnome\C\dasher.xml"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Transforming DocBook source"
+						CommandLine="&quot;$(LIBXML)\xsltproc.exe&quot; --stringparam htmlhelp.chm dasher.chm --param manifest.in.base.dir 1 --stringparam base.dir .\Win32\ &quot;$(DOCBOOK_XSL)\htmlhelp\htmlhelp.xsl&quot; &quot;$(InputPath)&quot;"
+						Outputs=".\Win32\htmlhelp.hhp"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Transforming DocBook source"
+						CommandLine="&quot;$(LIBXML)\xsltproc.exe&quot; --stringparam htmlhelp.chm dasher.chm --param manifest.in.base.dir 1 --stringparam base.dir .\Win32\ &quot;$(DOCBOOK_XSL)\htmlhelp\htmlhelp.xsl&quot; &quot;$(InputPath)&quot;"
+						Outputs=".\Win32\htmlhelp.hhp"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\Win32\htmlhelp.hhp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling HTML Help project"
+						CommandLine=".\compile_help.bat &quot;$(HELP_COMPILER)&quot; &quot;$(InputPath)&quot;"
+						Outputs=".\Win32\dasher.chm"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCustomBuildTool"
+						Description="Compiling HTML Help project"
+						CommandLine=".\compile_help.bat &quot;$(HELP_COMPILER)&quot; &quot;$(InputPath)&quot;"
+						Outputs=".\Win32\dasher.chm"
+					/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
+			UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
+			>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

Added: trunk/Data/Help/compile_help.bat
==============================================================================
--- (empty file)
+++ trunk/Data/Help/compile_help.bat	Mon Apr 21 17:20:56 2008
@@ -0,0 +1,3 @@
+%1\hhc.exe %2
+exit /B 0
+

Added: trunk/Data/Help/compile_help.cmd
==============================================================================
--- (empty file)
+++ trunk/Data/Help/compile_help.cmd	Mon Apr 21 17:20:56 2008
@@ -0,0 +1,3 @@
+"%1" %2
+exit /B 0
+

Modified: trunk/INSTALL.Windows
==============================================================================
--- trunk/INSTALL.Windows	(original)
+++ trunk/INSTALL.Windows	Mon Apr 21 17:20:56 2008
@@ -25,6 +25,34 @@
 EXPAT          C:\Program Files\Expat 2.0.1
 MICROSOFTSDK5  C:\Program Files\Microsoft SDKs\Windows\v5.0
 
+Additional Prerequisits For Building HTML Help
+----------------------------------------------
+
+If you aren't building a release, and don't otherwise want to build the Windows
+help (.chm) file, you can ignore these and disable the 'Manual' project in the 
+solution. This project is only built for the 'Release' configurations anyway.
+
+LibXML2
+docbook-xsl
+Microsoft HTML Help Workshop
+
+LibXML2 is available at: http://www.zlatkovic.com/libxml.en.html. The minimum 
+requirement here is xslproc.exe, which can be installed along with the required
+dependencies by copying the contents of the bin directories from the libxml and 
+libxslt packages to (eg) C:\Program Files\LibXML2. If you want to be able to 
+use these libraries more generally you should probably put them somewhere in 
+the system wide library path.
+
+These need a few other environment variables
+
+LIBXML         C:\Program Files\LibXML2
+DOCBOOK_XSL    C:\Program Files\docbook-xsl-1.73.2
+HELP_COMPILER  C:\Program Files\HTML Help Workshop\hhc.exe
+
+Note that the last of these must be the full path of the compiler executable. This
+is due to technical limitations connected with hhc.exe (a) doing a bad job of 
+parsing the command line and (b) giving a non-zero return value on success.
+
 Building
 --------
 

Modified: trunk/Src/Win32/Dasher_vc80.sln
==============================================================================
--- trunk/Src/Win32/Dasher_vc80.sln	(original)
+++ trunk/Src/Win32/Dasher_vc80.sln	Mon Apr 21 17:20:56 2008
@@ -74,6 +74,8 @@
 		Release.AspNetCompiler.Debug = "False"
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Manual", "..\..\Data\Help\Manual.vcproj", "{C356A954-2E47-4F1E-AE4A-E22B598514F9}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -311,6 +313,7 @@
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Win32.ActiveCfg = Release|Any CPU
+		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Win32.Build.0 = Release|Any CPU
 		{BBE9E817-E2C5-4081-9612-0738E27CF55A}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Any CPU
 		{C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C4BFC988-DA68-4F51-BAB0-DB5B7D5CD53B}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -360,6 +363,7 @@
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Mixed Platforms.Build.0 = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Win32.ActiveCfg = Release|Any CPU
+		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Win32.Build.0 = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -368,6 +372,33 @@
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Win32.ActiveCfg = Release|Any CPU
 		{C2E1F683-E2B1-4445-9748-E67E1D5156FD}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Any CPU
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Any CPU.ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Win32.ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Any CPU.ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Mixed Platforms.Build.0 = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Pocket PC 2003 (ARMV4).ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Win32.ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Win32.Build.0 = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Mobile Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Debug|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Any CPU.ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Mixed Platforms.ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Mixed Platforms.Build.0 = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Win32.ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Win32.Build.0 = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release (W2K)|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Any CPU.ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Mixed Platforms.Build.0 = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Pocket PC 2003 (ARMV4).ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Win32.ActiveCfg = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Win32.Build.0 = Release|Win32
+		{C356A954-2E47-4F1E-AE4A-E22B598514F9}.Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I).ActiveCfg = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]