#At file:///D:/bzr-connector-net/6.1/ based on revid:reggie.burnett@stripped
723 Reggie Burnett 2009-08-03
fixing svn merge junk
removed:
Installer/register.cmd
Installer/registration.wxs
=== removed file 'Installer/register.cmd'
=== removed file 'Installer/register.cmd'
--- a/Installer/register.cmd 2009-06-01 18:15:41 +0000
+++ b/Installer/register.cmd 1970-01-01 00:00:00 +0000
@@ -1,39 +0,0 @@
-@echo off
-
-REM Make sure we are called with a version
-IF [%1] == [] GOTO Usage
-
-REM Make sure our files are ready
-IF NOT EXIST MySql.Data\provider\bin\debug\mysql.data.dll GOTO NOTREADY
-IF NOT EXIST MySql.Web\providers\bin\debug\mysql.web.dll GOTO NOTREADY
-IF NOT EXIST mysql.visualstudio\bin\debug\mysql.visualstudio.dll GOTO NOTREADY
-IF NOT %1 == 2005 AND NOT EXIST MySql.Data.Entity\provider\bin\debug\mysql.data.entity.dll GOTO NOTREADY
-
-REM Unregister our assemblies (this will work if they are not registered)
-gacutil /u mysql.data
-gacutil /u mysql.web
-gacutil /u mysql.data.entity
-
-REM Now register the core assembly
-gacutil /i MySql.Data\provider\bin\debug\mysql.data.dll
-installutil mysql.data\provider\bin\debug\mysql.data.dll
-
-REM Register web assembly
-gacutil /i MySql.Web\providers\bin\debug\mysql.web.dll
-installutil mysql.web\providers\bin\debug\mysql.web.dll
-
-REM If we are not on 2005 then register the entity assembly
-if NOT %1 == 2005 gacutil /i MySql.Data.Entity\provider\bin\debug\mysql.data.entity.dll
-
-REm Now register the visual studio bits
-set cmd=version=VS%1 debug=true ranu=true
-if %1 == 2005 SET cmd=version=VS2005 debug=true
-installer\binary\globalinstaller mysql.visualstudio\bin\debug\mysql.visualstudio.dll %cmd%
-EXIT /B 0
-
-:NOTREADY
-ECHO some files are not ready
-EXIT /B 1
-
-:USAGE
-ECHO version missing
\ No newline at end of file
=== removed file 'Installer/registration.wxs'
--- a/Installer/registration.wxs 2009-06-12 16:53:56 +0000
+++ b/Installer/registration.wxs 1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-<?xml version='1.0' encoding='utf-8' ?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
- xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
- <!-- Define the servicetag and offline regirations files. -->
- <Fragment Id="RegistrationFragment">
- <Property Id='STCLIENT'>
- <DirectorySearch Path='[ProgramFilesFolder]\Sun\servicetag' Depth='1' Id='FindSTClient'>
- <FileSearch Name='stclient.exe' />
- </DirectorySearch>
- </Property>
- <Property Id='WindowsVerName' Value='Unk' />
- <Property Id='WindowsVerSP' Value=' '/>
- <Property Id='WMIQuery' Value='Set via CustomActions' />
- <Property Id='NewURN' Value='Set via CustomActions' />
- <Property Id='InstanceUrn' Value=' ' />
- <Property Id='RegistryUrn' Value=' ' />
- <Property Id="RegisterServer">1</Property>
-
- <Icon Id='SunReg.exe' src='./registration/webpage.ico' />
- <!-- WiX Query WMI Custom Action DLL Definition -->
- <Binary Id='mysqlca' SourceFile='./registration/mysql_ca.dll' />
-
- <DirectoryRef Id='INSTALLDIR'>
- <Component Id='Registration' Guid='F3F8CC64-6169-4b23-9972-9C56855AF39A'>
- <File Id='RegisterSVCTag' Name='register.htm' Source='./registration/register.htm' DiskId='1'>
- <Shortcut Id='RegisterSVCTag.Shortcut' Directory='ShortCutDir' Name='Register'
- LongName='SunInventory Registration'
- Description='SunInventory Registration'
- Icon='SunReg.exe' IconIndex='0' />
- </File>
- <File Id='XmlSettings' Name='svctag.xml' Source='./registration/svctag.xml' DiskId='1' />
- <File Id='RegisterLoginHeader' Name='loginhdr.jpg' Source='./registration/loginhdr.jpg' DiskId='1' />
- <util:XmlFile Id='XmlSettings1' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[%COMPUTERNAME]' ElementPath='//registration_data/environment/hostname' Sequence='1' />
- <util:XmlFile Id='XmlSettings2' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[%OS]' ElementPath='//registration_data/environment/osName' Sequence='2' />
- <util:XmlFile Id='XmlSettings3' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[WindowsVerName] [WindowsVerSP] ([VersionNT].[WindowsBuild])' ElementPath='//registration_data/environment/osVersion' Sequence='3' />
- <util:XmlFile Id='XmlSettings4' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[%PROCESSOR_ARCHITECTURE]' ElementPath='//registration_data/environment/osArchitecture' Sequence='4' />
- <util:XmlFile Id='XmlSettings5' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ComputerSystem_Model]' ElementPath='//registration_data/environment/systemModel' Sequence='5' />
- <util:XmlFile Id='XmlSettings6' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ComputerSystem_Manufacturer]' ElementPath='//registration_data/environment/systemManufacturer' Sequence='6' />
- <util:XmlFile Id='XmlSettings7' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[Processor_Manufacturer]' ElementPath='//registration_data/environment/cpuManufacturer' Sequence='7' />
- <util:XmlFile Id='XmlSettings8' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[BIOS_SerialNumber]' ElementPath='//registration_data/environment/serialNumber' Sequence='8' />
- <util:XmlFile Id='XmlSettings9' File='[INSTALLDIR]svctag.xml' Action='setValue' Name='urn' Value='[RegistryUrn]' ElementPath='//registration_data/registry' Sequence='9' />
- <util:XmlFile Id='XmlSettings10' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[InstanceUrn]' ElementPath='//registration_data/registry/service_tag/instance_urn' Sequence='10' />
- <util:XmlFile Id='XmlSettings11' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ProductName]' ElementPath='//registration_data/registry/service_tag/product_name' Sequence='11' />
- <util:XmlFile Id='XmlSettings12' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ProductVersion]' ElementPath='//registration_data/registry/service_tag/product_version' Sequence='12' />
- <util:XmlFile Id='XmlSettings13' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[ProductURN]' ElementPath='//registration_data/registry/service_tag/product_urn' Sequence='13' />
- <util:XmlFile Id='XmlSettings14' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='N/A' ElementPath='//registration_data/registry/service_tag/product_parent_urn' Sequence='14' />
- <util:XmlFile Id='XmlSettings15' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='license=gpl' ElementPath='//registration_data/registry/service_tag/product_defined_inst_id' Sequence='15' />
- <util:XmlFile Id='XmlSettings16' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[Manufacturer]' ElementPath='//registration_data/registry/service_tag/product_vendor' Sequence='16' />
- <util:XmlFile Id='XmlSettings17' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[SysDateTime]' ElementPath='//registration_data/registry/service_tag/timestamp' Sequence='17' />
- <util:XmlFile Id='XmlSettings18' File='[INSTALLDIR]svctag.xml' Action='setValue' Value='[RegistrationPackage].msi' ElementPath='//registration_data/registry/service_tag/source' Sequence='18' />
- </Component>
- </DirectoryRef>
-
- <!-- Now we define our custom actions -->
- <!-- OS String Generation -->
- <CustomAction Id='SetWin2K' Property='WindowsVerName' Value='Microsoft Windows 2000' />
- <CustomAction Id='SetWinXP' Property='WindowsVerName' Value='Microsoft Windows XP' />
- <CustomAction Id='SetWin2K3' Property='WindowsVerName' Value='Microsoft Windows 2003' />
- <CustomAction Id='SetWinVista' Property='WindowsVerName' Value='Microsoft Windows Vista' />
- <CustomAction Id='SetWin2K8' Property='WindowsVerName' Value='Microsoft Windows 2008' />
- <CustomAction Id='SetSP' Property='WindowsVerSP' Value='SP([ServicePackLevel])' />
- <!-- WMI Queries -->
- <CustomAction Id='SetCPUManufactQuery' Property='WMIQuery' Value='SELECT Manufacturer FROM Win32_Processor' />
- <CustomAction Id='QWMICPUMan' BinaryKey='mysqlca' DllEntry='CAQueryWMI' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetSerialNumberQuery' Property='WMIQuery' Value='SELECT SerialNumber FROM Win32_BIOS' />
- <CustomAction Id='QWMISerNum' BinaryKey='mysqlca' DllEntry='CAQueryWMI' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetMakeModelQuery' Property='WMIQuery' Value='SELECT Model, Manufacturer FROM Win32_ComputerSystem' />
- <CustomAction Id='QWMIMakMod' BinaryKey='mysqlca' DllEntry='CAQueryWMI' Execute='immediate' Return='ignore' />
- <!-- Generate URNs -->
- <CustomAction Id='GenInstanceUrn' BinaryKey='mysqlca' DllEntry='CACreateURN' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetInstanceUrn' Property='InstanceUrn' Value='[NewURN]' />
- <CustomAction Id='GenRegistryUrn' BinaryKey='mysqlca' DllEntry='CACreateURN' Execute='immediate' Return='ignore' />
- <CustomAction Id='SetRegistryUrn' Property='RegistryUrn' Value='[NewURN]' />
- <!-- Set registration Date Time -->
- <CustomAction Id='SetDateTime' BinaryKey='mysqlca' DllEntry='CASetRegDateTime' Execute='immediate' Return='check' />
- <!-- Update Offline Registration -->
- <CustomAction Id="UpdateRegistration.SetProperty" Return="check" Property="UpdateRegistration" Value="[INSTALLDIR]" />
- <CustomAction Id="UpdateRegistration" BinaryKey="mysqlca" DllEntry="CAUpdateOfflineReg" Execute="deferred" Return="ignore" HideTarget="yes" Impersonate="no"/>
- <!-- POST Registration to RegistrationRelay Service if no STCLIENT -->
- <CustomAction Id="PostRegistration.SetProperty" Return="check" Property="PostRegistration" Value="[INSTALLDIR]" />
- <CustomAction Id="PostRegistration" BinaryKey="mysqlca" DllEntry="CASendServiceTag" Execute="immediate" Return="ignore" HideTarget="yes"/>
- <!-- Use Service Tag Client Registration -->
- <CustomAction Id='STClientRegister.SetProperty' Property='QtExecCmdLine'
- Value='"[STCLIENT]" -a -i [InstanceUrn] -p "[ProductName]" -e [ProductVersion] -t [ProductURN] -S [RegistrationPackage].msi -F N/A -P N/A -m "[Manufacturer]" -A [%PROCESSOR_ARCHITECTURE] -z N/A -I -1' />
- <CustomAction Id='STClientRegister' BinaryKey='WixCA' DllEntry='CAQuietExec' Execute='immediate' Return='check'/>
-
- <InstallExecuteSequence>
- <!-- Formatted ENV variables -->
- <Custom Action='SetWin2K' After='InstallInitialize'>(VersionNT = 500) AND (WindowsBuild = 2195)</Custom>
- <Custom Action='SetWinXP' After='SetWin2K'>(VersionNT = 501) AND (WindowsBuild = 2600)</Custom>
- <Custom Action='SetWin2K3' After='SetWinXP'>(VersionNT = 502) AND (WindowsBuild = 3790)</Custom>
- <Custom Action='SetWinVista' After='SetWin2K3'>(VersionNT = 600) AND (WindowsBuild = 6000)</Custom>
- <Custom Action='SetWin2K8' After='SetWinVista'>(VersionNT = 600) AND (WindowsBuild = 6001)</Custom>
- <Custom Action='SetSP' After='SetWin2K8'>ServicePackLevel</Custom>
- <!-- WMI Queries -->
- <Custom Action='SetCPUManufactQuery' After='SetSP' />
- <Custom Action='QWMICPUMan' After='SetCPUManufactQuery' />
- <Custom Action='SetSerialNumberQuery' After= 'QWMICPUMan' />
- <Custom Action='QWMISerNum' After='SetSerialNumberQuery' />
- <Custom Action='SetMakeModelQuery' After= 'QWMISerNum' />
- <Custom Action='QWMIMakMod' After='SetMakeModelQuery' />
- <!-- Local URNs -->
- <Custom Action='GenInstanceUrn' After='QWMIMakMod' />
- <Custom Action='SetInstanceUrn' After='GenInstanceUrn' />
- <Custom Action='GenRegistryUrn' After='SetInstanceUrn' />
- <Custom Action='SetRegistryUrn' After='GenRegistryUrn' />
- <!-- Date/Time -->
- <Custom Action='SetDateTime' After='SetRegistryUrn' />
- <!-- Update Offline Registration -->
- <Custom Action='UpdateRegistration.SetProperty' After='PublishProduct'>NOT Installed And ACTION="INSTALL"</Custom>
- <Custom Action='UpdateRegistration' After='UpdateRegistration.SetProperty'>NOT Installed And ACTION="INSTALL"</Custom>
- <!-- The POST Registration CustomAction is triggered by the UI's Finish button in ui.wxs. -->
- <!-- Use local servicetag client if available -->
- <Custom Action='STClientRegister.SetProperty' Before='STClientRegister'>STCLIENT And NOT Installed And ACTION="INSTALL"</Custom>
- <Custom Action='STClientRegister' Before='InstallFinalize'>STCLIENT And NOT Installed And ACTION="INSTALL"</Custom>
- </InstallExecuteSequence>
- </Fragment>
-</Wix>
Attachment: [text/bzr-bundle] bzr/reggie.burnett@sun.com-20090803173408-5z81mfh0olo6zkar.bundle
| Thread |
|---|
| • bzr commit into connector-net-6.1 branch (reggie.burnett:723) | Reggie Burnett | 3 Aug |
