From fa51a6fee8020657b33c5c5d33e5ed289f7d9303 Mon Sep 17 00:00:00 2001 From: "v.audacity" Date: Sat, 16 Oct 2010 08:22:09 +0000 Subject: [PATCH] (Bug 243, P2 - Default EQCurves.xml should be populated and added to Windows and Mac installers) Apparently "{pf}" does not get interpreted correctly in [Files] section. --- win/audacity.iss | 8 +- win/audacity_unicode.iss | 288 +++++++++++++++++++-------------------- 2 files changed, 148 insertions(+), 148 deletions(-) diff --git a/win/audacity.iss b/win/audacity.iss index 7f9c48345..70da84457 100644 --- a/win/audacity.iss +++ b/win/audacity.iss @@ -92,10 +92,10 @@ Source: "..\win\Release\wxmsw28_html_vc_custom.dll"; DestDir: "{app}"; Flags: ig ; it's easy to make the zip (and they match better). ; Subject to having resources available to do this, we build the executable with ; VS8, so need the VS8 runtime DLLs. -Source: "{pf}\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"; DestDir: "{app}"; Flags: ignoreversion -Source: "{pf}\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcm80.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{pf}\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcp80.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{pf}\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\Microsoft.VC80.CRT.manifest"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcm80.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcp80.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Microsoft Visual Studio 8\VC\redist\x86\Microsoft.VC80.CRT\msvcr80.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "..\win\Release\languages\*"; DestDir: "{app}\Languages\"; Flags: ignoreversion recursesubdirs Source: "..\win\Release\modules\*"; DestDir: "{app}\Modules\"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist diff --git a/win/audacity_unicode.iss b/win/audacity_unicode.iss index 3560a5959..3d24831cd 100644 --- a/win/audacity_unicode.iss +++ b/win/audacity_unicode.iss @@ -1,144 +1,144 @@ -; Script generated by the Inno Setup Script Wizard. -; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! - -[Setup] -; compiler-related directives -OutputBaseFilename=audacity-win-unicode-1.3.13 -SetupIconFile=audacity.ico - -WizardImageFile=audacity_InnoWizardImage.bmp -WizardSmallImageFile=audacity_InnoWizardSmallImage.bmp - -SolidCompression=yes - -; installer-related directives -AppName=Audacity 1.3 Beta (Unicode) -AppVerName=Audacity 1.3.13 (Unicode) -AppPublisher=Audacity Team -AppPublisherURL=http://audacity.sourceforge.net -AppSupportURL=http://audacity.sourceforge.net -AppUpdatesURL=http://audacity.sourceforge.net -ChangesAssociations=yes - -; For a beta release, e.g.: DefaultDirName={pf}\Audacity 1.3 Beta (Unicode) -; For a stable release: DefaultDirName={pf}\Audacity -DefaultDirName={pf}\Audacity 1.3 Beta (Unicode) - -; Always warn if dir exists, because we'll overwrite previous Audacity. -DirExistsWarning=yes -DisableProgramGroupPage=yes -UninstallDisplayIcon="{app}\audacity.exe" - -; No longer force them to accept the license, just display it. LicenseFile=..\LICENSE.txt -InfoBeforeFile=..\LICENSE.txt -InfoAfterFile=..\README.txt -; min versions: Win 95, Win 2000 - allow to run on non-Unicode Windows versions in case we ever support this. -MinVersion=4.0,5.0 - -[Languages] -Name: "english"; MessagesFile: "compiler:Default.isl" -Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl" -Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" -Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" -Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" -Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" -Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" -Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" -Name: "french"; MessagesFile: "compiler:Languages\French.isl" -Name: "german"; MessagesFile: "compiler:Languages\German.isl" -Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" -Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" -Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" -Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" -Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" -Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" -Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" -Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl" -Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" -Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" - -[Tasks] -Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:" -; No longer allow user to choose whether to associate AUP file type with Audacity. -; Name: associate_aup; Description: "&Associate Audacity project files"; GroupDescription: "Other tasks:"; Flags: checkedonce - - -[Files] -; Don't display in separate window, rather as InfoAfterFile. Source: "..\README.txt"; DestDir: "{app}"; Flags: ignoreversion isreadme -Source: "..\README.txt"; DestDir: "{app}"; Flags: ignoreversion - -Source: "..\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\unicode release\audacity.exe"; DestDir: "{app}"; Flags: ignoreversion - -; Manual, which should be got from the manual wiki using ..\scripts\mw2html_audacity\wiki2htm.bat -Source: "..\help\manual\*"; DestDir: "{app}\help\manual\"; Flags: ignoreversion recursesubdirs - -Source: "..\presets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs - -; wxWidgets DLLs. Be specific (not *.dll) so we don't accidentally distribute avformat.dll, for example. -; Don't use the WXWIN environment variable, because... -; 1) Can't get the documented {%WXWIN|default dir} parsing to work. -; 2) Need the DLL's in the release dir for testing, anyway. -Source: "..\win\unicode release\wxbase28u_net_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\unicode release\wxbase28u_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\unicode release\wxmsw28u_adv_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\unicode release\wxmsw28u_core_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "..\win\unicode release\wxmsw28u_html_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion - -; MSVC runtime DLLs. Some users can't put these in the system dir, so just put them in the EXE dir. -; It's legal, per http://www.fsf.org/licensing/licenses/gpl-faq.html#WindowsRuntimeAndGPL . -; This is not an ideal solution, but should need the least tech support. -; We'll know we have the right version, don't step on anybody else's older version, and -; it's easy to make the zip (and they match better). -Source: "{pf}\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"; DestDir: "{app}"; Flags: ignoreversion -Source: "{pf}\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcp90.dll"; DestDir: "{app}"; Flags: ignoreversion -Source: "{pf}\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcr90.dll"; DestDir: "{app}"; Flags: ignoreversion - -Source: "..\win\unicode release\languages\*"; DestDir: "{app}\Languages\"; Flags: ignoreversion recursesubdirs -Source: "..\win\unicode release\modules\*"; DestDir: "{app}\Modules\"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist -Source: "..\win\unicode release\nyquist\*"; DestDir: "{app}\Nyquist\"; Flags: ignoreversion -Source: "..\win\unicode release\plug-ins\*"; DestDir: "{app}\Plug-Ins\"; Excludes: "analyze.ny"; Flags: ignoreversion - -[Icons] -Name: "{commonprograms}\Audacity 1.3 Beta (Unicode)"; Filename: "{app}\audacity.exe" -Name: "{userdesktop}\Audacity 1.3 Beta (Unicode)"; Filename: "{app}\audacity.exe"; Tasks: desktopicon - -[InstallDelete] -; Get rid of Audacity 1.0.0 stuff that's no longer used. -Type: files; Name: "{app}\audacity-help.htb" -Type: files; Name: "{app}\audacity-1.2-help.htb" - -; Get rid of previous versions of MSVC runtimes. -Type: files; Name: "{app}\Microsoft.VC80.CRT.manifest" -Type: files; Name: "{app}\msvcp80.dll" -Type: files; Name: "{app}\msvcr80.dll" - -; Get rid of previous help folder. -Type: filesandordirs; Name: "{app}\help" - -; Don't want to do this because user may have stored their own. -; Type: filesandordirs; Name: "{app}\vst" - -; We've switched from a folder in the start menu to just the Audacity.exe at the top level. -; Get rid of 1.0.0 folder and its icons. -Type: files; Name: "{commonprograms}\Audacity\audacity.exe" -Type: files; Name: "{commonprograms}\Audacity\unins000.exe" -Type: dirifempty; Name: "{commonprograms}\Audacity" - -[Registry] -; No longer allow user to choose whether to associate AUP file type with Audacity. -; Leaving this one commented out example of the old way. -; Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Audacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; Tasks: associate_aup -Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Audacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; -Root: HKCR; Subkey: "Audacity.Project\OpenWithList\audacity.exe"; Flags: createvalueifdoesntexist uninsdeletekey; -Root: HKCR; Subkey: "Audacity.Project"; ValueType: string; ValueData: "Audacity Project File"; Flags: createvalueifdoesntexist uninsdeletekey; -Root: HKCR; Subkey: "Audacity.Project\shell"; ValueType: string; ValueData: ""; Flags: createvalueifdoesntexist uninsdeletekey; -Root: HKCR; Subkey: "Audacity.Project\shell\open"; Flags: createvalueifdoesntexist uninsdeletekey; -Root: HKCR; Subkey: "Audacity.Project\shell\open\command"; ValueType: string; ValueData: """{app}\audacity.exe"" ""%1"""; Flags: createvalueifdoesntexist uninsdeletekey; - -;The following would allow a following 'help' installer to know where to put the 'help' files. -;Root: HKCR; Subkey: "Audacity.Project\Path"; ValueType: string; ValueData: {app}; Flags: createvalueifdoesntexist uninsdeletekey; - -[Run] -Filename: "{app}\audacity.exe"; Description: "Launch Audacity"; Flags: nowait postinstall skipifsilent - +; Script generated by the Inno Setup Script Wizard. +; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! + +[Setup] +; compiler-related directives +OutputBaseFilename=audacity-win-unicode-1.3.13 +SetupIconFile=audacity.ico + +WizardImageFile=audacity_InnoWizardImage.bmp +WizardSmallImageFile=audacity_InnoWizardSmallImage.bmp + +SolidCompression=yes + +; installer-related directives +AppName=Audacity 1.3 Beta (Unicode) +AppVerName=Audacity 1.3.13 (Unicode) +AppPublisher=Audacity Team +AppPublisherURL=http://audacity.sourceforge.net +AppSupportURL=http://audacity.sourceforge.net +AppUpdatesURL=http://audacity.sourceforge.net +ChangesAssociations=yes + +; For a beta release, e.g.: DefaultDirName={pf}\Audacity 1.3 Beta (Unicode) +; For a stable release: DefaultDirName={pf}\Audacity +DefaultDirName={pf}\Audacity 1.3 Beta (Unicode) + +; Always warn if dir exists, because we'll overwrite previous Audacity. +DirExistsWarning=yes +DisableProgramGroupPage=yes +UninstallDisplayIcon="{app}\audacity.exe" + +; No longer force them to accept the license, just display it. LicenseFile=..\LICENSE.txt +InfoBeforeFile=..\LICENSE.txt +InfoAfterFile=..\README.txt +; min versions: Win 95, Win 2000 - allow to run on non-Unicode Windows versions in case we ever support this. +MinVersion=4.0,5.0 + +[Languages] +Name: "english"; MessagesFile: "compiler:Default.isl" +Name: "basque"; MessagesFile: "compiler:Languages\Basque.isl" +Name: "brazilianportuguese"; MessagesFile: "compiler:Languages\BrazilianPortuguese.isl" +Name: "catalan"; MessagesFile: "compiler:Languages\Catalan.isl" +Name: "czech"; MessagesFile: "compiler:Languages\Czech.isl" +Name: "danish"; MessagesFile: "compiler:Languages\Danish.isl" +Name: "dutch"; MessagesFile: "compiler:Languages\Dutch.isl" +Name: "finnish"; MessagesFile: "compiler:Languages\Finnish.isl" +Name: "french"; MessagesFile: "compiler:Languages\French.isl" +Name: "german"; MessagesFile: "compiler:Languages\German.isl" +Name: "hebrew"; MessagesFile: "compiler:Languages\Hebrew.isl" +Name: "hungarian"; MessagesFile: "compiler:Languages\Hungarian.isl" +Name: "italian"; MessagesFile: "compiler:Languages\Italian.isl" +Name: "norwegian"; MessagesFile: "compiler:Languages\Norwegian.isl" +Name: "polish"; MessagesFile: "compiler:Languages\Polish.isl" +Name: "portuguese"; MessagesFile: "compiler:Languages\Portuguese.isl" +Name: "russian"; MessagesFile: "compiler:Languages\Russian.isl" +Name: "slovak"; MessagesFile: "compiler:Languages\Slovak.isl" +Name: "slovenian"; MessagesFile: "compiler:Languages\Slovenian.isl" +Name: "spanish"; MessagesFile: "compiler:Languages\Spanish.isl" + +[Tasks] +Name: desktopicon; Description: "Create a &desktop icon"; GroupDescription: "Additional icons:" +; No longer allow user to choose whether to associate AUP file type with Audacity. +; Name: associate_aup; Description: "&Associate Audacity project files"; GroupDescription: "Other tasks:"; Flags: checkedonce + + +[Files] +; Don't display in separate window, rather as InfoAfterFile. Source: "..\README.txt"; DestDir: "{app}"; Flags: ignoreversion isreadme +Source: "..\README.txt"; DestDir: "{app}"; Flags: ignoreversion + +Source: "..\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\win\unicode release\audacity.exe"; DestDir: "{app}"; Flags: ignoreversion + +; Manual, which should be got from the manual wiki using ..\scripts\mw2html_audacity\wiki2htm.bat +Source: "..\help\manual\*"; DestDir: "{app}\help\manual\"; Flags: ignoreversion recursesubdirs + +Source: "..\presets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs + +; wxWidgets DLLs. Be specific (not *.dll) so we don't accidentally distribute avformat.dll, for example. +; Don't use the WXWIN environment variable, because... +; 1) Can't get the documented {%WXWIN|default dir} parsing to work. +; 2) Need the DLL's in the release dir for testing, anyway. +Source: "..\win\unicode release\wxbase28u_net_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\win\unicode release\wxbase28u_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\win\unicode release\wxmsw28u_adv_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\win\unicode release\wxmsw28u_core_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "..\win\unicode release\wxmsw28u_html_vc_custom.dll"; DestDir: "{app}"; Flags: ignoreversion + +; MSVC runtime DLLs. Some users can't put these in the system dir, so just put them in the EXE dir. +; It's legal, per http://www.fsf.org/licensing/licenses/gpl-faq.html#WindowsRuntimeAndGPL . +; This is not an ideal solution, but should need the least tech support. +; We'll know we have the right version, don't step on anybody else's older version, and +; it's easy to make the zip (and they match better). +Source: "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\Microsoft.VC90.CRT.manifest"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcp90.dll"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Program Files\Microsoft Visual Studio 9.0\VC\redist\x86\Microsoft.VC90.CRT\msvcr90.dll"; DestDir: "{app}"; Flags: ignoreversion + +Source: "..\win\unicode release\languages\*"; DestDir: "{app}\Languages\"; Flags: ignoreversion recursesubdirs +Source: "..\win\unicode release\modules\*"; DestDir: "{app}\Modules\"; Flags: ignoreversion recursesubdirs skipifsourcedoesntexist +Source: "..\win\unicode release\nyquist\*"; DestDir: "{app}\Nyquist\"; Flags: ignoreversion +Source: "..\win\unicode release\plug-ins\*"; DestDir: "{app}\Plug-Ins\"; Excludes: "analyze.ny"; Flags: ignoreversion + +[Icons] +Name: "{commonprograms}\Audacity 1.3 Beta (Unicode)"; Filename: "{app}\audacity.exe" +Name: "{userdesktop}\Audacity 1.3 Beta (Unicode)"; Filename: "{app}\audacity.exe"; Tasks: desktopicon + +[InstallDelete] +; Get rid of Audacity 1.0.0 stuff that's no longer used. +Type: files; Name: "{app}\audacity-help.htb" +Type: files; Name: "{app}\audacity-1.2-help.htb" + +; Get rid of previous versions of MSVC runtimes. +Type: files; Name: "{app}\Microsoft.VC80.CRT.manifest" +Type: files; Name: "{app}\msvcp80.dll" +Type: files; Name: "{app}\msvcr80.dll" + +; Get rid of previous help folder. +Type: filesandordirs; Name: "{app}\help" + +; Don't want to do this because user may have stored their own. +; Type: filesandordirs; Name: "{app}\vst" + +; We've switched from a folder in the start menu to just the Audacity.exe at the top level. +; Get rid of 1.0.0 folder and its icons. +Type: files; Name: "{commonprograms}\Audacity\audacity.exe" +Type: files; Name: "{commonprograms}\Audacity\unins000.exe" +Type: dirifempty; Name: "{commonprograms}\Audacity" + +[Registry] +; No longer allow user to choose whether to associate AUP file type with Audacity. +; Leaving this one commented out example of the old way. +; Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Audacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; Tasks: associate_aup +Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Audacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Audacity.Project\OpenWithList\audacity.exe"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Audacity.Project"; ValueType: string; ValueData: "Audacity Project File"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Audacity.Project\shell"; ValueType: string; ValueData: ""; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Audacity.Project\shell\open"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Audacity.Project\shell\open\command"; ValueType: string; ValueData: """{app}\audacity.exe"" ""%1"""; Flags: createvalueifdoesntexist uninsdeletekey; + +;The following would allow a following 'help' installer to know where to put the 'help' files. +;Root: HKCR; Subkey: "Audacity.Project\Path"; ValueType: string; ValueData: {app}; Flags: createvalueifdoesntexist uninsdeletekey; + +[Run] +Filename: "{app}\audacity.exe"; Description: "Launch Audacity"; Flags: nowait postinstall skipifsilent +