Added:
trunk/Installer/visualstudio.wxs
Modified:
trunk/Installer/Installer.wixproj
trunk/Installer/main.wxs
Log:
integrated the DDEX plugin into the 5.1 installer.
Modified: trunk/Installer/Installer.wixproj
===================================================================
--- trunk/Installer/Installer.wixproj 2007-04-05 21:19:27 UTC (rev 660)
+++ trunk/Installer/Installer.wixproj 2007-04-09 18:20:52 UTC (rev 661)
@@ -53,13 +53,53 @@
</WixVariables>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Commercial' ">
- <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
+ <IntermediateOutputPath>obj\Commercial\</IntermediateOutputPath>
<Cultures>en-US</Cultures>
- <OutputPath>bin\Commercial2\</OutputPath>
+ <OutputPath>bin\Commercial\</OutputPath>
+ <DefineConstants>IsGPL=0</DefineConstants>
+ <IncludeSearchPaths>
+ </IncludeSearchPaths>
+ <Pedantic>False</Pedantic>
+ <ShowSourceTrace>False</ShowSourceTrace>
+ <SuppressSchemaValidation>False</SuppressSchemaValidation>
+ <SuppressSpecificWarnings>
+ </SuppressSpecificWarnings>
+ <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+ <VerboseOutput>False</VerboseOutput>
+ <AllowIdenticalRows>False</AllowIdenticalRows>
+ <CabinetCachePath>
+ </CabinetCachePath>
+ <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
+ <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
+ <LinkerPedantic>False</LinkerPedantic>
+ <ReuseCabinetCache>False</ReuseCabinetCache>
+ <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
+ <SuppressAclReset>False</SuppressAclReset>
+ <SuppressAssemblies>False</SuppressAssemblies>
+ <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
+ <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
+ <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
+ <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
+ <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
+ <SuppressFiles>False</SuppressFiles>
+ <SuppressIces>
+ </SuppressIces>
+ <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
+ <SuppressLayout>False</SuppressLayout>
+ <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
+ <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
+ <LinkerSuppressSpecificWarnings>
+ </LinkerSuppressSpecificWarnings>
+ <SuppressValidation>True</SuppressValidation>
+ <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
+ <LinkerVerboseOutput>False</LinkerVerboseOutput>
+ <WixVariables>
+ </WixVariables>
</PropertyGroup>
<ItemGroup>
<Compile Include="main.wxs" />
<Compile Include="samples.wxs" />
+ <Compile Include="visualstudio.wxs" />
<Compile Include="webproviders.wxs" />
</ItemGroup>
<ItemGroup>
Modified: trunk/Installer/main.wxs
===================================================================
--- trunk/Installer/main.wxs 2007-04-05 21:19:27 UTC (rev 660)
+++ trunk/Installer/main.wxs 2007-04-09 18:20:52 UTC (rev 661)
@@ -7,6 +7,12 @@
<Package Compressed="yes" InstallerVersion="200"/>
<Media Id="1" EmbedCab="yes" Cabinet="ConnectorNet.cab" CompressionLevel="high" />
+ <Condition Message="You must have Administrative rights on this machine to install [ProductName].">
+ <![CDATA[ Privileged ]]>
+ </Condition>
+ <Property Id="ARPURLINFOABOUT" Value="http://www.mysql.com" />
+ <Property Id="ARPURLUPDATEINFO" Value="http://dev.mysql.com"/>
+
<!-- First make sure that .NET 2.0 is installed -->
<PropertyRef Id="NETFRAMEWORK20"/>
<Condition Message="The .NET Framework 2.0 must be installed before installing this package.">Installed OR NETFRAMEWORK20</Condition>
@@ -99,6 +105,7 @@
<FeatureRef Id="Samples"/>
<FeatureRef Id="WebProviders"/>
+ <FeatureRef Id="VisualStudio"/>
<Property Id="WIXUI_INSTALLDIR" Value='INSTALLDIR'/>
<UIRef Id="WixUI_Mondo"/>
Added: trunk/Installer/visualstudio.wxs
===================================================================
--- trunk/Installer/visualstudio.wxs 2007-04-05 21:19:27 UTC (rev 660)
+++ trunk/Installer/visualstudio.wxs 2007-04-09 18:20:52 UTC (rev 661)
@@ -0,0 +1,106 @@
+<?xml version="1.0"?>
+<?define vsRegPath = "8.0" ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Fragment Id='VSFragment'>
+
+ <DirectoryRef Id='INSTALLDIR'>
+ <Directory Id='VSDir' Name='Visual Studio Integration'>
+ <Component Id="VStudio" Guid="a5240e1b-c5c2-4820-8a1d-776c0017f44b">
+ <File Id='MySQL.VisualStudio' Name='MySQL.VisualStudio.dll' DiskId='1'
+ Source='..\VisualStudio\bin\release\MySQL.VisualStudio.dll' />
+ <File Id='MySql.VisualStudio.dll.config' Name='MySql.VisualStudio.dll.config' DiskId='1'
+ Source='..\VisualStudio\bin\release\MySql.VisualStudio.dll.config' />
+
+ <!--Datasource registration section-->
+ <RegistryKey Id='DataSource' Root='HKLM'
+ Key='Software\Microsoft\VisualStudio\$(var.vsRegPath)\DataSources\{98FBE4D8-5583-4233-B219-70FF8C7FBBBD}'
+ Action='createAndRemoveOnUninstall'>
+ <RegistryValue Id='DSDefaultValue' Type='string' Value='MySQL Database'/>
+ <RegistryKey Id='DSSupportingProviders' Key='SupportingProviders' Action='create'>
+ <RegistryKey Id='DSProvider' Key='{C6882346-E592-4da5-80BA-D2EADCDA0359}' Action='create'>
+ <RegistryValue Id='DSDesc' Name='Description' Value='Provider_Description, MySql.Data.VisualStudio.Properties.Resources' Type='string'/>
+ <RegistryValue Id='DSDisplayName' Name='DisplayName' Value='Datasource_Displayname, MySql.Data.VisualStudio.Properties.Resources' Type='string'/>
+ </RegistryKey>
+ </RegistryKey>
+ </RegistryKey>
+
+ <!--Provider registration section-->
+ <RegistryKey Id='DataProviders' Root='HKLM'
+ Key='SOFTWARE\Microsoft\VisualStudio\$(var.vsRegPath)\DataProviders\{C6882346-E592-4da5-80BA-D2EADCDA0359}'
+ Action='createAndRemoveOnUninstall'>
+ <RegistryValue Id='DPDefaultValue' Type='string' Value='.NET Framework Data Provider for MySQL'/>
+ <RegistryValue Id='DPDisplayName' Name='DisplayName' Type='string' Value='Provider_DisplayName, MySql.Data.VisualStudio.Properties.Resources'/>
+ <RegistryValue Id='DPShortDisplayName' Name='ShortDisplayName' Type='string' Value='Provider_ShortDisplayName, MySql.Data.VisualStudio.Properties.Resources'/>
+ <RegistryValue Id='DPDescription' Name='Description' Type='string' Value='Provider_Description, MySql.Data.VisualStudio.Properties.Resources'/>
+ <RegistryValue Id='FactoryService' Name='FactoryService' Type='string' Value='{D949EA95-EDA1-4b65-8A9E-266949A99360}'/>
+ <RegistryValue Id='InvariantName' Name='InvariantName' Type='string' Value='MySql.Data.MySqlClient'/>
+ <RegistryKey Id='SupportedObjects' Key='SupportedObjects' Action='create'>
+ <RegistryKey Id='SupportedObjects1' Key='DataConnectionPromptDialog' Action='create'/>
+ <RegistryKey Id='SupportedObjects2' Key='DataConnectionProperties' Action='create'/>
+ <RegistryKey Id='SupportedObjects3' Key='DataConnectionSupport' Action='create'/>
+ <RegistryKey Id='SupportedObjects4' Key='DataConnectionUIControl' Action='create'/>
+ <RegistryKey Id='SupportedObjects5' Key='DataObjectSupport' Action='create'/>
+ <RegistryKey Id='SupportedObjects6' Key='DataSourceInformation' Action='create'/>
+ <RegistryKey Id='SupportedObjects7' Key='DataViewSupport' Action='create'/>
+ </RegistryKey>
+ </RegistryKey>
+
+ <!--Menu section-->
+ <RegistryValue Id='Menu' Root='HKLM'
+ Key='SOFTWARE\Microsoft\VisualStudio\$(var.vsRegPath)\Menus' Type='string'
+ Name='{79A115C9-B133-4891-9E7B-242509DAD272}' Value=',1000,1' Action='write'/>
+
+ <!--Service section-->
+ <RegistryKey Id='Services' Root='HKLM'
+ Key='SOFTWARE\Microsoft\VisualStudio\$(var.vsRegPath)\Services\{D949EA95-EDA1-4b65-8A9E-266949A99360}'
+ Action='createAndRemoveOnUninstall'>
+ <RegistryValue Id='ServicesDefault' Value='{79A115C9-B133-4891-9E7B-242509DAD272}' Type='string'/>
+ <RegistryValue Id='ServicesName' Name='Name' Value='MySQL Provider Object Factory' Type='string'/>
+ </RegistryKey>
+
+ <!--Installed Products section-->
+ <RegistryKey Id='InstalledProducts' Root='HKLM'
+ Key='SOFTWARE\Microsoft\VisualStudio\$(var.vsRegPath)\InstalledProducts\[ProductName]'
+ Action='createAndRemoveOnUninstall'>
+ <RegistryValue Id='IPDefault' Value='[ProductName]' Type='string'/>
+ <RegistryValue Id='IPPackage' Name='Package' Value='{79A115C9-B133-4891-9E7B-242509DAD272}' Type='string'/>
+ <RegistryValue Id='IPUI' Name='UseInterface' Value='1' Type='integer'/>
+ </RegistryKey>
+
+ <!--Package section-->
+ <RegistryKey Id='Packages' Root='HKLM'
+ Key='SOFTWARE\Microsoft\VisualStudio\$(var.vsRegPath)\Packages\{79A115C9-B133-4891-9E7B-242509DAD272}'
+ Action='createAndRemoveOnUninstall'>
+ <RegistryValue Id='PackagesDefault' Value='[ProductName]' Type='string'/>
+ <RegistryValue Id='PackInProc' Name='InprocServer32' Value='[WindowsFolder]system32\mscoree.dll' Type='string'/>
+ <RegistryValue Id='PackClass' Name='Class' Value='MySql.Data.VisualStudio.MySqlDataProviderPackage' Type='string'/>
+ <RegistryValue Id='PackCodeBase' Name='CodeBase' Value='[INSTALLDIR]MySql.VisualStudio.dll' Type='string'/>
+ <RegistryValue Id='PackProdName' Name='ProductName' Value='MySQL Tools for Visual Studio' Type='string'/>
+ <RegistryValue Id='PackVer' Name='ProductVersion' Value='1.1' Type='string'/>
+ <RegistryValue Id='PackComp' Name='CompanyName' Value='MySQL AB c/o MySQL, Inc.' Type='string'/>
+ <RegistryValue Id='PackMin' Name='MinEdition' Value='standard' Type='string'/>
+ <RegistryValue Id='PackId' Name='ID' Value='100' Type='integer'/>
+ </RegistryKey>
+ </Component>
+ </Directory>
+ </DirectoryRef>
+
+ <Feature Id='VisualStudio' Display='8' Level='1' Title='Visual Studio Integration'
+ Description='DDEX and Server Explorer Integration'>
+ <ComponentRef Id='VStudio'/>
+ </Feature>
+
+ <Property Id='DEVENVINSTALLDIR'>
+ <RegistrySearch Id='VSInstallDir' Root='HKLM' Key='SOFTWARE\Microsoft\VisualStudio\8.0\Setup\VS'
+ Name='EnvironmentPath' Type='raw'/>
+ </Property>
+ <CustomAction Id="DevenvSetup" ExeCommand='/setup' Property="DEVENVINSTALLDIR" />
+
+ <InstallExecuteSequence>
+ <Custom Action='DevenvSetup' After='InstallFinalize' />
+ </InstallExecuteSequence>
+
+ </Fragment>
+</Wix>
+
+
| Thread |
|---|
| • Connector/NET commit: r661 - trunk/Installer | rburnett | 9 Apr |
