Merge branch 'v2.1.0-rc-develop' of https://git.fifthgrid.com/blockstorage/repertory into v2.1.0-rc-develop

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));

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/