Skip to content
Snippets Groups Projects

Allow out of src tree builds

Closed François Cartegnie requested to merge fcartegnie/libvlcjni:mr301101 into master

Allows builds from a previously bootstrapped source, without touching it. (docker volume mounted as read-only)

Merge request reports

Pipeline #295722 passed

Pipeline passed for d734d925 on fcartegnie:mr301101

Closed by Thomas GuillemThomas Guillem 1 year ago (Jul 11, 2023 7:40am UTC)

Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Depends on JNI_PATH variable from vlc-android!1637 (merged)

  • added 1 commit

    • f944e995 - compile-libvlc.sh: allow out of src tree builds

    Compare with previous version

  • François Cartegnie marked this merge request as ready

    marked this merge request as ready

  • François Cartegnie resolved all threads

    resolved all threads

  • 113 113 ############
    114 # VLC PATH #
    114 # PATHS #
    115 115 ############
    116 SRC_DIR=$PWD
    117 if [ -f $SRC_DIR/src/libvlc.h ];then
    118 VLC_SRC_DIR="$SRC_DIR"
    119 elif [ -d $SRC_DIR/vlc ];then
    120 VLC_SRC_DIR=$SRC_DIR/vlc
    121 else
    116 : ${VLC_SRC_DIR:=$PWD}
    117 if [ ! -f $SRC_DIR/src/libvlc.h ] && [ -d $SRC_DIR/vlc ]; then
    118 VLC_SRC_DIR="$VLC_SRC_DIR/vlc"
    119 fi
    120
    121 if [ -z $VLC_SRC_DIR ];then
  • The change LGTM except the different optional improvement points.

  • added 1 commit

    • bbc4c69e - compile-libvlc.sh: allow out of src tree builds

    Compare with previous version

  • added 2 commits

    • 48cb1dd4 - compile-libvlc.sh: allow out of src tree builds
    • d1638e45 - check NDK dir

    Compare with previous version

  • added 2 commits

    • b582ab7a - compile-libvlc.sh: allow out of src tree builds
    • e8a69e2a - check NDK dir

    Compare with previous version

  • added 2 commits

    • 1abb92a5 - compile-libvlc.sh: allow out of src tree builds
    • d734d925 - check NDK dir

    Compare with previous version

  • Thomas Guillem
    Thomas Guillem @tguillem started a thread on commit 1abb92a5
  • 111 111 fi
  • Superseded by !66 (merged)

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading