commit e6f66b2244932d3131851c6b02f77a2493423248
parent 79cdc49778dbb1066a95f168a9544fb472021b76
Author: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Thu, 24 Mar 2011 22:51:32 +0800
Don't hardcode the version in spek.wxs and web/version
Diffstat:
4 files changed, 108 insertions(+), 0 deletions(-)
diff --git a/.gitignore b/.gitignore
@@ -18,6 +18,7 @@ configure
data/spek.desktop
data/spek.desktop.in
depcomp
+dist/win/spek.wxs
install-sh
intltool-extract.in
intltool-merge.in
@@ -42,4 +43,5 @@ src/*.stamp
src/spek
stamp-h1
test*
+web/version
xmldocs.make
diff --git a/configure.ac b/configure.ac
@@ -54,10 +54,12 @@ AC_CONFIG_FILES([
data/icons/32x32/Makefile
data/icons/48x48/Makefile
data/icons/scalable/Makefile
+ dist/win/spek.wxs
man/Makefile
man/spek.1
po/Makefile.in
src/Makefile
vapi/Makefile
+ web/version
])
AC_OUTPUT
\ No newline at end of file
diff --git a/dist/win/spek.wxs.in b/dist/win/spek.wxs.in
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?define ProductName = "Spek" ?>
+<?define Manufacturer = "Spek Project" ?>
+<?define ProductVersion = "@VERSION@.0" ?>
+<?define UpgradeCode = "46D51DDF-5749-45E2-818B-1ACADF21C0D9" ?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+ <Product Id="*" Name="$(var.ProductName)" Language="0"
+ Version="$(var.ProductVersion)" Manufacturer="$(var.Manufacturer)" UpgradeCode="$(var.UpgradeCode)">
+ <Package InstallerVersion="301" Compressed="yes" Platform="x86" InstallScope="perMachine"/>
+ <Media Id="1" Cabinet="spek.cab" EmbedCab="yes" />
+ <Property Id="ARPPRODUCTICON" Value="ProgramIcon" />
+ <Property Id="ARPHELPLINK" Value="http://www.spek-project.org/" />
+ <Property Id="WIXUI_INSTALLDIR" Value="INSTALLLOCATION" />
+ <UIRef Id="WixUI_InstallDir" />
+ <UIRef Id="WixUI_ErrorProgressText" />
+ <WixVariable Id="WixUILicenseRtf" Value="LICENSE.rtf" />
+ <WixVariable Id="WixUIBannerBmp" Value="banner.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="dialog.bmp" />
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion Minimum="$(var.ProductVersion)" OnlyDetect="yes" Property="NEWVERSIONDETECTED" />
+ <UpgradeVersion Minimum="0.0.0" IncludeMinimum="yes" Maximum="$(var.ProductVersion)" IncludeMaximum="no" Property="OLDERVERSIONBEINGUPGRADED" />
+ </Upgrade>
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallInitialize" />
+ </InstallExecuteSequence>
+ <CustomAction Id="StartAppOnExit" FileKey="spek.exe" ExeCommand="" Execute="immediate" Impersonate ="yes" Return="asyncNoWait" />
+ <Property Id="WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT" Value="Launch Spek when setup exits" />
+ <UI>
+ <Publish Dialog="ExitDialog" Control="Finish" Order="1" Event="DoAction" Value="StartAppOnExit">WIXUI_EXITDIALOGOPTIONALCHECKBOX = 1 and NOT Installed</Publish>
+ </UI>
+ <Icon Id="ProgramIcon" SourceFile="spek.ico"/>
+ <DirectoryRef Id="ProgramMenuSubfolder">
+ <Component Id="StartMenuShortcut" Guid="165DF12B-D970-49BC-B07B-880B62ABC308">
+ <Shortcut Id="StartMenuShortcut" Name="$(var.ProductName)" Icon="ProgramIcon" Target="[INSTALLLOCATION]bin\spek.exe" WorkingDirectory="bin"/>
+ <Shortcut Id="UninstallProduct" Name="Uninstall $(var.ProductName)" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]"/>
+ <RemoveFolder Id="ProgramMenuSubfolder" On="uninstall"/>
+ <RegistryValue Root="HKCU" Key="Software\$(var.Manufacturer)\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+ </Component>
+ </DirectoryRef>
+ <DirectoryRef Id="DesktopFolder">
+ <Component Id="DesktopShortcut" Guid="ACCE1EDB-87E3-4FE5-B2BF-93113E767381">
+ <Shortcut Id="DesktopShortcut" Name="$(var.ProductName)" Icon="ProgramIcon" Target="[INSTALLLOCATION]bin\spek.exe" WorkingDirectory="bin"/>
+ <RegistryValue Root="HKCU" Key="Software\$(var.Manufacturer)\$(var.ProductName)" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
+ </Component>
+ </DirectoryRef>
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="ProgramMenuFolder">
+ <Directory Id="ProgramMenuSubfolder" Name="$(var.ProductName)"/>
+ </Directory>
+ <Directory Id="DesktopFolder" />
+ <Directory Id="ProgramFilesFolder">
+ <Directory Id="INSTALLLOCATION" Name="$(var.ProductName)">
+ <Component Id="Main" Guid="CD5121AD-F799-4796-9DB8-0C24CA0A4C8E">
+ <File Id="LICENSE.rtf" Name="LICENSE.rtf" Source="LICENSE.rtf" />
+ <File Id="spek.ico" Name="spek.ico" Source="spek.ico" />
+ <!-- Capabilities keys for Vista/7 "Set Program Access and Defaults" -->
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Spek\Capabilities" Name="ApplicationDescription" Value="Acoustic Spectrum Analyser" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Spek\Capabilities" Name="ApplicationIcon" Value="[#spek.ico]" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Spek\Capabilities" Name="ApplicationName" Value="Spek" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Spek\Capabilities\DefaultIcon" Value="[#spek.ico]" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Spek\Capabilities\shell\open\command" Value=""[INSTALLLOCATION]bin\spek.exe" "%1"" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\RegisteredApplications" Name="Spek" Value="SOFTWARE\Spek\Capabilities" Type="string" />
+ <!-- App Paths to support Start,Run -> "spek" -->
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\spek.exe" Value="[INSTALLLOCATION]bin\spek.exe" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\spek.exe" Name="Path" Value="[INSTALLLOCATION]bin" Type="string" />
+ <!-- Extend to the "open with" list + Win7 jump menu pinning -->
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\spek.exe" Value="Acoustic Spectrum Analyser" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\spek.exe" Name="FriendlyAppName" Value="Spek" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\spek.exe\DefaultIcon" Value="[#spek.ico]" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\spek.exe\shell\open\command" Value=""[INSTALLLOCATION]bin\spek.exe" "%1"" Type="string" />
+ <!-- Spek.Audio class -->
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Spek.Audio" Value="Spek Audio File" KeyPath="yes" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Spek.Audio" Name="FriendlyTypeName" Value="Spek Audio File" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Spek.Audio\DefaultIcon" Value="[#spek.ico]" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Spek.Audio\shell" Value="open" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Spek.Audio\shell\open\command" Value=""[INSTALLLOCATION]bin\spek.exe" "%1"" Type="string" />
+ <!-- Associate with file extensions -->
+ <?foreach ext in "3gp;aac,aif;aifc;aiff;amr;awb;ape;au;dts;flac;gsm;m4a;m4p;mp3;mp4;mp+;mpc;mpp;oga;ogg;ra;ram;snd;wav;wma;wv"?>
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Spek\Capabilities\FileAssociations" Name=".$(var.ext)" Value="Spek.Audio" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\Applications\spek.exe\SupportedTypes" Name=".$(var.ext)" Value="" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\.$(var.ext)\OpenWithList\spek.exe" Value="" Type="string" />
+ <RegistryValue Root="HKLM" Key="SOFTWARE\Classes\.$(var.ext)\OpenWithProgids" Name="Spek.Audio" Value="" Type="string" />
+ <?endforeach?>
+ </Component>
+ <Directory Id="bin" Name="bin">
+ <Component Id="Spek" Guid="EC0CA007-EC9E-44E2-B9DE-AE91D3C8EF70">
+ <File Id="spek.exe" Name="spek.exe" Source="spek.exe" />
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+ <Feature Id="All" Title="$(var.ProductName)" Level="1">
+ <ComponentRef Id="Main" />
+ <ComponentRef Id="Spek" />
+ <ComponentGroupRef Id="Files" />
+ <ComponentRef Id="StartMenuShortcut" />
+ <ComponentRef Id="DesktopShortcut" />
+ </Feature>
+ </Product>
+</Wix>
+
diff --git a/web/version.in b/web/version.in
@@ -0,0 +1 @@
+@VERSION@
