GNOME.org
 

dasher r3502 - in trunk: . Src/Installer Src/InstallerTobii Src/InstallerW2K

Author: keithv
Date: Wed Apr 16 19:14:35 2008
New Revision: 3502
URL: http://svn.gnome.org/viewvc/dasher?rev=3502&view=rev

Log:
Fixed expat path in wix XML

Modified:
   trunk/ChangeLog
   trunk/INSTALL.Windows
   trunk/Src/Installer/Dasher.wxs
   trunk/Src/Installer/Installer.wixproj
   trunk/Src/InstallerTobii/InstallerTobii.wixproj
   trunk/Src/InstallerTobii/InstallerTobii.wxs
   trunk/Src/InstallerW2K/InstallerW2K.wixproj
   trunk/Src/InstallerW2K/InstallerW2K.wxs

Modified: trunk/INSTALL.Windows
==============================================================================
--- trunk/INSTALL.Windows	(original)
+++ trunk/INSTALL.Windows	Wed Apr 16 19:14:35 2008
@@ -1,35 +1,40 @@
-Building Dasher for Microsoft Windows
-=====================================
-
-Prerequisites
--------------
-
-Microsoft Speech SDK
-Microsoft Tablet SDK
-
-Both SDKs can be installed individually, or as part of the Platform SDK. Downloads
-can be found at http://www.microsoft.com
-
-Visual Studio should be configured with the appropriate include and library directories
-Tools->Options->Projects->VC++ directories
-
-Example includes (exact paths depend upon installation directory)
-C:\Program Files\Microsoft Speech SDK 5.1\Include
-C:\Program Files\Microsoft Tablet PC Platform SDK\Include
-
-Example libraries:
-C:\Program Files\Microsoft Speech SDK 5.1\Lib\i386
-C:\Program Files\Microsoft Tablet PC Platform SDK\Bin
-
-Building
---------
-
-A Visual Studio 7.1 solution file is included in the Src/Win32
-directory. This should hopefully build without modification on any
-system.
-
-For earlier versions of Visual Studio, alternative project files are
-provided, although these may be out-of-date. Please consider the 7.1
-project file to be authoritative, and port any modifications to that
-if possible (or at least tell us so we can do it).
-
+Building Dasher for Microsoft Windows
+=====================================
+
+Prerequisites
+-------------
+
+Microsoft Speech SDK
+Microsoft Tablet SDK
+Expat XML Parser
+
+The Speech and Tablet SDKs can be installed individually, or as part of the 
+Platform SDK. Downloads can be found at http://www.microsoft.com and 
+http://expat.sourceforge.net
+
+The project files use environment variables to locate the root directories of 
+the prerequisites.  You can set these in the Windows control panel: 
+Control Panels->System->Advanced->Environment Variables.  
+
+Here are the variable names and their default install locations:
+
+SPEECHSDK  C:\Program Files\Microsoft Speech SDK 5.1
+TABLETSDK  C:\Program Files\Microsoft Tablet PC Platform SDK
+EXPAT      C:\Program Files\Expat 2.0.1
+
+You should insure that your Visual Studio-wide VC++ directories don't have
+include or library directories for the platform SDK, look in: Tools->Options->
+Project and Solutions->VC++ Directories. 
+
+Building
+--------
+
+Visual Studio 8.0 (2005) solution/project files are included in the 
+Src/Win32 directory. This should hopefully build without modification on 
+any system.
+
+For earlier versions of Visual Studio, alternative project files are
+provided, although these may be out-of-date. Please consider the 8.0
+files to be authoritative, and port any modifications to that if possible 
+(or at least tell us so we can do it).
+

Modified: trunk/Src/Installer/Dasher.wxs
==============================================================================
--- trunk/Src/Installer/Dasher.wxs	(original)
+++ trunk/Src/Installer/Dasher.wxs	Wed Apr 16 19:14:35 2008
@@ -24,7 +24,7 @@
                 <Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.7" WorkingDirectory='INSTALLDIR'
                  Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
               </File>
-              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="..\Win32\Target\Release\libexpat.dll" Vital="yes"/>
+              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\bin\libexpat.dll" Vital="yes"/>
             </Component>
             <Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
               <File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>

Modified: trunk/Src/Installer/Installer.wixproj
==============================================================================
--- trunk/Src/Installer/Installer.wixproj	(original)
+++ trunk/Src/Installer/Installer.wixproj	Wed Apr 16 19:14:35 2008
@@ -124,7 +124,9 @@
     <Compile Include="Dasher.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
+    <WixExtension Include="WixUIExtension">
+      <HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
+    </WixExtension>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
 </Project>
\ No newline at end of file

Modified: trunk/Src/InstallerTobii/InstallerTobii.wixproj
==============================================================================
--- trunk/Src/InstallerTobii/InstallerTobii.wixproj	(original)
+++ trunk/Src/InstallerTobii/InstallerTobii.wixproj	Wed Apr 16 19:14:35 2008
@@ -85,7 +85,9 @@
     <Compile Include="InstallerTobii.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
+    <WixExtension Include="WixUIExtension">
+      <HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
+    </WixExtension>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
   <!--

Modified: trunk/Src/InstallerTobii/InstallerTobii.wxs
==============================================================================
--- trunk/Src/InstallerTobii/InstallerTobii.wxs	(original)
+++ trunk/Src/InstallerTobii/InstallerTobii.wxs	Wed Apr 16 19:14:35 2008
@@ -24,7 +24,7 @@
                 <Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.6" WorkingDirectory='INSTALLDIR'
                  Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
               </File>
-              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="..\Win32\Target\Release\libexpat.dll" Vital="yes"/>
+              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\libexpat.dll" Vital="yes"/>
             </Component>
             <Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
               <File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>

Modified: trunk/Src/InstallerW2K/InstallerW2K.wixproj
==============================================================================
--- trunk/Src/InstallerW2K/InstallerW2K.wixproj	(original)
+++ trunk/Src/InstallerW2K/InstallerW2K.wixproj	Wed Apr 16 19:14:35 2008
@@ -51,7 +51,9 @@
     <Compile Include="InstallerW2K.wxs" />
   </ItemGroup>
   <ItemGroup>
-    <WixExtension Include="C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll" />
+    <WixExtension Include="WixUIExtension">
+      <HintPath>C:\Program Files\Windows Installer XML v3\bin\WixUIExtension.dll</HintPath>
+    </WixExtension>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.0\Wix.targets" />
   <!--

Modified: trunk/Src/InstallerW2K/InstallerW2K.wxs
==============================================================================
--- trunk/Src/InstallerW2K/InstallerW2K.wxs	(original)
+++ trunk/Src/InstallerW2K/InstallerW2K.wxs	Wed Apr 16 19:14:35 2008
@@ -24,7 +24,7 @@
                 <Shortcut Id="desktopDasher44" Directory="DesktopFolder" Name="Dasher 4.6" WorkingDirectory='INSTALLDIR'
                  Icon="Dasher.exe" IconIndex="0" Advertise="yes"/>
               </File>
-              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="..\Win32\Target\Release\libexpat.dll" Vital="yes"/>
+              <File Id="ExpatDLL" Name="libexpat.dll" DiskId="1" Source="$(env.EXPAT)\libexpat.dll" Vital="yes"/>
             </Component>
             <Component Id="Help" Guid="cf486329-8d04-462b-afd4-e8e0bccc9c95">
               <File Id="HelpFile" Name="Dasher.chm" DiskId="1" Source="..\..\Data\Help\Win32\dasher.chm"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]