Clean up the WiX XML a bit
This commit is contained in:
		
							
								
								
									
										40
									
								
								fiv.wxs.in
									
									
									
									
									
								
							
							
						
						
									
										40
									
								
								fiv.wxs.in
									
									
									
									
									
								
							@@ -35,32 +35,34 @@
 | 
			
		||||
		-->
 | 
			
		||||
 | 
			
		||||
		<Directory Id='TARGETDIR' Name='SourceDir'>
 | 
			
		||||
			<Directory Id='$(var.ProgramFilesFolder)' Name='Files'>
 | 
			
		||||
			<Directory Id='$(var.ProgramFilesFolder)'>
 | 
			
		||||
				<Directory Id='INSTALLDIR' Name='$(var.FullName)' />
 | 
			
		||||
			</Directory>
 | 
			
		||||
 | 
			
		||||
			<Directory Id='ProgramMenuFolder' Name='Programs'>
 | 
			
		||||
				<Directory Id='ProgramMenuDir' Name='$(var.FullName)'>
 | 
			
		||||
					<Component Id='ProgramMenuDir' Guid='*'>
 | 
			
		||||
						<Shortcut Id='ProgramsMenuShortcut'
 | 
			
		||||
							Name='@ProjectName@'
 | 
			
		||||
							Target='[INSTALLDIR]\fiv.exe'
 | 
			
		||||
							WorkingDirectory='INSTALLDIR'
 | 
			
		||||
							Arguments='"%USERPROFILE%"'
 | 
			
		||||
							Icon='fiv.ico' />
 | 
			
		||||
						<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
 | 
			
		||||
						<RegistryValue Root='HKCU'
 | 
			
		||||
							Key='Software\[Manufacturer]\[ProductName]'
 | 
			
		||||
							Type='string'
 | 
			
		||||
							Value=''
 | 
			
		||||
							KeyPath='yes' />
 | 
			
		||||
					</Component>
 | 
			
		||||
				</Directory>
 | 
			
		||||
			<Directory Id='ProgramMenuFolder'>
 | 
			
		||||
				<Directory Id='ProgramMenuDir' Name='$(var.FullName)' />
 | 
			
		||||
			</Directory>
 | 
			
		||||
 | 
			
		||||
			<Directory Id='DesktopFolder' Name='Desktop' />
 | 
			
		||||
			<Directory Id='DesktopFolder' />
 | 
			
		||||
		</Directory>
 | 
			
		||||
 | 
			
		||||
		<DirectoryRef Id='ProgramMenuDir'>
 | 
			
		||||
			<Component Id='ProgramMenuDir' Guid='*'>
 | 
			
		||||
				<Shortcut Id='ProgramsMenuShortcut'
 | 
			
		||||
					Name='@ProjectName@'
 | 
			
		||||
					Target='[INSTALLDIR]\fiv.exe'
 | 
			
		||||
					WorkingDirectory='INSTALLDIR'
 | 
			
		||||
					Arguments='"%USERPROFILE%"'
 | 
			
		||||
					Icon='fiv.ico' />
 | 
			
		||||
				<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
 | 
			
		||||
				<RegistryValue Root='HKCU'
 | 
			
		||||
					Key='Software\[Manufacturer]\[ProductName]'
 | 
			
		||||
					Type='string'
 | 
			
		||||
					Value=''
 | 
			
		||||
					KeyPath='yes' />
 | 
			
		||||
			</Component>
 | 
			
		||||
		</DirectoryRef>
 | 
			
		||||
 | 
			
		||||
		<Feature Id='Complete' Level='1'>
 | 
			
		||||
			<ComponentGroupRef Id='CG.fiv' />
 | 
			
		||||
			<ComponentRef Id='ProgramMenuDir' />
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user