[vlc-devel] [PATCH v2 13/13] extras: extract the contrib sources before building them

[Steve Lhomme]

On 2020-07-09 15:24, Alexandre Janniaux wrote:
> Hi,
> 
> I agree with Remi, there's no point in splitting both for
> most users, and it doesn't even solve the issue with multiple
> jobs because you could have an issue with one package, but the
> other jobs continuing to output text afterwards.

It's not meant to solve all problems but it's a step in the right 
direction. Extracting sources typically output a ton more lines per 
minute than the building phase. So if you happen to have extraction 
during the build phase you can't follow at all the build lines.

> Regards,
> --
> Alexandre Janniaux
> Videolabs
> 
> 
> On Thu, Jul 09, 2020 at 02:43:44PM +0200, Steve Lhomme wrote:
>> On 2020-07-07 19:13, Rémi Denis-Courmont wrote:
>>> Logs are confusing if you use multiple jobs. This has nothing to do with
>>> tar or fetch.
>>
>> Something is bad so we shouldn't do anything to fix it even halfway. That's
>> simply wrong.
>>
>>> -1.
>>
>> +1
>>
>>>
>>>
>>>
>>> Le 7 juillet 2020 08:29:34 GMT+02:00, Steve Lhomme <robux4 at ycbcr.xyz> a
>>> écrit :
>>>
>>>      This will make the logs easier to follow, especially when an error occurs.
>>>
>>>      The fetch part might be removed but the downloads will end up being mixed with
>>>      the package untaring which is also unreadable.
>>>      ------------------------------------------------------------------------
>>>        extras/ci/gitlab-ci.yml            | 1 +
>>>        extras/package/apple/build.sh      | 3 +++
>>>        extras/package/macosx/build.sh     | 1 +
>>>        extras/package/raspberry/build.sh  | 1 +
>>>        extras/package/snap/snapcraft.yaml | 1 +
>>>        extras/package/win32/build.sh      | 1 +
>>>        6 files changed, 8 insertions(+)
>>>
>>>      diff --git a/extras/ci/gitlab-ci.yml b/extras/ci/gitlab-ci.yml
>>>      index 61116fc26b9..3ac785d7283 100644
>>>      --- a/extras/ci/gitlab-ci.yml
>>>      +++ b/extras/ci/gitlab-ci.yml
>>>      @@ -198,6 +198,7 @@ debian:
>>>                    make prebuilt PREBUILT_URL="${VLC_PREBUILT_CONTRIBS_URL}"
>>>                else
>>>                    make -j$NCPU --output-sync=recurse fetch
>>>      +            make -j$NCPU --output-sync=recurse extract
>>>                    make -j$NCPU --output-sync=recurse
>>>                    make package
>>>                fi
>>>      diff --git a/extras/package/apple/build.sh b/extras/package/apple/build.sh
>>>      index 1b112e84651..97c3e8455d0 100755
>>>      --- a/extras/package/apple/build.sh
>>>      +++ b/extras/package/apple/build.sh
>>>      @@ -611,6 +611,9 @@ else
>>>            # Download source packages
>>>            $MAKE fetch -j$VLC_USE_NUMBER_OF_CORES
>>>      +    # Extract source packages
>>>      +    $MAKE extract -j$VLC_USE_NUMBER_OF_CORES
>>>      +
>>>            # Build contribs
>>>            $MAKE -j$VLC_USE_NUMBER_OF_CORES || abort_err "Building contribs failed"
>>>      diff --git a/extras/package/macosx/build.sh b/extras/package/macosx/build.sh
>>>      index 69395ef5d0d..90e06b31942 100755
>>>      --- a/extras/package/macosx/build.sh
>>>      +++ b/extras/package/macosx/build.sh
>>>      @@ -166,6 +166,7 @@ mkdir -p contrib-$TRIPLET && cd contrib-$TRIPLET
>>>        if [ "$CONTRIBFROMSOURCE" = "yes" ]; then
>>>            make list
>>>            make fetch
>>>      +    make extract
>>>            make -j$JOBS .gettext
>>>            make -j$JOBS -k || make -j1
>>>      diff --git a/extras/package/raspberry/build.sh b/extras/package/raspberry/build.sh
>>>      index a3c4dff2f2d..bb86c4e622a 100755
>>>      --- a/extras/package/raspberry/build.sh
>>>      +++ b/extras/package/raspberry/build.sh
>>>      @@ -127,6 +127,7 @@ export LDFLAGS="$LDFLAGS -L/usr/$TRIPLET/lib -L/opt/vc/lib"
>>>        if [ "$PREBUILT" != "yes" ]; then
>>>            make list
>>>            make -j$JOBS --output-sync=recurse fetch
>>>      +    make -j$JOBS --output-sync=recurse extract
>>>            make -j$JOBS --output-sync=recurse -k || make -j1
>>>            if [ "$PACKAGE" = "yes" ]; then
>>>                make package
>>>      diff --git a/extras/package/snap/snapcraft.yaml b/extras/package/snap/snapcraft.yaml
>>>      index 7ee9954cf33..dce31d1d2a7 100644
>>>      --- a/extras/package/snap/snapcraft.yaml
>>>      +++ b/extras/package/snap/snapcraft.yaml
>>>      @@ -84,6 +84,7 @@ parts:
>>>              else
>>>                  make list
>>>                  make -j $(getconf _NPROCESSORS_ONLN) fetch
>>>      +          make -j $(getconf _NPROCESSORS_ONLN) extract
>>>                  make -j $(getconf _NPROCESSORS_ONLN) -k install || make -j1
>>>                  make package
>>>              fi
>>>      diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
>>>      index 568159907ba..c30cfc65222 100755
>>>      --- a/extras/package/win32/build.sh
>>>      +++ b/extras/package/win32/build.sh
>>>      @@ -300,6 +300,7 @@ ${VLC_ROOT_PATH}/contrib/bootstrap --host=$TRIPLET --prefix=../$CONTRIB_PREFIX $
>>>        if [ "$PREBUILT" != "yes" ]; then
>>>            make list
>>>            make -j$JOBS fetch
>>>      +    make -j$JOBS extract
>>>            make -j$JOBS -k || make -j1
>>>            if [ "$PACKAGE" = "yes" ]; then
>>>                make package
>>>
>>>
>>> --
>>> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser
>>> ma brièveté.
>>>
>>> _______________________________________________
>>> vlc-devel mailing list
>>> To unsubscribe or modify your subscription options:
>>> https://mailman.videolan.org/listinfo/vlc-devel
>>>
>> _______________________________________________
>> vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
>