Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-08-04 14:19:30 +02:00
Code Issues Releases Wiki Activity

Rename executable names and package name

Browse Source 
Switch folder paths to tenacity

Signed-off-by: Ajay Ramachandran <dev@ajay.app>
This commit is contained in:
Ajay Ramachandran 2021-07-07 21:30:16 -04:00 committed by Panagiotis Vasilopoulos
parent 587564add4
commit cb7a6c9056
No known key found for this signature in database
GPG Key ID: FD806FDB3B2C5270
17 changed files with 34 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/cmake_build.yml vendored
View File

@ -151,7 +151,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
uses: actions/upload-artifact@v2 uses: actions/upload-artifact@v2
with: 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: | path: |
build/package/* build/package/*
!build/package/_CPack_Packages !build/package/_CPack_Packages

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

@ -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_USER_NAME \"${APPLE_NOTARIZATION_USER_NAME}\" )" )
install( CODE "set( APPLE_NOTARIZATION_PASSWORD \"${APPLE_NOTARIZATION_PASSWORD}\" )" ) install( CODE "set( APPLE_NOTARIZATION_PASSWORD \"${APPLE_NOTARIZATION_PASSWORD}\" )" )
install( CODE "set( APP_IDENTIFIER \"org.audacityteam.audacity\" )" ) install( CODE "set( APP_IDENTIFIER \"org.tenacityaudio.tenacity\" )" )
install( CODE "get_filename_component( APP_LOCATION \${CMAKE_INSTALL_PREFIX}/Audacity.app ABSOLUTE )" ) 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( CODE "set( APPLE_CODESIGN_ENTITLEMENTS ${CMAKE_SOURCE_DIR}/mac/Audacity.entitlements )")
install( SCRIPT "scripts/build/macOS/SignMacos.cmake" ) install( SCRIPT "scripts/build/macOS/SignMacos.cmake" )

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

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

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

@ -24,12 +24,12 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(os "linux") set(os "linux")
endif() 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(CPACK_PACKAGE_FILE_NAME "tenacity-${os}-${CPACK_PACKAGE_VERSION}")
set(zsync_name "tenacity-${os}-*") # '*' is wildcard (here it means any version) set(zsync_name "tenacity-${os}-*") # '*' is wildcard (here it means any version)
if(DEFINED AUDACITY_ARCH_LABEL) 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(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${AUDACITY_ARCH_LABEL}")
set(zsync_name "${zsync_name}-${AUDACITY_ARCH_LABEL}") set(zsync_name "${zsync_name}-${AUDACITY_ARCH_LABEL}")
set(CPACK_AUDACITY_ARCH_LABEL "${AUDACITY_ARCH_LABEL}") set(CPACK_AUDACITY_ARCH_LABEL "${AUDACITY_ARCH_LABEL}")

2
help/CMakeLists.txt
View File

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

16
mac/scripts/build_dist.sh
View File

@ -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` RELEASE=`awk '/^#define+ AUDACITY_RELEASE / {print $3}' ${SRCROOT}/../src/Audacity.h`
REVISION=`awk '/^#define+ AUDACITY_REVISION / {print $3}' ${SRCROOT}/../src/Audacity.h` REVISION=`awk '/^#define+ AUDACITY_REVISION / {print $3}' ${SRCROOT}/../src/Audacity.h`
VERSION=$VERSION.$RELEASE.$REVISION 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 # 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 # 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 # 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= SIGNING=
if [ -r ~/.audacity_signing ] if [ -r ~/.audacity_signing ]
@ -158,7 +158,7 @@ then
--options runtime \ --options runtime \
--entitlements "${SRCROOT}/Audacity.entitlements" \ --entitlements "${SRCROOT}/Audacity.entitlements" \
--sign "${CODESIGN_APP_IDENTITY}" \ --sign "${CODESIGN_APP_IDENTITY}" \
${DSTROOT}/Audacity.app/Contents/modules/* ${DSTROOT}/Tenacity.app/Contents/modules/*
xcrun codesign --verbose \ xcrun codesign --verbose \
--timestamp \ --timestamp \
@ -166,7 +166,7 @@ then
--options runtime \ --options runtime \
--entitlements "${SRCROOT}/Audacity.entitlements" \ --entitlements "${SRCROOT}/Audacity.entitlements" \
--sign "${CODESIGN_APP_IDENTITY}" \ --sign "${CODESIGN_APP_IDENTITY}" \
${DSTROOT}/Audacity.app/Contents/plug-ins/* ${DSTROOT}/Tenacity.app/Contents/plug-ins/*
xcrun codesign --verbose \ xcrun codesign --verbose \
--deep \ --deep \
@ -175,10 +175,10 @@ then
--options runtime \ --options runtime \
--entitlements "${SRCROOT}/Audacity.entitlements" \ --entitlements "${SRCROOT}/Audacity.entitlements" \
--sign "${CODESIGN_APP_IDENTITY}" \ --sign "${CODESIGN_APP_IDENTITY}" \
${DSTROOT}/Audacity.app ${DSTROOT}/Tenacity.app
# Create the ZIP archive for notarization # 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 # Send it off for notarization
notarize "${DSTROOT}.zip" notarize "${DSTROOT}.zip"
@ -187,7 +187,7 @@ then
rm "${DSTROOT}.zip" rm "${DSTROOT}.zip"
# Staple the app # Staple the app
stapler staple "${DSTROOT}/Audacity.app" stapler staple "${DSTROOT}/Tenacity.app"
fi fi
# Create structure # Create structure
@ -278,7 +278,7 @@ fi
# Create zip version # Create zip version
rm -rf "${DMG}/.background" rm -rf "${DMG}/.background"
rm -rf "${DMG}/Audacity.app/Contents/help" rm -rf "${DMG}/Tenacity.app/Contents/help"
zip -r9 "${DMG}.zip" "${DMG}" zip -r9 "${DMG}.zip" "${DMG}"
# Cleanup # Cleanup

2
mac/scripts/install_wxlibs.sh
View File

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

4
mac/signing.txt
View File

@ -11,7 +11,7 @@ with the following:
CODESIGN_APP_IDENTITY="Developer ID Application:" CODESIGN_APP_IDENTITY="Developer ID Application:"
2) You need to create an application specific password in your Developer 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: when following these instructions:
https://support.apple.com/en-us/HT204397 https://support.apple.com/en-us/HT204397
@ -26,7 +26,7 @@ with the following:
eyes. eyes.
4) Build the Release version of Audacity. You can follow the cmake_build.txt 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: in:
audacity/bld/bin/Release audacity/bld/bin/Release

2
scripts/build/macOS/DMGSign.cmake
View File

@ -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_USER_NAME ${CPACK_APPLE_NOTARIZATION_USER_NAME} )
set( APPLE_NOTARIZATION_PASSWORD ${CPACK_APPLE_NOTARIZATION_PASSWORD} ) set( APPLE_NOTARIZATION_PASSWORD ${CPACK_APPLE_NOTARIZATION_PASSWORD} )
set( PERFORM_NOTARIZATION ${CPACK_PERFORM_NOTARIZATION} ) set( PERFORM_NOTARIZATION ${CPACK_PERFORM_NOTARIZATION} )
set( APP_IDENTIFIER "org.audacityteam.audacity" ) set( APP_IDENTIFIER "org.tenacityaudio.tenacity" )
foreach( file ${CPACK_PACKAGE_FILES} ) foreach( file ${CPACK_PACKAGE_FILES} )
set( DMG_LOCATION ${CPACK_PACKAGE_FILES} ) set( DMG_LOCATION ${CPACK_PACKAGE_FILES} )

2
scripts/build/macOS/NotarizeMacos.cmake
View File

@ -1,7 +1,7 @@
# CMake script to sign macOS build # CMake script to sign macOS build
# Arguments: # Arguments:
# APP_IDENTIFIER - app identifier # 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 # DMG_LOCATION - the path to Audaicty dmg package
# APPLE_NOTARIZATION_USER_NAME - notarization user name # APPLE_NOTARIZATION_USER_NAME - notarization user name
# APPLE_NOTARIZATION_PASSWORD - notarization password # APPLE_NOTARIZATION_PASSWORD - notarization password

2
scripts/build/macOS/SignMacos.cmake
View File

@ -1,7 +1,7 @@
# CMake script to sign macOS build # CMake script to sign macOS build
# Arguments: # Arguments:
# APP_IDENTIFIER - app identifier # 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 # DMG_LOCATION - the path to Audaicty dmg package
# APPLE_CODESIGN_IDENTITY - identity to use # APPLE_CODESIGN_IDENTITY - identity to use
# APPLE_CODESIGN_ENTITLEMENTS - path to the entitlements # APPLE_CODESIGN_ENTITLEMENTS - path to the entitlements

2
src/AudacityApp.cpp
View File

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

8
src/FileNames.cpp
View File

@ -239,7 +239,7 @@ FilePath FileNames::DataDir()
// the prefs are stored in the user data dir provided by the OS. // the prefs are stored in the user data dir provided by the OS.
wxFileName exePath(PlatformCompatibility::GetExecutablePath()); wxFileName exePath(PlatformCompatibility::GetExecutablePath());
#if defined(__WXMAC__) #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();
//exePath.RemoveLastDir(); //exePath.RemoveLastDir();
// just remove the MacOSX part. // just remove the MacOSX part.
@ -273,13 +273,13 @@ FilePath FileNames::HtmlHelpDir()
{ {
#if defined(__WXMAC__) #if defined(__WXMAC__)
wxFileName exePath(PlatformCompatibility::GetExecutablePath()); 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();
//exePath.RemoveLastDir(); //exePath.RemoveLastDir();
// just remove the MacOSX part. // just remove the MacOSX part.
exePath.RemoveLastDir(); 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(); return wxFileName( exePath.GetPath()+wxT("/help/manual"), wxEmptyString ).GetFullPath();
#else #else
//linux goes into /*prefix*/share/audacity/ //linux goes into /*prefix*/share/audacity/
@ -332,7 +332,7 @@ FilePath FileNames::BaseDir()
#if defined(__WXMAC__) #if defined(__WXMAC__)
baseDir = PlatformCompatibility::GetExecutablePath(); 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();
//baseDir.RemoveLastDir(); //baseDir.RemoveLastDir();
// just remove the MacOSX part. // just remove the MacOSX part.

2
src/PlatformCompatibility.h
View File

@ -35,7 +35,7 @@ public:
// //
// Get filename and path of executable (e.g. "/usr/bin/tenacity" on // 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 // This string is unchanging
// //
static const FilePath &GetExecutablePath(); static const FilePath &GetExecutablePath();

2
src/PluginManager.cpp
View File

@ -463,7 +463,7 @@ void PluginManager::FindFilesInPathList(const wxString & pattern,
// Add the "Audacity" plug-ins directory // Add the "Audacity" plug-ins directory
wxFileName ff = PlatformCompatibility::GetExecutablePath(); wxFileName ff = PlatformCompatibility::GetExecutablePath();
#if defined(__WXMAC__) #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();
//ff.RemoveLastDir(); //ff.RemoveLastDir();
// just remove the MacOSX part. // just remove the MacOSX part.

4
win/Tenacity.exe.manifest
View File

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

8
win/tenacity.rc
View File

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