Browse Source

Rename executable names and package name

Switch folder paths to tenacity

Signed-off-by: Ajay Ramachandran <dev@ajay.app>
pull/332/head
Ajay Ramachandran 7 months ago
committed by Panagiotis Vasilopoulos
parent
commit
cb7a6c9056
No known key found for this signature in database GPG Key ID: FD806FDB3B2C5270
  1. 2
      .github/workflows/cmake_build.yml
  2. 4
      cmake-proxies/cmake-modules/AudacityCodeSigning.cmake
  3. 2
      cmake-proxies/cmake-modules/MacOSXBundleInfo.plist.in
  4. 4
      cmake-proxies/cmake-modules/Package.cmake
  5. 2
      help/CMakeLists.txt
  6. 16
      mac/scripts/build_dist.sh
  7. 2
      mac/scripts/install_wxlibs.sh
  8. 4
      mac/signing.txt
  9. 2
      scripts/build/macOS/DMGSign.cmake
  10. 2
      scripts/build/macOS/NotarizeMacos.cmake
  11. 2
      scripts/build/macOS/SignMacos.cmake
  12. 2
      src/AudacityApp.cpp
  13. 8
      src/FileNames.cpp
  14. 2
      src/PlatformCompatibility.h
  15. 2
      src/PluginManager.cpp
  16. 4
      win/Tenacity.exe.manifest
  17. 8
      win/tenacity.rc

2
.github/workflows/cmake_build.yml

