mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-09-19 20:32:15 +02:00
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.
This commit is contained in:
parent
2b1eda69e7
commit
a7b20fcd2a
@ -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()
|
||||
|
@ -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 "."
|
||||
|
@ -1,3 +0,0 @@
|
||||
|
||||
obs_finish_bundle()
|
||||
|
@ -1,28 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||
<plist version="1.0">
|
||||
<dict>
|
||||
<key>CFBundleIconFile</key>
|
||||
<string>OBS.icns</string>
|
||||
<key>CFBundleName</key>
|
||||
<string>OBS</string>
|
||||
<key>CFBundleExecutable</key>
|
||||
<string>OBS</string>
|
||||
<key>CFBundleIdentifier</key>
|
||||
<string>com.obsproject.obs-studio</string>
|
||||
<key>CFBundlePackageType</key>
|
||||
<string>APPL</string>
|
||||
<key>CFBundleSignature</key>
|
||||
<string>????</string>
|
||||
<key>LSMinimumSystemVersion</key>
|
||||
<string>10.8.5</string>
|
||||
<key>NSHighResolutionCapable</key>
|
||||
<true/>
|
||||
<key>LSAppNapIsDisabled</key>
|
||||
<true/>
|
||||
<key>NSCameraUsageDescription</key>
|
||||
<string>OBS needs to access the camera to enable camera sources to work.</string>
|
||||
<key>NSMicrophoneUsageDescription</key>
|
||||
<string>OBS needs to access the microphone to enable audio input.</string>
|
||||
</dict>
|
||||
</plist>
|
@ -1,54 +0,0 @@
|
||||
#!/bin/bash
|
||||
|
||||
if [ "$#" != 2 ]; then
|
||||
echo "usage: $0 /path/to/install/root relative/lib/destination"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
cd "$1"
|
||||
|
||||
function buildlist() {
|
||||
otool -L "$@" |
|
||||
grep -E '^\s+/' |
|
||||
grep -vE '^\s+/System/' |
|
||||
grep -vE '^\s+/usr/lib/' |
|
||||
perl -pe 's|^\s+(/.*)\s\(.*$|$1|' |
|
||||
grep -vE ":$" |
|
||||
sort -u
|
||||
}
|
||||
export -f buildlist
|
||||
|
||||
DEST="$2"
|
||||
LDEST="@rpath"
|
||||
TARGETS="$(find . \( -perm +111 -and -type f \))"
|
||||
FOUNDLIBS="$(buildlist $TARGETS)"
|
||||
PFOUNDLIBS=""
|
||||
|
||||
while [ "$FOUNDLIBS" != "$PFOUNDLIBS" ]; do
|
||||
PFOUNDLIBS="$FOUNDLIBS"
|
||||
FOUNDLIBS="$(buildlist $TARGETS $PFOUNDLIBS)"
|
||||
done
|
||||
|
||||
INTOOL_CALL=()
|
||||
|
||||
for lib in $FOUNDLIBS; do
|
||||
libname="$(basename "$lib")"
|
||||
|
||||
INTOOL_CALL+=(-change "$lib" "$LDEST/$libname")
|
||||
cp "$lib" "$DEST/$libname"
|
||||
chmod 644 "$DEST/$libname"
|
||||
|
||||
echo "Fixing up dependency: $libname"
|
||||
done
|
||||
|
||||
for lib in $FOUNDLIBS; do
|
||||
libname="$(basename "$lib")"
|
||||
lib="$DEST/$libname"
|
||||
|
||||
install_name_tool ${INTOOL_CALL[@]} -id "$LDEST/$libname" "$lib"
|
||||
done
|
||||
|
||||
for target in $TARGETS; do
|
||||
install_name_tool ${INTOOL_CALL[@]} "$target"
|
||||
done
|
||||
|
Binary file not shown.
@ -1,5 +0,0 @@
|
||||
#!/bin/sh
|
||||
cd "$(dirname "$0")"
|
||||
cd ../Resources/bin
|
||||
exec ./obs "$@"
|
||||
|
Loading…
Reference in New Issue
Block a user