From f2b430f13c5a66e19d11e396967d9075581078c1 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 25 Dec 2022 13:32:16 -0800 Subject: [PATCH] Remove `_standalone` prefix in filenames and directories for vendor'd builds. --- .cmake/GeneratePackage.cmake | 2 +- script/archive-standalone-nix.sh | 2 +- script/notarize-macos.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.cmake/GeneratePackage.cmake b/.cmake/GeneratePackage.cmake index 4898d83e5..2c81b5495 100644 --- a/.cmake/GeneratePackage.cmake +++ b/.cmake/GeneratePackage.cmake @@ -1,6 +1,6 @@ if (${GENERATE_DEB} MATCHES "true" AND CMAKE_SYSTEM_NAME MATCHES "Linux") if (${BUILD_STANDALONE} MATCHES "true") - set(CPACK_PACKAGE_FILE_NAME "musikcube_standalone_${musikcube_VERSION}_${DEB_ARCHITECTURE}") + set(CPACK_PACKAGE_FILE_NAME "musikcube_${musikcube_VERSION}_${DEB_ARCHITECTURE}") else() set(DEB_MICROHTTPD_VERSION "10") set(DEB_LIBCURL_VERSION "3") diff --git a/script/archive-standalone-nix.sh b/script/archive-standalone-nix.sh index 9a28177e2..31044c977 100755 --- a/script/archive-standalone-nix.sh +++ b/script/archive-standalone-nix.sh @@ -29,7 +29,7 @@ elif [[ $ARCH == "x86_64" ]]; then fi OS_ARCH="${FRIENDLY_OS_NAME}_${ARCH}" -OUTNAME="musikcube_standalone_${OS_ARCH}_$VERSION" +OUTNAME="musikcube_${OS_ARCH}_$VERSION" OUTDIR="dist/$VERSION/$OUTNAME" SCRIPTDIR=`dirname "$0"` CMAKE_TOOLCHAIN="" diff --git a/script/notarize-macos.sh b/script/notarize-macos.sh index 30f24709b..c9a533497 100755 --- a/script/notarize-macos.sh +++ b/script/notarize-macos.sh @@ -38,8 +38,8 @@ if [[ -z "${KEYCHAIN_PROFILE}" ]]; then fi ARCH=$(uname -m) -DIR="./dist/${VERSION}/musikcube_standalone_macos_${ARCH}_${VERSION}" -ARCHIVE="./dist/${VERSION}/musikcube_standalone_macos_${ARCH}_${VERSION}.zip" +DIR="./dist/${VERSION}/musikcube_macos_${ARCH}_${VERSION}" +ARCHIVE="./dist/${VERSION}/musikcube_macos_${ARCH}_${VERSION}.zip" pushd $DIR codesign --remove-signature musikcube musikcubed libmusikcore.dylib