From 8f0d8d7d6c749b5dd37c186ff2df1b78c8695a9e Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 12 Sep 2025 10:49:34 -0500 Subject: [PATCH 1/2] fix mock --- repertory/repertory_test/include/mocks/mock_open_file.hpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repertory/repertory_test/include/mocks/mock_open_file.hpp b/repertory/repertory_test/include/mocks/mock_open_file.hpp index 32e7a40c..dba74fa7 100644 --- a/repertory/repertory_test/include/mocks/mock_open_file.hpp +++ b/repertory/repertory_test/include/mocks/mock_open_file.hpp @@ -36,6 +36,8 @@ public: MOCK_METHOD(bool, close, (), (override)); + MOCK_METHOD(void, force_download, (), (override)); + MOCK_METHOD(std::string, get_api_path, (), (const, override)); MOCK_METHOD(std::size_t, get_chunk_size, (), (const, override)); From e3dd7c97916afd6a97dfbebf8ba5e1149a6590a1 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Fri, 12 Sep 2025 10:53:42 -0500 Subject: [PATCH 2/2] updated build system --- scripts/make_package.sh | 27 ++++++++++++++++++++++++++- support/3rd_party/icu_configure.sh | 0 2 files changed, 26 insertions(+), 1 deletion(-) mode change 100755 => 100644 support/3rd_party/icu_configure.sh diff --git a/scripts/make_package.sh b/scripts/make_package.sh index bd22cfe7..50647df3 100755 --- a/scripts/make_package.sh +++ b/scripts/make_package.sh @@ -75,7 +75,32 @@ tar cvzf "${PROJECT_OUT_FILE}" -C ${TEMP_DIR} . || error_exit "failed to create create_file_validations "${PROJECT_OUT_FILE}" popd -if [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" ]; then +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 + + DMG_ROOT="${TEMP_DIR}/dmgroot" + mkdir -p "${DMG_ROOT}" || error_exit "failed to create dmgroot" 1 + + rsync -a "${APP_SRC}" "${DMG_ROOT}/" || error_exit "failed to stage app bundle" 1 + + ln -s /Applications "${DMG_ROOT}/Applications" || true + + DMG_OUT="${PROJECT_FILE_PART}.dmg" + + hdiutil create \ + -volname "${PROJECT_NAME}" \ + -srcfolder "${DMG_ROOT}" \ + -ov -format UDZO \ + "${PROJECT_DIST_DIR}/${DMG_OUT}" || + error_exit "hdiutil failed" 1 + + pushd "${PROJECT_DIST_DIR}" + create_file_validations "${DMG_OUT}" + popd +elif [ "${PROJECT_IS_MINGW}" == "1" ] && [ -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" ]; then cp -f "${PROJECT_DIST_DIR}/../${PROJECT_NAME}.iss" "${TEMP_DIR}/${PROJECT_NAME}.iss" rsync -av --progress --delete ${PROJECT_SOURCE_DIR}/support/3rd_party/*.msi ${TEMP_DIR}/3rd_party/ diff --git a/support/3rd_party/icu_configure.sh b/support/3rd_party/icu_configure.sh old mode 100755 new mode 100644