From eeccdf3fe4065cf26fc925a1186dd99e49128184 Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Sun, 12 Jul 2015 21:35:26 -0700 Subject: Copy over the entire framework and then clean it up. That's easier than trying to carefully copy the relevant bits. Change-Id: I2f174a735bf91f6434929c25ca33aced03e19597 Reviewed-on: https://code.wireshark.org/review/9620 Reviewed-by: Guy Harris --- packaging/macosx/osx-app.sh | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) (limited to 'packaging/macosx') diff --git a/packaging/macosx/osx-app.sh b/packaging/macosx/osx-app.sh index 4dcea13067..8d2219242d 100755 --- a/packaging/macosx/osx-app.sh +++ b/packaging/macosx/osx-app.sh @@ -499,14 +499,19 @@ while $endl; do if [ ! -d "$pkglib/$framework" ] ; then frameworkname=`echo "$framework" | sed -e "s;@rpath/Qt\([a-zA-Z0-9_]*\)\.framework/.*;Qt\1;" -e "s;$qt_frameworks_dir/Qt\([a-zA-Z0-9_]*\)\.framework/.*;Qt\1;"` echo "$qt_frameworks_dir/$frameworkname.framework -> $pkglib" - frameworkdir="$pkglib/$frameworkname.framework" - mkdir "$frameworkdir" - cp -nR "$qt_frameworks_dir/$frameworkname.framework/Contents" "$frameworkdir" - cp -nR "$qt_frameworks_dir/$frameworkname.framework/$frameworkname" "$frameworkdir" - cp -nR "$qt_frameworks_dir/$frameworkname.framework/Versions" "$frameworkdir" + cp -nR "$qt_frameworks_dir/$frameworkname.framework" "$pkglib" + # + # Get rid of the headers and debug stuff. + # + rm -rf "$pkglib/$frameworkname.framework/Headers" + rm -rf "$pkglib/$frameworkname.framework/"*.prl + rm -rf "$pkglib/$frameworkname.framework/"*_debug + rm -rf "$pkglib/$frameworkname.framework/"*_debug.prl + rm -rf "$pkglib/$frameworkname.framework/Versions"/*/Headers + rm -rf "$pkglib/$frameworkname.framework/Versions"/*/*_debug lib_dep_search_list=" $lib_dep_search_list - $frameworkdir/Versions/*/*" + $pkglib/$frameworkname.framework/Versions/Current/*" fi done fi -- cgit v1.2.1