[vlc-commits] macOS build.sh: Add option to package the build results

[David Fuhrmann]

vlc | branch: master | David Fuhrmann <dfuhrmann at videolan.org> | Sun Sep  3 17:05:42 2017 +0200| [be8e6b297dc5d9280de9a5c671e9ad79e6880c9b] | committer: David Fuhrmann

macOS build.sh: Add option to package the build results

This packages contribs (if build contrib from source is activated),
and it creates DMG with its final contents.

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

 extras/package/macosx/build.sh | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
index 36e5d39840..1e49c917e6 100755
--- a/extras/package/macosx/build.sh
+++ b/extras/package/macosx/build.sh
@@ -31,6 +31,7 @@ OPTIONS:
    -j            Force number of cores to be used
    -r            Rebuild everything (tools, contribs, vlc)
    -c            Recompile contribs from sources
+   -p            Build packages for all artifacts
    -k <sdk>      Use the specified sdk (default: $SDKROOT)
    -a <arch>     Use the specified arch (default: $ARCH)
 EOF
@@ -47,7 +48,7 @@ spopd()
     popd > /dev/null
 }
 
-while getopts "hvrck:a:j:" OPTION
+while getopts "hvrcpk:a:j:" OPTION
 do
      case $OPTION in
          h)
@@ -64,6 +65,9 @@ do
          c)
              CONTRIBFROMSOURCE="yes"
          ;;
+         p)
+             PACKAGE="yes"
+         ;;
          a)
              ARCH=$OPTARG
          ;;
@@ -175,6 +179,11 @@ if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
     make fetch
     make -j$JOBS .gettext
     make -j$JOBS
+
+    if [ "$PACKAGE" = "yes" ]; then
+        make package
+    fi
+
 else
 if [ ! -e "../$TRIPLET" ]; then
     make prebuilt > $out
@@ -217,7 +226,6 @@ fi
 # make
 #
 
-
 if [ "$REBUILD" = "yes" ]; then
     info "Running make clean"
     make clean
@@ -228,3 +236,9 @@ make -j$JOBS
 
 info "Preparing VLC.app"
 make VLC.app
+
+
+if [ "$PACKAGE" = "yes" ]; then
+    info "Building VLC dmg package"
+    make package-macosx
+fi