[vlc-commits] [Git][videolan/vlc][master] 2 commits: package/macosx: add option to create zip archive

[Jean-Baptiste Kempf (@jbk)]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
99a0df74 by Marvin Scholz at 2022-03-15T06:42:50+00:00
package/macosx: add option to create zip archive

- - - - -
155036d4 by Marvin Scholz at 2022-03-15T06:42:50+00:00
CI: macosx: package zip instead of dmg

(only for non-nightly, nightlies still package a dmg as before)

- - - - -


2 changed files:

- extras/ci/gitlab-ci.yml
- extras/package/macosx/build.sh


Changes:

=====================================
extras/ci/gitlab-ci.yml
=====================================
@@ -366,11 +366,13 @@ raspbian-arm:
     script: |
         if [ "${CI_JOB_NAME:0:8}" = "nightly-" ]; then
             NIGHTLY_EXTRA_BUILD_FLAGS="-i n"
+        else
+            EXTRA_BUILD_FLAGS="-i z"
         fi
         if [ -n "$VLC_PREBUILT_CONTRIBS_URL" ]; then
             echo "Building using prebuilt contribs at $VLC_PREBUILT_CONTRIBS_URL"
         else
-            EXTRA_BUILD_FLAGS="-c -p"
+            EXTRA_BUILD_FLAGS="${EXTRA_BUILD_FLAGS} -c -p"
         fi
         mkdir build && cd build
         ../extras/package/macosx/build.sh $EXTRA_BUILD_FLAGS $NIGHTLY_EXTRA_BUILD_FLAGS -a $HOST_ARCH


=====================================
extras/package/macosx/build.sh
=====================================
@@ -31,7 +31,10 @@ OPTIONS:
    -r            Rebuild everything (tools, contribs, vlc)
    -c            Recompile contribs from sources
    -p            Build packages for all artifacts
-   -i <n|u>      Create an installable package (n: nightly, u: unsigned stripped release archive)
+   -i <n|u|z>    Create an installable package
+                     n: nightly
+                     u: unsigned stripped release archive
+                     z: zip
    -k <sdk>      Use the specified sdk (default: $SDKROOT)
    -a <arch>     Use the specified arch (default: $HOST_ARCH)
    -C            Use the specified VLC build dir
@@ -273,6 +276,9 @@ if [ "$PACKAGETYPE" = "u" ]; then
     shasum -a 512 vlc-*-release.zip
     shasum -a 512 vlc-macos-sdk-*.tar.gz
 
+elif [ "$PACKAGETYPE" = "z" ]; then
+    info "Packaging VLC zip archive"
+    make package-macosx-zip
 elif [ "$PACKAGETYPE" = "n" -o "$PACKAGE" = "yes" ]; then
     info "Building VLC dmg package"
     make package-macosx



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a32bf927244522a888c55b23cd1c29b61bba66ef...155036d4a4a071ac21812f0d6723e5c531ed4a08

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a32bf927244522a888c55b23cd1c29b61bba66ef...155036d4a4a071ac21812f0d6723e5c531ed4a08
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance