From 694f487861dc341d18af8df0dce00cb8064dfe64 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 12 Sep 2025 17:58:40 -0500 Subject: [PATCH] fix dmg --- cmake/versions.cmake | 14 +++++++------- scripts/make_package.sh | 7 ++----- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/cmake/versions.cmake b/cmake/versions.cmake index 01c6d81b..7b24f207 100644 --- a/cmake/versions.cmake +++ b/cmake/versions.cmake @@ -1,15 +1,15 @@ set(BINUTILS_VERSION 2.44) -set(BOOST2_MAJOR_VERSION 1) -set(BOOST2_MINOR_VERSION 76) -set(BOOST2_PATCH_VERSION 0) set(BOOST_MAJOR_VERSION 1) set(BOOST_MINOR_VERSION 88) set(BOOST_PATCH_VERSION 0) +set(BOOST2_MAJOR_VERSION 1) +set(BOOST2_MINOR_VERSION 76) +set(BOOST2_PATCH_VERSION 0) set(CPP_HTTPLIB_VERSION 0.23.1) -set(CURL2_VERSION 8_15_0) set(CURL_VERSION 8.15.0) -set(EXPAT2_VERSION 2_7_1) +set(CURL2_VERSION 8_15_0) set(EXPAT_VERSION 2.7.1) +set(EXPAT2_VERSION 2_7_1) set(GCC_VERSION 15.1.0) set(GTEST_VERSION 1.17.0) set(ICU_VERSION 76-1) @@ -22,9 +22,9 @@ set(PKG_CONFIG_VERSION 0.29.2) set(PUGIXML_VERSION 1.15) set(ROCKSDB_VERSION 10.4.2) set(SPDLOG_VERSION 1.15.3) -set(SQLITE2_VERSION 3.50.3) set(SQLITE_VERSION 3500300) +set(SQLITE2_VERSION 3.50.3) set(STDUUID_VERSION 1.2.3) -set(WINFSP2_VERSION 2.1) set(WINFSP_VERSION 2.1.25156) +set(WINFSP2_VERSION 2.1) set(ZLIB_VERSION 1.3.1) diff --git a/scripts/make_package.sh b/scripts/make_package.sh index 50647df3..38b04aa9 100755 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -75,11 +75,8 @@ tar cvzf "${PROJECT_OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create create_file_validations "${PROJECT_OUT_FILE}" popd -if [ "${PROJECT_IS_DARWIN}" = "1" ] && [ -n "${PROJECT_MACOS_ICNS_NAME}" ]; then - APP_SRC="${PROJECT_BUILD_DIR}/build/${PROJECT_NAME}.app" - if [ ! -d "${APP_SRC}" ]; then - error_exit "App bundle not found: ${APP_SRC}" 2 - fi +if [ -d "${TEMP_DIR}/${PROJECT_NAME}/${APP}.app" ]; then + APP_SRC="${TEMP_DIR}/${PROJECT_NAME}/${APP}.app" DMG_ROOT="${TEMP_DIR}/dmgroot" mkdir -p "${DMG_ROOT}" || error_exit "failed to create dmgroot" 1