[vlc-commits] apple: bundle.sh: add executable name for packaging

[Alexandre Janniaux]

vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Tue Feb 23 18:30:22 2021 +0100| [94ce9a2a1eeb6168be36cdbc66f7ca06ec19dc28] | committer: Alexandre Janniaux

apple: bundle.sh: add executable name for packaging

It allows multiple test executable to be packaged, while providing a
handy way to package whether or not libtool generates a wrapper script
(when linked to dynamic libraries) without having to install.

If the APP_EXECUTABLE is not provided, it defaults to using the
APP_NAME.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=94ce9a2a1eeb6168be36cdbc66f7ca06ec19dc28
---

 extras/package/apple/bundle.sh | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/extras/package/apple/bundle.sh b/extras/package/apple/bundle.sh
index 1a38192f06..e52761af82 100755
--- a/extras/package/apple/bundle.sh
+++ b/extras/package/apple/bundle.sh
@@ -4,9 +4,10 @@ set -eu
 
 readonly SCRIPT_DIR="$(cd "${BASH_SOURCE%/*}"; pwd)"
 readonly BUILD_DIR="$(cd "$1"; pwd)"
-
-APP="Payload/vlccore.app"
-IPA="vlccore_unsigned.ipa"
+readonly APP_NAME="$2"
+readonly APP_EXECUTABLE="${3:-${APP_NAME}}"
+readonly APP="Payload/${APP_NAME}.app"
+readonly IPA="${APP_NAME}_unsigned.ipa"
 
 # CONVERT_PLIST <input file> <output file>
 # Convert a plist file into binary1 format in order to put it
@@ -35,8 +36,8 @@ if [ -z "$INSTALL_NAME_TOOL" ]; then
 fi
 
 # VLC core test binary compiled for iOS
-cp "${BUILD_DIR}/test/.libs/vlc-ios" "$APP/vlccore"
-${INSTALL_NAME_TOOL} "$APP/vlccore" -add_rpath "@executable_path/Frameworks"
+cp "${BUILD_DIR}/test/${APP_EXECUTABLE}" "${APP}/${APP_NAME}"
+${INSTALL_NAME_TOOL} "${APP}/${APP_NAME}" -add_rpath "@executable_path/Frameworks"
 
 # Convert Info.plist from XML to binary
 CONVERT_PLIST "${SCRIPT_DIR}/Info.plist" "Payload/vlccore.app/Info.plist"