diff --git a/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake b/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake index 2353dbf64..1a3aa0598 100644 --- a/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake +++ b/win/Inno_Setup_Wizard/BuildInnoSetupInstaller.cmake @@ -1,4 +1,4 @@ -# This CMake script is invoked to build the InnoSetup installer for Audacity +# This CMake script is invoked to build the InnoSetup installer for Tenacity # Requiered parameters: # BUILD_DIR - should be set to CMAKE_BINARY_DIR by the caller # SOURCE_DIR - should be set to CMAKE_SOURCE_DIR by teh caller @@ -42,7 +42,7 @@ endif() # Prepare the output directory file(COPY "${SOURCE_DIR}/win/Inno_Setup_Wizard/" DESTINATION "${OUTPUT_DIR}") -configure_file("${OUTPUT_DIR}/audacity.iss.in" "${OUTPUT_DIR}/audacity.iss") +configure_file("${OUTPUT_DIR}/tenacity.iss.in" "${OUTPUT_DIR}/tenacity.iss") # Copy additional files @@ -51,7 +51,7 @@ file(COPY "${SOURCE_DIR}/presets" DESTINATION "${OUTPUT_DIR}/Additional") file(COPY "${SOURCE_DIR}/LICENSE.txt" "${SOURCE_DIR}/README.md" - "${SOURCE_DIR}/win/audacity.ico" + "${SOURCE_DIR}/win/tenacity.ico" DESTINATION "${OUTPUT_DIR}/Additional" ) @@ -69,7 +69,7 @@ execute_process( execute_process( COMMAND - ${INNO_SETUP_COMPILER} /Sbyparam=$p "audacity.iss" + ${INNO_SETUP_COMPILER} /Sbyparam=$p "tenacity.iss" WORKING_DIRECTORY ${OUTPUT_DIR} ) diff --git a/win/Inno_Setup_Wizard/audacity.iss.in b/win/Inno_Setup_Wizard/tenacity.iss.in similarity index 87% rename from win/Inno_Setup_Wizard/audacity.iss.in rename to win/Inno_Setup_Wizard/tenacity.iss.in index e8043e418..638d997a8 100644 --- a/win/Inno_Setup_Wizard/audacity.iss.in +++ b/win/Inno_Setup_Wizard/tenacity.iss.in @@ -1,8 +1,8 @@ -; Audacity: A Digital Audio Editor -; Audacity(R) is copyright (c) 1999-2021 Audacity Team. +; Tenacity: A Digital Audio Editor +; Tenacity(R) is copyright (c) 1999-2021 Tenacity Team. ; License: GPL v2. See License.txt. ; -; audacity.iss +; tenacity.iss ; Vaughan Johnson, Leland Lucius, Martyn Shaw, Richard Ash, & others ; @@ -23,10 +23,10 @@ Filename: "{app}\unins*.*"; [Setup] ; compiler-related directives -OutputBaseFilename=audacity-win-{#AppVersion}-@INSTALLER_SUFFIX@ +OutputBaseFilename=tenacity-win-{#AppVersion}-@INSTALLER_SUFFIX@ -WizardImageFile=".\audacity_InnoWizardImage.bmp" -WizardSmallImageFile=".\audacity_InnoWizardSmallImage.bmp" +WizardImageFile=".\tenacity_InnoWizardImage.bmp" +WizardSmallImageFile=".\tenacity_InnoWizardSmallImage.bmp" SolidCompression=yes @@ -36,17 +36,17 @@ SolidCompression=yes DisableWelcomePage=no AppName={#AppName} -AppVerName=Audacity {#AppVersion} +AppVerName=Tenacity {#AppVersion} ; Specify AppVersion as well, so it appears in the Add/Remove Programs entry. AppVersion={#AppVersion} -AppPublisher="Audacity Team" -AppPublisherURL=http://audacityteam.org -AppSupportURL=http://audacityteam.org -AppUpdatesURL=http://audacityteam.org +AppPublisher="Tenacity Team" +AppPublisherURL=https://tenacityaudio.org/ +AppSupportURL=https://tenacityaudio.org/ +AppUpdatesURL=https://tenacityaudio.org/ ChangesAssociations=yes @INSTALLER_X64_MODE@ -DefaultDirName={commonpf}\Audacity +DefaultDirName={commonpf}\Tenacity VersionInfoProductName={#AppName} VersionInfoProductTextVersion={#GetFileProductVersion(AppExe)} @@ -55,16 +55,16 @@ VersionInfoVersion={#GetFileVersion(AppExe)} VersionInfoCopyright={#GetFileCopyright(AppExe)} ; Don't disable the "Select Destination Location" wizard, even if -; Audacity is already installed. +; Tenacity is already installed. DisableDirPage=no -; Always warn if dir exists, because we'll overwrite previous Audacity. +; Always warn if dir exists, because we'll overwrite previous Tenacity. DirExistsWarning=yes DisableProgramGroupPage=yes UninstallDisplayIcon="{app}\tenacity.exe" ; No longer force them to accept the license, just display it. LicenseFile=..\LICENSE.txt -InfoBeforeFile=".\audacity_InnoWizard_InfoBefore.rtf" +InfoBeforeFile=".\tenacity_InnoWizard_InfoBefore.rtf" InfoAfterFile=Additional\README.md ; We no longer produce new ANSI builds. @@ -74,7 +74,7 @@ InfoAfterFile=Additional\README.md ; MinVersion=4.0,5.0 ; cosmetic-related directives -SetupIconFile="Additional\audacity.ico" +SetupIconFile="Additional\tenacity.ico" @SIGN_TOOL@ @@ -85,8 +85,8 @@ Filename: "{app}\FirstTime.ini"; Section: "FromInno"; Key: "Language"; String: " [Tasks] Name: desktopicon; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}" Name: resetPrefs; Description: "{cm:ResetPrefs}"; Flags: unchecked -; 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 +; No longer allow user to choose whether to associate AUP file type with Tenacity. +; Name: associate_aup; Description: "&Associate Tenacity project files"; GroupDescription: "Other tasks:"; Flags: checkedonce [Files] ; Prime the first time .ini file so the permissions can be set @@ -98,7 +98,7 @@ Source: "Additional\README.md"; DestDir: "{app}"; Flags: ignoreversion Source: "Additional\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "{#AppExe}"; DestDir: "{app}"; Flags: ignoreversion -; Manual, which should be got from the manual wiki using ..\scripts\mw2html_audacity\wiki2htm.bat +; Manual, which should be got from the manual wiki using ..\scripts\mw2html_tenacity\wiki2htm.bat @MANUAL@ Source: "Additional\presets\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs @@ -115,13 +115,13 @@ Source: "Package\plug-ins\*"; DestDir: "{app}\Plug-Ins\"; Flags: ignoreversion Source: "Package\modules\*"; DestDir: "{app}\modules\"; Flags: ignoreversion recursesubdirs [Icons] -Name: "{commonprograms}\Audacity"; Filename: "{app}\tenacity.exe" -Name: "{commondesktop}\Audacity"; Filename: "{app}\tenacity.exe"; Tasks: desktopicon +Name: "{commonprograms}\Tenacity"; Filename: "{app}\tenacity.exe" +Name: "{commondesktop}\Tenacity"; Filename: "{app}\tenacity.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 Tenacity 1.0.0 stuff that's no longer used. +Type: files; Name: "{app}\tenacity-help.htb" +Type: files; Name: "{app}\tenacity-1.2-help.htb" ; Get rid of previous versions of MSVC runtimes. Type: files; Name: "{app}\Microsoft.VC80.CRT.manifest" @@ -139,11 +139,11 @@ 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. +; We've switched from a folder in the start menu to just the Tenacity.exe at the top level. ; Get rid of 1.0.0 folder and its icons. -Type: files; Name: "{commonprograms}\Audacity\tenacity.exe" -Type: files; Name: "{commonprograms}\Audacity\unins000.exe" -Type: dirifempty; Name: "{commonprograms}\Audacity" +Type: files; Name: "{commonprograms}\Tenacity\tenacity.exe" +Type: files; Name: "{commonprograms}\Tenacity\unins000.exe" +Type: dirifempty; Name: "{commonprograms}\Tenacity" ;Get rid of previous uninstall item Type: files; Name: "{app}\unins*.*" @@ -175,25 +175,25 @@ Type: files; Name: "{app}\Plug-Ins\crossfadeout.ny" Type: files; Name: "{app}\Plug-Ins\clicktrack.ny" [Registry] -; No longer allow user to choose whether to associate AUP file type with Audacity. +; No longer allow user to choose whether to associate AUP file type with Tenacity. ; 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: ".AUP3"; ValueType: string; ValueData: "Audacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; -Root: HKCR; Subkey: "Audacity.Project\OpenWithList\tenacity.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}\tenacity.exe"" ""%1"""; Flags: uninsdeletekey; +; Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; Tasks: associate_aup +Root: HKCR; Subkey: ".AUP"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: ".AUP3"; ValueType: string; ValueData: "Tenacity.Project"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Tenacity.Project\OpenWithList\tenacity.exe"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Tenacity.Project"; ValueType: string; ValueData: "Tenacity Project File"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Tenacity.Project\shell"; ValueType: string; ValueData: ""; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Tenacity.Project\shell\open"; Flags: createvalueifdoesntexist uninsdeletekey; +Root: HKCR; Subkey: "Tenacity.Project\shell\open\command"; ValueType: string; ValueData: """{app}\tenacity.exe"" ""%1"""; Flags: 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; +;Root: HKCR; Subkey: "Tenacity.Project\Path"; ValueType: string; ValueData: {app}; Flags: createvalueifdoesntexist uninsdeletekey; [Run] -Filename: "{app}\tenacity.exe"; Description: "{cm:LaunchProgram,Audacity}"; Flags: nowait postinstall skipifsilent +Filename: "{app}\tenacity.exe"; Description: "{cm:LaunchProgram,Tenacity}"; Flags: nowait postinstall skipifsilent [Languages] -; NOTE: "0" in locale name will be translated to "@" when read by Audacity. +; NOTE: "0" in locale name will be translated to "@" when read by Tenacity. ; Create subdirectories where we'll store the unofficial and dummy translation files {#expr Exec("cmd", "/c mkdir """ + "Languages\dummy""", '.\', , SW_HIDE), \ diff --git a/win/Inno_Setup_Wizard/audacity_InnoWizardImage.bmp b/win/Inno_Setup_Wizard/tenacity_InnoWizardImage.bmp similarity index 100% rename from win/Inno_Setup_Wizard/audacity_InnoWizardImage.bmp rename to win/Inno_Setup_Wizard/tenacity_InnoWizardImage.bmp diff --git a/win/Inno_Setup_Wizard/audacity_InnoWizardSmallImage.bmp b/win/Inno_Setup_Wizard/tenacity_InnoWizardSmallImage.bmp similarity index 100% rename from win/Inno_Setup_Wizard/audacity_InnoWizardSmallImage.bmp rename to win/Inno_Setup_Wizard/tenacity_InnoWizardSmallImage.bmp diff --git a/win/Inno_Setup_Wizard/audacity_InnoWizard_InfoBefore.rtf b/win/Inno_Setup_Wizard/tenacity_InnoWizard_InfoBefore.rtf similarity index 100% rename from win/Inno_Setup_Wizard/audacity_InnoWizard_InfoBefore.rtf rename to win/Inno_Setup_Wizard/tenacity_InnoWizard_InfoBefore.rtf diff --git a/win/audacity.ico b/win/tenacity.ico similarity index 100% rename from win/audacity.ico rename to win/tenacity.ico diff --git a/win/tenacity.rc b/win/tenacity.rc index 05ef444f5..e315700b7 100644 --- a/win/tenacity.rc +++ b/win/tenacity.rc @@ -1,7 +1,7 @@ #ifdef EXPERIMENTAL_DA AudacityLogo ICON "darkaudacity.ico" #else -AudacityLogo ICON "audacity.ico" +AudacityLogo ICON "tenacity.ico" #endif #include