1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Sergei Golubchik 2015-01-30 21:24:39 +01:00
commit a06624d61f
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
win/packaging/extra.wxs.in
View File

@ -460,7 +460,7 @@
<!-- Data directory with some reasonable security settings --> <!-- Data directory with some reasonable security settings -->
<Component Id="C.datadir" Guid="*" Directory="DATADIR"> <Component Id="C.datadir" Guid="*" Directory="DATADIR">
<RegistryValue Root='HKLM' <RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/> Name='DATADIR' Value='[DATADIR]' Type='string' KeyPath='yes'/>
<CreateFolder> <CreateFolder>
<util:PermissionEx User="[LogonUser]" GenericAll="yes" /> <util:PermissionEx User="[LogonUser]" GenericAll="yes" />
@ -472,7 +472,7 @@
<Component Id="C.service" Guid="*" Directory="DATADIR"> <Component Id="C.service" Guid="*" Directory="DATADIR">
<Condition>SERVICENAME</Condition> <Condition>SERVICENAME</Condition>
<RegistryValue Root='HKLM' <RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='SERVICENAME' Value='[SERVICENAME]' Type='string' KeyPath='yes'/> Name='SERVICENAME' Value='[SERVICENAME]' Type='string' KeyPath='yes'/>
<ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='both' Remove='uninstall' Wait='yes'/> <ServiceControl Id='DBInstanceServiceStop' Name='[SERVICENAME]' Stop='both' Remove='uninstall' Wait='yes'/>
<ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/> <ServiceControl Id='DBInstanceServiceStart' Name='[SERVICENAME]' Start='install' Wait='yes'/>
@ -481,7 +481,7 @@
<Component Id="C.myiniconfig" Guid="*" Directory="DATADIR"> <Component Id="C.myiniconfig" Guid="*" Directory="DATADIR">
<Condition>STDCONFIG</Condition> <Condition>STDCONFIG</Condition>
<RegistryValue Root='HKLM' <RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='STDCONFIG' Value='1' Type='string' KeyPath='yes'/> Name='STDCONFIG' Value='1' Type='string' KeyPath='yes'/>
<IniFile Id="Ini1" <IniFile Id="Ini1"
Action="createLine" Action="createLine"
@ -517,7 +517,7 @@
<Component Id="C.feedback" Guid="*" Directory="DATADIR"> <Component Id="C.feedback" Guid="*" Directory="DATADIR">
<Condition>FEEDBACK</Condition> <Condition>FEEDBACK</Condition>
<RegistryValue Root='HKLM' <RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/> Name='FEEDBACK' Value='1' Type='string' KeyPath='yes'/>
<IniFile Id="Ini5" <IniFile Id="Ini5"
Action="createLine" Action="createLine"
@ -531,7 +531,7 @@
<Component Id="C.utf8" Guid="*" Directory="DATADIR"> <Component Id="C.utf8" Guid="*" Directory="DATADIR">
<Condition>UTF8</Condition> <Condition>UTF8</Condition>
<RegistryValue Root='HKLM' <RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='UTF8' Value='1' Type='string' KeyPath='yes'/> Name='UTF8' Value='1' Type='string' KeyPath='yes'/>
<IniFile Id="Ini6" <IniFile Id="Ini6"
Action="createLine" Action="createLine"
@ -546,7 +546,7 @@
<Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'> <Component Id="C.serviceaccount.permission" Guid="*" Directory='DATADIR' Transitive='yes'>
<Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition> <Condition><![CDATA[SERVICENAME AND (VersionNT > 600)]]></Condition>
<RegistryValue Root='HKLM' <RegistryValue Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='servicepermission' Value='1' Type='string' KeyPath='yes'/> Name='servicepermission' Value='1' Type='string' KeyPath='yes'/>
<CreateFolder> <CreateFolder>
<util:PermissionEx User="NT SERVICE\[SERVICENAME]" GenericAll="yes" /> <util:PermissionEx User="NT SERVICE\[SERVICENAME]" GenericAll="yes" />
@ -785,7 +785,7 @@
<Feature Id='StoreInstallLocation' Level='1' Absent='disallow' Display='hidden'> <Feature Id='StoreInstallLocation' Level='1' Absent='disallow' Display='hidden'>
<Component Directory='INSTALLDIR' Guid='*' Id='C.storeinstalllocation'> <Component Directory='INSTALLDIR' Guid='*' Id='C.storeinstalllocation'>
<RegistryValue Root='HKLM' Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' <RegistryValue Root='HKLM' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='INSTALLDIR' Value='[INSTALLDIR]' Type='string' KeyPath='yes'/> Name='INSTALLDIR' Value='[INSTALLDIR]' Type='string' KeyPath='yes'/>
</Component> </Component>
</Feature> </Feature>
@ -794,7 +794,7 @@
<Property Id='$(var.STOREDVAR)' Secure='yes'> <Property Id='$(var.STOREDVAR)' Secure='yes'>
<RegistrySearch Id='$(var.STOREDVAR)Property' Root='HKLM' <RegistrySearch Id='$(var.STOREDVAR)Property' Root='HKLM'
Key='SOFTWARE\@MANUFACTURER@\@CPACK_WIX_PACKAGE_NAME@' Key='SOFTWARE\Monty Program AB\@CPACK_WIX_PACKAGE_NAME@'
Name='$(var.STOREDVAR)' Type='raw' /> Name='$(var.STOREDVAR)' Type='raw' />
</Property> </Property>
<CustomAction Id='SaveCmdLineValue_$(var.STOREDVAR)' Property='CMDLINE_$(var.STOREDVAR)' <CustomAction Id='SaveCmdLineValue_$(var.STOREDVAR)' Property='CMDLINE_$(var.STOREDVAR)'