bzr commit into connector-net-trunk branch (reggie.burnett:901)

[Reggie Burnett]

#At file:///C:/work/connector-net/trunk/ based on revid:reggie.burnett@stripped

  901 Reggie Burnett	2010-07-25
      a few updates to the installer

    modified:
      Installer/core.wxs
      Installer/main.wxs
      Installer/ui.wxs
      Installer/visualstudio.wxs
=== modified file 'Installer/core.wxs'
=== modified file 'Installer/core.wxs'
--- a/Installer/core.wxs	2010-07-21 16:39:02 +0000
+++ b/Installer/core.wxs	2010-07-26 01:21:36 +0000
@@ -86,7 +86,7 @@
       <Component Id="EF.v4" Guid="E6B683F6-727A-43c9-B955-6BEE94EF61C7" DiskId="1">
         <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>
         <File Id="MySql.Data.EF.v4" Name="MySql.Data.Entity.dll"
-              Source="..\mysql.data.entity\provider\bin\release\mysql.data.entity.dll" DiskId="1"/>
+              Source="..\mysql.data.entity\provider\bin\release-4.0\mysql.data.entity.dll" DiskId="1"/>
       </Component>
       <Component Id="EF.v4.GAC" Guid="A9C03468-5A59-443f-85DC-C0149EBB55C8" DiskId="1">
         <Condition>NETFRAMEWORK40FULL OR NETFRAMEWORK40CLIENT</Condition>

=== modified file 'Installer/main.wxs'
--- a/Installer/main.wxs	2010-07-20 19:53:09 +0000
+++ b/Installer/main.wxs	2010-07-26 01:21:36 +0000
@@ -34,6 +34,10 @@
     </Property>
     <Condition Message="A previous version of Connector/Net 5.0 or higher is already installed.  Please uninstall that version first.">Not OLDVERSION</Condition>
 
+    <Property Id="HLM_LOCATION">
+      <RegistrySearch Id="HLMRegSearch" Root="HKLM" Key="Software\Microsoft\Help\v1.0" Name="AppRoot" Type="raw"/>
+    </Property>
+    
     <!-- Our directory structure -->
     <Directory Id='TARGETDIR' Name='SourceDir'>
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
@@ -84,6 +88,8 @@
         <File Id="docs7" Name="COL_Master_N.HxK" Source="..\Documentation\CollectionFiles\COL_Master_N.HxK" DiskId="1"/>
         <File Id="docs8" Name="MySql.Data.HxS" Source="..\Documentation\Output\MySql.Data.HxS" DiskId="1"/>
         <File Id="H2Reg.ini" Name="help.cmd" Source="Binary\h2reg.ini" DiskId="1"/>
+        <File Id="MSHA_File" Name="HelpContentSetup.msha" Source="..\Documentation\Output\MySql.Data.msha" DiskId="1"/>
+        <File Id="MSHC_File" Name="MySql.Data.mshc" Source="..\Documentation\Output\MySql.Data.mshc" DiskId="1"/>
       </Component>
     </DirectoryRef>
 
@@ -117,10 +123,24 @@
     <InstallExecuteSequence>
       <Custom Action='RegisterHelp' After="InstallFiles">(&amp;DocsFeature=3) AND NOT(!DocsFeature=3)</Custom>
       <Custom Action="UnRegisterHelp" Before="RemoveFiles">(&amp;DocsFeature=2) AND (!DocsFeature=3)</Custom>
+      
+      <!--<Custom Action="CleanVS2010Help" After="RegisterHelp">(&amp;DocsFeature=3) AND NOT(!DocsFeature=3) AND (VS2010Int=3)</Custom>
+      <Custom Action="InstallVS2010Help" After="CleanVS2010Help">(&amp;DocsFeature=3) AND NOT(!DocsFeature=3) AND (VS2010Int=3)</Custom>
+      <Custom Action="RemoveVS2010Help" After="UnRegisterHelp">(&amp;DocsFeature=2) AND (!DocsFeature=3) AND (!VS2010Int=3)</Custom>-->
     </InstallExecuteSequence>
 
     <CustomAction Id="RegisterHelp" ExeCommand='-r -q CmdFile="[#H2Reg.ini]"' BinaryKey="H2Reg" Execute="deferred" Return="check" Impersonate="no"/>
     <CustomAction Id="UnRegisterHelp" ExeCommand='-u -q CmdFile="[#H2Reg.ini]"' BinaryKey="H2Reg" Execute="deferred" Return="check" Impersonate="no"/>
