CMake+packaging: Create our macOS Frameworks directory in osx-app.sh.

This commit is contained in:
Gerald Combs 2022-02-28 16:15:47 -08:00
parent 211353c873
commit 167d44ea6d
2 changed files with 7 additions and 3 deletions

View File

@ -2489,9 +2489,6 @@ if(ENABLE_APPLICATION_BUNDLE)
"-Wl,-headerpad_max_install_names -Wl,-search_paths_first ${CMAKE_EXE_LINKER_FLAGS}"
)
# Create our Frameworks directory
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/run/${CMAKE_CFG_INTDIR}/Wireshark.app/Contents/Frameworks")
# Add files to the app bundle
# Wireshark.app/Contents
file(WRITE ${CMAKE_BINARY_DIR}/packaging/macosx/PkgInfo "APPLWshk\n")

View File

@ -147,6 +147,13 @@ bundle_binary_list="$pkgexec/$app_name $secondary_binary_list $plugin_library_li
echo -e "\\nFixing up $bundle..."
# Start with a clean Frameworks slate.
if [ -d "$pkglib" ] ; then
printf "Removing %s\n" "$pkglib"
rm -v -r -f "$pkglib"
fi
mkdir -v -m u=rwx,go=rx "$pkglib"
echo -e "\\nPrepopulating our libraries"
# Copy only <library>.<SOVERSION>.dylib.