Windows Installer: added manual.pdf, renamed cppcheck.msi => cli.msi, renamed gui.msi => cppcheck.msi, fixes for upgrading
This commit is contained in:
parent
9bdf4502ed
commit
d7c708cbf4
|
@ -0,0 +1,43 @@
|
|||
<?xml version='1.0' encoding='windows-1252'?>
|
||||
<?define ProductName = "Cppcheck 1.38" ?>
|
||||
<?define ProductVersion = "1.38" ?>
|
||||
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
|
||||
<Product Name='$(var.ProductName)' Id='88DE59C3-7640-47A2-A047-7289807AE3BA' UpgradeCode='DDB850E4-F8DE-4290-BDF1-AC12475DEE80'
|
||||
Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='The Cppcheck team'>
|
||||
|
||||
<Package Id='*' Keywords='Installer' Description="$(var.ProductName) Setup"
|
||||
Comments='Cppcheck is a tool for static analysis of C/C++ code' Manufacturer='The Cppcheck team'
|
||||
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
|
||||
|
||||
<Media Id='1' Cabinet='Cppcheck.cab' EmbedCab='yes' DiskPrompt='CD-ROM 1' />
|
||||
<Property Id='DiskPrompt' Value='Cppcheck installation [1]' />
|
||||
|
||||
<Directory Id='TARGETDIR' Name='SourceDir'>
|
||||
<Directory Id='ProgramFilesFolder' Name='PFiles'>
|
||||
<Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
|
||||
<Component Id='Executable' Guid='E1435616-5041-4079-BC4B-C4805BEEDAF9'>
|
||||
<File Id='cppcheckexe' Name='cppcheck.exe' DiskId='1' Source='cppcheck.exe' KeyPath='yes' />
|
||||
</Component>
|
||||
<Component Id='Authors' Guid='DA54245B-7A5D-481B-A930-D2C9FDD95E19'>
|
||||
<File Id='authorstxt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
|
||||
</Component>
|
||||
<Component Id='Readme' Guid='4C111DD0-A84A-11DE-8A39-0800200C9A66'>
|
||||
<File Id='readmetxt' Name='readme.txt' DiskId='1' Source='..\readme.txt' KeyPath='yes' />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<Feature Id='Complete' Title='$(var.ProductName)' Description='The complete package.'
|
||||
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
|
||||
<Feature Id='MainProgram' Title='Command line interface' Description='Command line tool' Level='1'>
|
||||
<ComponentRef Id='Executable' />
|
||||
<ComponentRef Id='Authors' />
|
||||
<ComponentRef Id='Readme' />
|
||||
</Feature>
|
||||
</Feature>
|
||||
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
<UIRef Id="WixUI_InstallDir"/>
|
||||
</Product>
|
||||
</Wix>
|
|
@ -1,8 +1,7 @@
|
|||
<?xml version='1.0' encoding='windows-1252'?>
|
||||
<?define ProductName = "Cppcheck 1.38" ?>
|
||||
<?define ProductVersion = "1.38" ?>
|
||||
<?include productInfo.wxi ?>
|
||||
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
|
||||
<Product Name='$(var.ProductName)' Id='88DE59C3-7640-47A2-A047-7289807AE3BA' UpgradeCode='DDB850E4-F8DE-4290-BDF1-AC12475DEE80'
|
||||
<Product Name='$(var.ProductName)' Id='*' UpgradeCode='$(var.ProductUpgradeCode)'
|
||||
Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='The Cppcheck team'>
|
||||
|
||||
<Package Id='*' Keywords='Installer' Description="$(var.ProductName) Setup"
|
||||
|
@ -14,15 +13,40 @@
|
|||
|
||||
<Directory Id='TARGETDIR' Name='SourceDir'>
|
||||
<Directory Id='ProgramFilesFolder' Name='PFiles'>
|
||||
<Directory Id='INSTALLDIR' Name='$(var.ProductName)'>
|
||||
<Component Id='Executable' Guid='E1435616-5041-4079-BC4B-C4805BEEDAF9'>
|
||||
<File Id='cppcheckexe' Name='cppcheck.exe' DiskId='1' Source='cppcheck.exe' KeyPath='yes' />
|
||||
<Directory Id='INSTALLDIR' Name='$(var.ProductNameShort)'>
|
||||
<Component Id='cppcheck.exe' Guid='$(var.cppcheckGUID)'>
|
||||
<File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='cppcheck.exe' KeyPath='yes' />
|
||||
<Environment Id='UpdatePath' Name='PATH' Action='set' System='yes' Part='last' Value='[INSTALLDIR]' />
|
||||
</Component>
|
||||
<Component Id='Authors' Guid='DA54245B-7A5D-481B-A930-D2C9FDD95E19'>
|
||||
<File Id='authorstxt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
|
||||
<Component Id='gui.exe' DiskId='1' Guid='$(var.guiGUID)'>
|
||||
<File Id='gui.exe' Name='gui.exe' Source='gui.exe' KeyPath='yes'>
|
||||
<Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name="Cppcheck"
|
||||
WorkingDirectory='INSTALLDIR' Icon="gui.exe" IconIndex="0" Advertise="yes" />
|
||||
</File>
|
||||
<File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' />
|
||||
<File Id='qtcore4dll' Name='qtcore4.dll' Source='qtcore4.dll' />
|
||||
<File Id='qtgui4dll' Name='qtgui4.dll' Source='qtgui4.dll' />
|
||||
<File Id='qtxml4dll' Name='qtxml4.dll' Source='qtxml4.dll' />
|
||||
</Component>
|
||||
<Component Id='Readme' Guid='4C111DD0-A84A-11DE-8A39-0800200C9A66'>
|
||||
<File Id='readmetxt' Name='readme.txt' DiskId='1' Source='..\readme.txt' KeyPath='yes' />
|
||||
<Component Id='authors.txt' Guid='*'>
|
||||
<File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
|
||||
</Component>
|
||||
<Component Id='readme.txt' Guid='*'>
|
||||
<File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' KeyPath='yes' />
|
||||
</Component>
|
||||
<Component Id='manual.pdf' Guid='*'>
|
||||
<File Id='manual.pdf' Name='manual.pdf' DiskId='1' Source='manual.pdf' KeyPath='yes'>
|
||||
<Shortcut Id='startmenuManual' Directory="ProgramMenuDir" Name="Manual" Advertise="yes" />
|
||||
</File>
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<Directory Id='ProgramMenuFolder' Name='Programs' >
|
||||
<Directory Id='ProgramMenuDir' Name='$(var.ProductName)'>
|
||||
<Component Id='ProgramMenuDir' Guid='*'>
|
||||
<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
|
||||
<RegistryValue Root='HKCU' Key='Software\Cppcheck\$(var.ProductName)' Type='string' Value='' KeyPath='yes' />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
@ -31,13 +55,31 @@
|
|||
<Feature Id='Complete' Title='$(var.ProductName)' Description='The complete package.'
|
||||
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
|
||||
<Feature Id='MainProgram' Title='Command line interface' Description='Command line tool' Level='1'>
|
||||
<ComponentRef Id='Executable' />
|
||||
<ComponentRef Id='Authors' />
|
||||
<ComponentRef Id='Readme' />
|
||||
<ComponentRef Id='cppcheck.exe' />
|
||||
<ComponentRef Id='gui.exe' />
|
||||
<ComponentRef Id='authors.txt' />
|
||||
<ComponentRef Id='readme.txt' />
|
||||
<ComponentRef Id='manual.pdf' />
|
||||
<ComponentRef Id='ProgramMenuDir' />
|
||||
</Feature>
|
||||
</Feature>
|
||||
|
||||
<Upgrade Id='$(var.ProductUpgradeCode)'>
|
||||
<UpgradeVersion OnlyDetect='no'
|
||||
Property='OLDERVERSIONFOUND'
|
||||
Minimum='0.0.0'
|
||||
IncludeMinimum='yes'
|
||||
Maximum='$(var.ProductVersion)'
|
||||
IncludeMaximum='no' />
|
||||
</Upgrade>
|
||||
|
||||
<InstallExecuteSequence>
|
||||
<RemoveExistingProducts After="InstallFinalize">OLDERVERSIONFOUND</RemoveExistingProducts>
|
||||
</InstallExecuteSequence>
|
||||
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
<UIRef Id="WixUI_InstallDir"/>
|
||||
|
||||
<Icon Id='gui.exe' SourceFile='gui.exe' />
|
||||
</Product>
|
||||
</Wix>
|
||||
|
|
|
@ -1,66 +0,0 @@
|
|||
<?xml version='1.0' encoding='windows-1252'?>
|
||||
<?include productInfo.wxi ?>
|
||||
<Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
|
||||
<Product Name='$(var.ProductName)' Id='$(var.ProductGUID)' UpgradeCode='$(var.ProductUpgradeCode)'
|
||||
Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='The Cppcheck team'>
|
||||
|
||||
<Package Id='*' Keywords='Installer' Description="$(var.ProductName) Setup"
|
||||
Comments='Cppcheck is a tool for static analysis of C/C++ code' Manufacturer='The Cppcheck team'
|
||||
InstallerVersion='100' Languages='1033' Compressed='yes' SummaryCodepage='1252' />
|
||||
|
||||
<Media Id='1' Cabinet='Cppcheck.cab' EmbedCab='yes' DiskPrompt='CD-ROM 1' />
|
||||
<Property Id='DiskPrompt' Value='Cppcheck installation [1]' />
|
||||
|
||||
<Directory Id='TARGETDIR' Name='SourceDir'>
|
||||
<Directory Id='ProgramFilesFolder' Name='PFiles'>
|
||||
<Directory Id='INSTALLDIR' Name='$(var.ProductNameShort)'>
|
||||
<Component Id='cppcheck.exe' Guid='$(var.cppcheckGUID)'>
|
||||
<File Id='cppcheck.exe' Name='cppcheck.exe' DiskId='1' Source='cppcheck.exe' KeyPath='yes' />
|
||||
<Environment Id='UpdatePath' Name='PATH' Action='set' System='yes' Part='last' Value='[INSTALLDIR]' />
|
||||
</Component>
|
||||
<Component Id='gui.exe' DiskId='1' Guid='$(var.guiGUID)'>
|
||||
<File Id='gui.exe' Name='gui.exe' Source='gui.exe' KeyPath='yes'>
|
||||
<Shortcut Id='startmenuGui' Directory="ProgramMenuDir" Name="Cppcheck"
|
||||
WorkingDirectory='INSTALLDIR' Icon="gui.exe" IconIndex="0" Advertise="yes" />
|
||||
</File>
|
||||
<File Id='mingwm10dll' Name='mingwm10.dll' Source='mingwm10.dll' />
|
||||
<File Id='qtcore4dll' Name='qtcore4.dll' Source='qtcore4.dll' />
|
||||
<File Id='qtgui4dll' Name='qtgui4.dll' Source='qtgui4.dll' />
|
||||
<File Id='qtxml4dll' Name='qtxml4.dll' Source='qtxml4.dll' />
|
||||
</Component>
|
||||
<Component Id='authors.txt' Guid='*'>
|
||||
<File Id='authors.txt' Name='authors.txt' DiskId='1' Source='..\authors' KeyPath='yes' />
|
||||
</Component>
|
||||
<Component Id='readme.txt' Guid='*'>
|
||||
<File Id='readme.txt' Name='readme.txt' DiskId='1' Source='..\readme.txt' KeyPath='yes' />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<Directory Id='ProgramMenuFolder' Name='Programs' >
|
||||
<Directory Id='ProgramMenuDir' Name='$(var.ProductName)'>
|
||||
<Component Id='ProgramMenuDir' Guid='*'>
|
||||
<RemoveFolder Id='ProgramMenuDir' On='uninstall' />
|
||||
<RegistryValue Root='HKCU' Key='Software\Cppcheck\$(var.ProductName)' Type='string' Value='' KeyPath='yes' />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
||||
<Feature Id='Complete' Title='$(var.ProductName)' Description='The complete package.'
|
||||
Display='expand' Level='1' ConfigurableDirectory='INSTALLDIR' >
|
||||
<Feature Id='MainProgram' Title='Command line interface' Description='Command line tool' Level='1'>
|
||||
<ComponentRef Id='cppcheck.exe' />
|
||||
<ComponentRef Id='gui.exe' />
|
||||
<ComponentRef Id='authors.txt' />
|
||||
<ComponentRef Id='readme.txt' />
|
||||
<ComponentRef Id='ProgramMenuDir' />
|
||||
</Feature>
|
||||
</Feature>
|
||||
|
||||
<Property Id="WIXUI_INSTALLDIR" Value="INSTALLDIR" />
|
||||
<UIRef Id="WixUI_InstallDir"/>
|
||||
|
||||
<Icon Id='gui.exe' SourceFile='gui.exe' />
|
||||
</Product>
|
||||
</Wix>
|
|
@ -1,10 +1,10 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Include>
|
||||
<?define ProductName = "Cppcheck 1.38" ?>
|
||||
<?define ProductName = "Cppcheck 1.39" ?>
|
||||
<?define ProductNameShort = "Cppcheck" ?>
|
||||
<?define ProductVersion = "1.38" ?>
|
||||
<?define ProductVersion = "1.39.0" ?>
|
||||
<?define ProductGUID = "{7214EC4C-8F10-4E56-8E99-0B9908E68774}" ?>
|
||||
<?define ProductUpgradeCode = "{7E94124C-1CD1-433F-9423-4614E52300DD}" ?>
|
||||
<?define cppcheckGUID = "27ef2704-6eea-42c0-ae63-dd586bc02170" ?>
|
||||
<?define guiGUID = "b25b7929-c235-4ff3-ab3b-b0851b2acdac" ?>
|
||||
<?define cppcheckGUID = "1c31dd76-07fa-4420-b9b5-5463742d6a48" ?>
|
||||
<?define guiGUID = "4102893e-5237-4011-9d70-7d9067623372" ?>
|
||||
</Include>
|
||||
|
|
Loading…
Reference in New Issue