+
+    <!--<CustomAction Id="InstallVS2010HelpSetup" Property="InstallVS2010Help"
+                  Value='"[HLM_LOCATION]\HelpLibManager.exe" /product VS /version 100 /locale en-us /silent /vendor "Oracle" /sourceMedia "[#MSHA_File]"'/>
+    <CustomAction Id="CleanVS2010HelpSetup" Property="CleanVS2010Help"
+                  Value='"[HLM_LOCATION]\HelpLibManager.exe" /product VS /version 100 /locale en-us /uninstall /silent /vendor "Oracle" /mediaBookList "MySQL Connector/Net" /productName "MySQL Connector/Net" > NUL'/>
+    <CustomAction Id="RemoveVS2010HelpSetup" Property="RemoveVS2010Help"
+                  Value='"[HLM_LOCATION]\HelpLibManager.exe" /product VS /version 100 /locale en-us /uninstall /silent /vendor "Oracle" /mediaBookList "MySQL Connector/Net" /productName "MySQL Connector/Net" > NUL'/>
+    <CustomAction Id="InstallVS2010Help" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
+    <CustomAction Id="RemoveVS2010Help" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>
+    <CustomAction Id="CleanVS2010Help" BinaryKey="WixCA" DllEntry="CAQuietExec" Return="check" Execute='deferred' Impersonate='no'/>-->
   </Product>
 </Wix>
 

=== modified file 'Installer/ui.wxs'
--- a/Installer/ui.wxs	2010-05-19 17:56:19 +0000
+++ b/Installer/ui.wxs	2010-07-26 01:21:36 +0000
@@ -54,7 +54,10 @@
 
       <ProgressText Action="RegisterHelp">Registering help collection</ProgressText>
       <ProgressText Action="UnRegisterHelp">Unregistering help collection</ProgressText>
-      
+
+      <ProgressText Action="InstallVS2010Help">Registering help collection with Visual Studio 2010</ProgressText>
+      <ProgressText Action="RemoveVS2010Help">Unregistering help collection from Visual Studio 2010</ProgressText>
+
       <ProgressText Action='VS_2005_INSTALL_EXEC'>Installing Visual Studio 2005 Integration</ProgressText>
       <ProgressText Action='VS_2005_REMOVE_EXEC'>Removing Visual Studio 2005 Integration</ProgressText>
       <ProgressText Action='VS_2008_INSTALL_EXEC'>Installing Visual Studio 2008 Integration</ProgressText>

=== modified file 'Installer/visualstudio.wxs'
--- a/Installer/visualstudio.wxs	2010-07-20 19:53:09 +0000
+++ b/Installer/visualstudio.wxs	2010-07-26 01:21:36 +0000
@@ -45,13 +45,13 @@
       </Component>
       
       <Component Id='VS_2010_Registry' Guid='E602F4FD-4D11-4632-8204-C0CFE22F8C7C'>
-        <RegistryKey Id="VS_2010_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
+        <RegistryKey Id="VS_2010_RegistryKey_v4" Root="HKLM" Action="createAndRemoveOnUninstall"
                      Key="SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\MySQL Connector Net $(var.Version) v4.0">
-          <RegistryValue Id="VS_2010_RegistryValue" Value="[assemblies_v4]" Type="string" Action="write"/>
+          <RegistryValue Id="VS_2010_RegistryValue_v4" Value="[assemblies_v4]" Type="string" Action="write"/>
         </RegistryKey>
-        <RegistryKey Id="VS_2010_RegistryKey" Root="HKLM" Action="createAndRemoveOnUninstall"
+        <RegistryKey Id="VS_2010_RegistryKey_v2" Root="HKLM" Action="createAndRemoveOnUninstall"
                      Key="SOFTWARE\Microsoft\.NETFramework\v4.0.30319\AssemblyFoldersEx\MySQL Connector Net $(var.Version) v2.0">
-          <RegistryValue Id="VS_2010_RegistryValue" Value="[assemblies_v2]" Type="string" Action="write"/>
+          <RegistryValue Id="VS_2010_RegistryValue_v2" Value="[assemblies_v2]" Type="string" Action="write"/>
         </RegistryKey>
         <?include VS2010_Registry.wxi?>
         <?include VS2010_Data.wxi?>


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