ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: windows installer update

Browse Source 
removed appsettings from installer
This commit is contained in:
Manuel Dobusch
2016-12-13 16:51:44 +01:00
parent c00ebb6729
commit 68a2cb08bc
3 changed files with 1 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/windows/wixSetup/appDataDir.wxs
+1 -8
View File
@@ -1,14 +1,7 @@
<?xml version='1.0'?> <?xml version='1.0'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Fragment> <Fragment>
<DirectoryRef Id='CoatiAppData'> <DirectoryRef Id='CoatiAppData'>
<Component Id="ApplicationSettingsXml" Guid="C8883C69-3123-4382-BDB1-771C206EE461">
<RegistryKey Action="none" Key="Software\[Manufacturer]\[ProductName]\coatiApplicationSettings" Root="HKCU" >
<RegistryValue Type="integer" Value="1" KeyPath="yes" />
</RegistryKey>
<File Id='ApplicationSettings' Name='ApplicationSettings.xml' DiskId='1' Source='./../../../bin/app/user/ApplicationSettings_for_package.xml' KeyPath='no' />
</Component>
<Directory Id="SampleProjects" Name="projects"> <Directory Id="SampleProjects" Name="projects">
<Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24"> <Component Id="SampleProjects" Guid="12F6C3BE-CE83-441A-8A5D-E49EA1483F24">
deployment/windows/wixSetup/coati.wxs
-2
View File
@@ -283,7 +283,6 @@
<ComponentRef Id='CoatiSoftwareAppDataDummy'/> <ComponentRef Id='CoatiSoftwareAppDataDummy'/>
<ComponentRef Id='WindowSettingsIni'/> <ComponentRef Id='WindowSettingsIni'/>
<ComponentRef Id='ApplicationSettingsXml'/>
<!-- </Feature> --> <!-- </Feature> -->
<!-- Sample Projects for AddData Folder --> <!-- Sample Projects for AddData Folder -->
@@ -328,7 +327,6 @@
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action='AlreadyUpdated' After='FindRelatedProducts'>SELFFOUND</Custom> <Custom Action='AlreadyUpdated' After='FindRelatedProducts'>SELFFOUND</Custom>
<Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom> <Custom Action='NoDowngrade' After='FindRelatedProducts'>NEWERFOUND</Custom>
<Custom Action='SetupAppSettings' After='InstallFiles'>NOT Installed AND NOT PATCH</Custom>
<Custom Action='UninstallRemoveLogFolder' After='UnpublishComponents'>(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> <Custom Action='UninstallRemoveLogFolder' After='UnpublishComponents'>(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
</InstallExecuteSequence> </InstallExecuteSequence>
deployment/windows/wixSetup/customActions.wxs
-4
View File
@@ -1,10 +1,6 @@
<?xml version='1.0'?> <?xml version='1.0'?>
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'> <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
<Fragment> <Fragment>
<CustomAction Id='SetupAppSettings' BinaryKey='SetupAppSettingsBinary' DllEntry='Main' Execute='commit' Return='check'/>
<Binary Id='SetupAppSettingsBinary' SourceFile='build/SetupAppSettings.CA.dll'/>
<CustomAction Id='UninstallRemoveLogFolder' BinaryKey='UninstallRemoveLogFolderBinary' DllEntry='Main' Execute='commit' Return='check'/> <CustomAction Id='UninstallRemoveLogFolder' BinaryKey='UninstallRemoveLogFolderBinary' DllEntry='Main' Execute='commit' Return='check'/>
<Binary Id='UninstallRemoveLogFolderBinary' SourceFile='build/UninstallRemoveLogFolder.CA.dll'/> <Binary Id='UninstallRemoveLogFolderBinary' SourceFile='build/UninstallRemoveLogFolder.CA.dll'/>
</Fragment> </Fragment>