bzr commit into wex-installer-1.0 branch (reggie.burnett:325)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:iggy@stripped

  325 Reggie Burnett	2011-02-09
      fixed small problem with how we are reading database scripts and re-enabled Sakila script in Examples database

    modified:
      Examples/Examples.wixproj
      Examples/Product.wxs
      StandardPlugins/Examples/ConfigurationController.cs
=== modified file 'Examples/Examples.wixproj'
=== modified file 'Examples/Examples.wixproj'
--- a/Examples/Examples.wixproj	2011-02-09 13:49:30 +0000
+++ b/Examples/Examples.wixproj	2011-02-09 23:55:15 +0000
@@ -6,7 +6,7 @@
     <ProductVersion>3.5</ProductVersion>
     <ProjectGuid>{13190f97-5d72-4949-a77a-500a57da44bb}</ProjectGuid>
     <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>mysql-examples-1.0.0</OutputName>
+    <OutputName>mysql-examples-5.1.0</OutputName>
     <OutputType>Package</OutputType>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
     <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
@@ -15,6 +15,7 @@
     <OutputPath>bin\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>Debug</DefineConstants>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>

=== modified file 'Examples/Product.wxs'
--- a/Examples/Product.wxs	2011-02-09 19:17:23 +0000
+++ b/Examples/Product.wxs	2011-02-09 23:55:15 +0000
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="46b63307-6f7c-4e85-a77b-fa97365df153" Name="MySQL Examples 5.1" Language="1033" Version="1.0.0.0" Manufacturer="Oracle" UpgradeCode="8c8219cb-78a4-4af8-8d49-f36fb1fe3320">
+  <Product Id="46b63307-6f7c-4e85-a77b-fa97365df153" Name="MySQL Examples 5.1" Language="1033" Version="5.1.0" Manufacturer="Oracle" UpgradeCode="8c8219cb-78a4-4af8-8d49-f36fb1fe3320">
     <Package InstallerVersion="200" Compressed="yes" />
 
     <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
@@ -41,13 +41,13 @@
                   <File Name="README.txt" Source="Sample DB\Menagerie\README.txt"/>
                 </Component>
               </Directory>-->
-              <!--<Directory Id="SakilaFolder" Name="Sakila">
+              <Directory Id="SakilaFolder" Name="Sakila">
                 <Component Id="SakilaDBComponent" Guid="">
                   <File Name="sakila.mwb" Source="Sample DB\Sakila\sakila.mwb"/>
                   <File Name="sakila-data.sql" Source="Sample DB\Sakila\sakila-data.sql"/>
                   <File Name="sakila-schema.sql" Source="Sample DB\Sakila\sakila-schema.sql"/>
                 </Component>
-              </Directory>-->
+              </Directory>
             </Directory>
           </Directory>
         </Directory>
@@ -59,7 +59,7 @@
       <ComponentRef Id="C_SampleDBRegistryKey"/>
       <ComponentRef Id="C_WorldDB" />
       <!--<ComponentRef Id="C_WorldDBInno" />-->
-      <!--<ComponentRef Id="SakilaDBComponent" />-->
+      <ComponentRef Id="SakilaDBComponent" />
       <!--<ComponentRef Id="MenagerieDBComponent" />-->
 
       <!-- Note: The following ComponentGroupRef is required to pull in generated authoring from project references. -->

=== modified file 'StandardPlugins/Examples/ConfigurationController.cs'
--- a/StandardPlugins/Examples/ConfigurationController.cs	2011-02-09 20:56:57 +0000
+++ b/StandardPlugins/Examples/ConfigurationController.cs	2011-02-09 23:55:15 +0000
@@ -141,14 +141,14 @@
 
                     try
                     {
-                        StreamReader sr = new StreamReader(db.SchemaFile);
+                        StreamReader sr = new StreamReader(db.SchemaFile, Encoding.Default);
                         string sql = sr.ReadToEnd();
                         script.Query = sql;
                         int processed = script.Execute();
 
                         if (!String.IsNullOrEmpty(db.DataFile))
                         {
-                            sr = new StreamReader(db.DataFile);
+                            sr = new StreamReader(db.DataFile, Encoding.Default);
                             sql = sr.ReadToEnd();
                             script.Query = sql;
                             processed = script.Execute();


Attachment: [text/bzr-bundle] bzr/[e-mail]