cmake: Remove outdated osxbundle files

These files have been superseded by files in CI/scripts/macos. They are no longer used, and keeping them around creates confusion and makes people think they are still used. Let's remove them to prevent further confusion. This commit also removes the CMake function `obs_finish_bundle` that was only used with the osxbundle resources and removes calls to that function.
491134648 · May 9, 2021 · a7b20fc · a7b20fc
1 parent 2b1eda6
commit a7b20fc
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 103 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -276,8 +276,6 @@ if(NOT INSTALLER_RUN)
  if (BUILD_TESTS OR ENABLE_UNIT_TESTS)
  add_subdirectory(test)
  endif()
-
- add_subdirectory(cmake/helper_subdir)
 else()
  obs_generate_multiarch_installer()
 endif()

diff --git a/cmake/Modules/ObsHelpers.cmake b/cmake/Modules/ObsHelpers.cmake
@@ -111,17 +111,6 @@ else()
  set(OBS_SCRIPT_PLUGIN_PATH "${OBS_INSTALL_PREFIX}${OBS_SCRIPT_PLUGIN_DESTINATION}")
 endif()
 
-function(obs_finish_bundle)
- if(NOT APPLE OR UNIX_STRUCTURE)
- return()
- endif()
-
- install(CODE
- "if(DEFINED ENV{FIXUP_BUNDLE})
- execute_process(COMMAND \"${CMAKE_SOURCE_DIR}/cmake/osxbundle/fixup_bundle.sh\" . bin WORKING_DIRECTORY \"\${CMAKE_INSTALL_PREFIX}\")
- endif()")
-endfunction()
-
 function(obs_generate_multiarch_installer)
  install(DIRECTORY "$ENV{obsInstallerTempDir}/"
  DESTINATION "."

diff --git a/cmake/helper_subdir/CMakeLists.txt b/cmake/helper_subdir/CMakeLists.txt
diff --git a/cmake/osxbundle/Info.plist b/cmake/osxbundle/Info.plist
diff --git a/cmake/osxbundle/fixup_bundle.sh b/cmake/osxbundle/fixup_bundle.sh
diff --git a/cmake/osxbundle/obs.icns b/cmake/osxbundle/obs.icns
diff --git a/cmake/osxbundle/obslaunch.sh b/cmake/osxbundle/obslaunch.sh