@ -151,7 +151,7 @@ jobs:
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: Audacity_${{ matrix.config.name }}_${{ github.run_id }}_${{ env.GIT_HASH_SHORT }}
name: Tenacity_${{ matrix.config.name }}_${{ github.run_id }}_${{ env.GIT_HASH_SHORT }}
path: |
build/package/*
!build/package/_CPack_Packages

4
cmake-proxies/cmake-modules/AudacityCodeSigning.cmake

@ -24,8 +24,8 @@ elseif( CMAKE_SYSTEM_NAME MATCHES "Darwin")
install( CODE "set( APPLE_NOTARIZATION_USER_NAME \"${APPLE_NOTARIZATION_USER_NAME}\" )" )
install( CODE "set( APPLE_NOTARIZATION_PASSWORD \"${APPLE_NOTARIZATION_PASSWORD}\" )" )
install( CODE "set( APP_IDENTIFIER \"org.audacityteam.audacity\" )" )
install( CODE "get_filename_component( APP_LOCATION \${CMAKE_INSTALL_PREFIX}/Audacity.app ABSOLUTE )" )
install( CODE "set( APP_IDENTIFIER \"org.tenacityaudio.tenacity\" )" )
install( CODE "get_filename_component( APP_LOCATION \${CMAKE_INSTALL_PREFIX}/Tenacity.app ABSOLUTE )" )
install( CODE "set( APPLE_CODESIGN_ENTITLEMENTS ${CMAKE_SOURCE_DIR}/mac/Audacity.entitlements )")
install( SCRIPT "scripts/build/macOS/SignMacos.cmake" )

2
cmake-proxies/cmake-modules/MacOSXBundleInfo.plist.in

@ -210,7 +210,7 @@
<key>CFBundleIconFile</key>
<string>Audacity.icns</string>
<key>CFBundleIdentifier</key>
<string>org.audacityteam.audacity</string>
<string>org.tenacityaudio.tenacity</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleLongVersionString</key>

4
cmake-proxies/cmake-modules/Package.cmake

@ -24,12 +24,12 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(os "linux")
endif()
# audacity-linux-X.Y.Z-alpha-20210615
# tenacity-linux-X.Y.Z-alpha-20210615
set(CPACK_PACKAGE_FILE_NAME "tenacity-${os}-${CPACK_PACKAGE_VERSION}")
set(zsync_name "tenacity-${os}-*") # '*' is wildcard (here it means any version)
if(DEFINED AUDACITY_ARCH_LABEL)
# audacity-linux-X.Y.Z-alpha-20210615-x86_64
# tenacity-linux-X.Y.Z-alpha-20210615-x86_64
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${AUDACITY_ARCH_LABEL}")
set(zsync_name "${zsync_name}-${AUDACITY_ARCH_LABEL}")
set(CPACK_AUDACITY_ARCH_LABEL "${AUDACITY_ARCH_LABEL}")

2
help/CMakeLists.txt

@ -51,7 +51,7 @@ endif()
if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
if( NOT WIN32)
install( DIRECTORY "${dst}" OPTIONAL
DESTINATION "${_DATADIR}/audacity/help" )
DESTINATION "${_DATADIR}/tenacity/help" )
install( FILES "${_SRCDIR}/audacity.1"
DESTINATION "${_MANDIR}/man1" )
install( FILES "${_SRCDIR}/audacity.appdata.xml"

16
mac/scripts/build_dist.sh

@ -107,7 +107,7 @@ VERSION=`awk '/^#define+ AUDACITY_VERSION / {print $3}' ${SRCROOT}/../src/Audaci
RELEASE=`awk '/^#define+ AUDACITY_RELEASE / {print $3}' ${SRCROOT}/../src/Audacity.h`
REVISION=`awk '/^#define+ AUDACITY_REVISION / {print $3}' ${SRCROOT}/../src/Audacity.h`
VERSION=$VERSION.$RELEASE.$REVISION
IDENT=$(plist "${DSTROOT}/Audacity.app/Contents/Info.plist" "CFBundleIdentifier")
IDENT=$(plist "${DSTROOT}/Tenacity.app/Contents/Info.plist" "CFBundleIdentifier")
#
# This depends on a file in the builders HOME directory called ".audacity_signing" that
@ -124,7 +124,7 @@ IDENT=$(plist "${DSTROOT}/Audacity.app/Contents/Info.plist" "CFBundleIdentifier"
# https://support.apple.com/guide/keychain-access/add-a-password-to-a-keychain-kyca1120/mac
#
# You generate the app-specific password in your Apple developer account and you must specify
# "org.audacityteam.audacity" as the application identifier.
# "org.tenacityaudio.tenacity" as the application identifier.
#
SIGNING=
if [ -r ~/.audacity_signing ]
@ -158,7 +158,7 @@ then
--options runtime \
--entitlements "${SRCROOT}/Audacity.entitlements" \
--sign "${CODESIGN_APP_IDENTITY}" \
${DSTROOT}/Audacity.app/Contents/modules/*
${DSTROOT}/Tenacity.app/Contents/modules/*
xcrun codesign --verbose \
--timestamp \
@ -166,7 +166,7 @@ then
--options runtime \
--entitlements "${SRCROOT}/Audacity.entitlements" \
--sign "${CODESIGN_APP_IDENTITY}" \
${DSTROOT}/Audacity.app/Contents/plug-ins/*
${DSTROOT}/Tenacity.app/Contents/plug-ins/*
xcrun codesign --verbose \
--deep \
@ -175,10 +175,10 @@ then
--options runtime \
--entitlements "${SRCROOT}/Audacity.entitlements" \
--sign "${CODESIGN_APP_IDENTITY}" \
${DSTROOT}/Audacity.app
${DSTROOT}/Tenacity.app
# Create the ZIP archive for notarization
xcrun ditto -c -k --keepParent "${DSTROOT}/Audacity.app" "${DSTROOT}.zip"
xcrun ditto -c -k --keepParent "${DSTROOT}/Tenacity.app" "${DSTROOT}.zip"
# Send it off for notarization
notarize "${DSTROOT}.zip"
@ -187,7 +187,7 @@ then
rm "${DSTROOT}.zip"
# Staple the app
stapler staple "${DSTROOT}/Audacity.app"
stapler staple "${DSTROOT}/Tenacity.app"
fi
# Create structure
@ -278,7 +278,7 @@ fi
# Create zip version
rm -rf "${DMG}/.background"
rm -rf "${DMG}/Audacity.app/Contents/help"
rm -rf "${DMG}/Tenacity.app/Contents/help"
zip -r9 "${DMG}.zip" "${DMG}"
# Cleanup

2
mac/scripts/install_wxlibs.sh

@ -38,7 +38,7 @@ update_paths()
}
# For testing
# BUILT_PRODUCTS_DIR=/tmp/Audacity.app/Contents
# BUILT_PRODUCTS_DIR=/tmp/Tenacity.app/Contents
# EXECUTABLE_PATH=MacOS/audacity
# FRAMEWORKS_FOLDER_PATH=Frameworks

4
mac/signing.txt

@ -11,7 +11,7 @@ with the following:
CODESIGN_APP_IDENTITY="Developer ID Application:"
2) You need to create an application specific password in your Developer
account. Make sure you use "org.audacityteam.audacity" as the app ID
account. Make sure you use "org.tenacityaudio.tenacity" as the app ID
when following these instructions:
https://support.apple.com/en-us/HT204397
@ -26,7 +26,7 @@ with the following:
eyes.
4) Build the Release version of Audacity. You can follow the cmake_build.txt
instructions in this folder. Once complete, you should find "Audacity.app"
instructions in this folder. Once complete, you should find "Tenacity.app"
in:
audacity/bld/bin/Release

2
scripts/build/macOS/DMGSign.cmake

@ -3,7 +3,7 @@ set( APPLE_CODESIGN_IDENTITY ${CPACK_APPLE_CODESIGN_IDENTITY} )
set( APPLE_NOTARIZATION_USER_NAME ${CPACK_APPLE_NOTARIZATION_USER_NAME} )
set( APPLE_NOTARIZATION_PASSWORD ${CPACK_APPLE_NOTARIZATION_PASSWORD} )
set( PERFORM_NOTARIZATION ${CPACK_PERFORM_NOTARIZATION} )
set( APP_IDENTIFIER "org.audacityteam.audacity" )
set( APP_IDENTIFIER "org.tenacityaudio.tenacity" )
foreach( file ${CPACK_PACKAGE_FILES} )
set( DMG_LOCATION ${CPACK_PACKAGE_FILES} )

2
scripts/build/macOS/NotarizeMacos.cmake

@ -1,7 +1,7 @@
# CMake script to sign macOS build
# Arguments:
# APP_IDENTIFIER - app identifier
# APP_LOCATION - the path to Audacity.app
# APP_LOCATION - the path to Tenacity.app
# DMG_LOCATION - the path to Audaicty dmg package
# APPLE_NOTARIZATION_USER_NAME - notarization user name
# APPLE_NOTARIZATION_PASSWORD - notarization password

2
scripts/build/macOS/SignMacos.cmake

@ -1,7 +1,7 @@
# CMake script to sign macOS build
# Arguments:
# APP_IDENTIFIER - app identifier
# APP_LOCATION - the path to Audacity.app
# APP_LOCATION - the path to Tenacity.app
# DMG_LOCATION - the path to Audaicty dmg package
# APPLE_CODESIGN_IDENTITY - identity to use
# APPLE_CODESIGN_ENTITLEMENTS - path to the entitlements

2
src/AudacityApp.cpp

@ -1478,7 +1478,7 @@ bool AudacityApp::InitPart2() {
bool permsReset = false;
gPrefs->Read(wxT("/MicrophonePermissionsReset"), &permsReset, false);
if (!permsReset) {
system("tccutil reset Microphone org.audacityteam.audacity");
system("tccutil reset Microphone org.tenacityaudio.tenacity");
gPrefs->Write(wxT("/MicrophonePermissionsReset"), true);
}
#endif

8
src/FileNames.cpp

@ -239,7 +239,7 @@ FilePath FileNames::DataDir()
// the prefs are stored in the user data dir provided by the OS.
wxFileName exePath(PlatformCompatibility::GetExecutablePath());
#if defined(__WXMAC__)
// Path ends for example in "Audacity.app/Contents/MacOSX"
// Path ends for example in "Tenacity.app/Contents/MacOSX"
//exePath.RemoveLastDir();
//exePath.RemoveLastDir();
// just remove the MacOSX part.
@ -273,13 +273,13 @@ FilePath FileNames::HtmlHelpDir()
{
#if defined(__WXMAC__)
wxFileName exePath(PlatformCompatibility::GetExecutablePath());
// Path ends for example in "Audacity.app/Contents/MacOSX"
// Path ends for example in "Tenacity.app/Contents/MacOSX"
//exePath.RemoveLastDir();
//exePath.RemoveLastDir();
// just remove the MacOSX part.
exePath.RemoveLastDir();
//for mac this puts us within the .app: Audacity.app/Contents/SharedSupport/
//for mac this puts us within the .app: Tenacity.app/Contents/SharedSupport/
return wxFileName( exePath.GetPath()+wxT("/help/manual"), wxEmptyString ).GetFullPath();
#else
//linux goes into /*prefix*/share/audacity/
@ -332,7 +332,7 @@ FilePath FileNames::BaseDir()
#if defined(__WXMAC__)
baseDir = PlatformCompatibility::GetExecutablePath();
// Path ends for example in "Audacity.app/Contents/MacOSX"
// Path ends for example in "Tenacity.app/Contents/MacOSX"
//baseDir.RemoveLastDir();
//baseDir.RemoveLastDir();
// just remove the MacOSX part.

