[Android] [PATCH 4/5] merge find_modules.sh with compile-libvlc.sh

[Jean-Baptiste Kempf]

OK, but the list should be updated...

On 09 Feb, Thomas Guillem wrote :
> ---
>  compile-libvlc.sh | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++-
>  find_modules.sh   | 74 -------------------------------------------------------
>  2 files changed, 69 insertions(+), 75 deletions(-)
>  delete mode 100755 find_modules.sh
> 
> diff --git a/compile-libvlc.sh b/compile-libvlc.sh
> index 90cae9b..4daf12d 100755
> --- a/compile-libvlc.sh
> +++ b/compile-libvlc.sh
> @@ -155,6 +155,64 @@ VLC_CONFIGURE_ARGS="\
>  --disable-schroedinger --disable-dirac \
>  "
>  
> +########################
> +# VLC MODULE BLACKLIST #
> +########################
> +
> +VLC_MODULE_BLACKLIST="
> +addons.*
> +stats
> +access_(bd|shm|imem)
> +oldrc
> +real
> +hotkeys
> +gestures
> +sap
> +dynamicoverlay
> +rss
> +ball
> +audiobargraph_[av]
> +clone
> +mosaic
> +osdmenu
> +puzzle
> +mediadirs
> +t140
> +ripple
> +motion
> +sharpen
> +grain
> +posterize
> +mirror
> +wall
> +scene
> +blendbench
> +psychedelic
> +alphamask
> +netsync
> +audioscrobbler
> +motiondetect
> +motionblur
> +export
> +smf
> +podcast
> +bluescreen
> +erase
> +stream_filter_record
> +speex_resampler
> +remoteosd
> +magnify
> +gradient
> +.*tospdif
> +dtstofloat32
> +logger
> +visual
> +fb
> +aout_file
> +yuv
> +.dummy
> +"
> +
>  #########
>  # FLAGS #
>  #########
> @@ -491,7 +549,17 @@ cd $SRC_DIR
>  ##################
>  
>  echo "Generating static module list"
> -VLC_MODULES=`./find_modules.sh vlc/$VLC_BUILD_DIR`
> +blacklist_regexp=
> +for i in ${VLC_MODULE_BLACKLIST}
> +do
> +    if [ -z "${blacklist_regexp}" ]
> +    then
> +        blacklist_regexp="${i}"
> +    else
> +        blacklist_regexp="${blacklist_regexp}|${i}"
> +    fi
> +done
> +VLC_MODULES=`find vlc/$VLC_BUILD_DIR/modules -name 'lib*plugin.a' | grep -vE "lib(${blacklist_regexp})_plugin.a" | tr '\n' ' '`
>  
>  DEFINITION="";
>  BUILTINS="const void *vlc_static_modules[] = {\n";
> diff --git a/find_modules.sh b/find_modules.sh
> deleted file mode 100755
> index 6e70bb8..0000000
> --- a/find_modules.sh
> +++ /dev/null
> @@ -1,74 +0,0 @@
> -#!/bin/sh
> -
> -if [ $# != 1 ]
> -then
> -    echo "Usage: $0 [vlc build dir]"
> -    exit 1
> -fi
> -
> -blacklist="
> -addons.*
> -stats
> -access_(bd|shm|imem)
> -oldrc
> -real
> -hotkeys
> -gestures
> -sap
> -dynamicoverlay
> -rss
> -ball
> -audiobargraph_[av]
> -clone
> -mosaic
> -osdmenu
> -puzzle
> -mediadirs
> -t140
> -ripple
> -motion
> -sharpen
> -grain
> -posterize
> -mirror
> -wall
> -scene
> -blendbench
> -psychedelic
> -alphamask
> -netsync
> -audioscrobbler
> -motiondetect
> -motionblur
> -export
> -smf
> -podcast
> -bluescreen
> -erase
> -stream_filter_record
> -speex_resampler
> -remoteosd
> -magnify
> -gradient
> -.*tospdif
> -dtstofloat32
> -logger
> -visual
> -fb
> -aout_file
> -yuv
> -.dummy
> -"
> -
> -regexp=
> -for i in ${blacklist}
> -do
> -    if [ -z "${regexp}" ]
> -    then
> -        regexp="${i}"
> -    else
> -        regexp="${regexp}|${i}"
> -    fi
> -done
> -
> -find $1/modules -name 'lib*plugin.a' | grep -vE "lib(${regexp})_plugin.a" | tr '\n' ' '
> -- 
> 2.1.3
> 
> _______________________________________________
> Android mailing list
> Android at videolan.org
> https://mailman.videolan.org/listinfo/android

-- 
With my kindest regards,

-- 
Jean-Baptiste Kempf
http://www.jbkempf.com/ - +33 672 704 734
Sent from my Electronic Device