2
src/PlatformCompatibility.h

@ -35,7 +35,7 @@ public:
//
// Get filename and path of executable (e.g. "/usr/bin/tenacity" on
// Linux or "C:\Program Files\Audacity\Tenacity.exe" on Windows)
// Linux or "C:\Program Files\Tenacity\Tenacity.exe" on Windows)
// This string is unchanging
//
static const FilePath &GetExecutablePath();

2
src/PluginManager.cpp

@ -463,7 +463,7 @@ void PluginManager::FindFilesInPathList(const wxString & pattern,
// Add the "Audacity" plug-ins directory
wxFileName ff = PlatformCompatibility::GetExecutablePath();
#if defined(__WXMAC__)
// Path ends for example in "Audacity.app/Contents/MacOSX"
// Path ends for example in "Tenacity.app/Contents/MacOSX"
//ff.RemoveLastDir();
//ff.RemoveLastDir();
// just remove the MacOSX part.

4
win/Tenacity.exe.manifest

@ -3,10 +3,10 @@
<assemblyIdentity
version="2.3.0.0"
processorArchitecture="x86"
name="Audacity.Audacity.Audacity"
name="Tenacity.Tenacity.Tenacity"
type="win32"
/>
<description>Audacity® Cross-Platform Sound Editor</description>
<description>Tenacity Cross-Platform Sound Editor</description>
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
<security>
<requestedPrivileges>

8
win/tenacity.rc

@ -48,21 +48,21 @@ BEGIN
BLOCK "040904b0"
BEGIN
#ifdef EXPERIMENTAL_DA
VALUE "CompanyName", "Extended Tenacity Team"
VALUE "CompanyName", "Extended Tenacity Contributors"
VALUE "FileDescription", "A customised Tenacity Cross-Platform Sound Editor"
VALUE "FileVersion", AUDACITY_FILE_VERSION
VALUE "InternalName", "DarkTenacity"
VALUE "LegalCopyright", "Copyright © 2021. All rights reserved."
VALUE "LegalCopyright", "Copyright © 1999-2021 under GPLv2+"
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "DarkTenacity.exe"
VALUE "ProductName", "DarkTenacity"
VALUE "ProductVersion", AUDACITY_FILE_VERSION
#else
VALUE "CompanyName", "Tenacity Team"
VALUE "CompanyName", "Tenacity Contributors"
VALUE "FileDescription", "Tenacity Cross-Platform Sound Editor"
VALUE "FileVersion", AUDACITY_FILE_VERSION
VALUE "InternalName", "Tenacity"
VALUE "LegalCopyright", "Copyright © 2021. All rights reserved."
VALUE "LegalCopyright", "Copyright © 1999-2021 under GPLv2+"
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "Tenacity.exe"
VALUE "ProductName", "Tenacity"

Loading…
Cancel
Save