[vlc-devel] [vlc-commits] win32: build.sh: add an interactive mode

[Konstantin Pavlov]

On Thu, Apr 19, 2018 at 08:00:01AM +0000, Simon Latapie wrote:
> vlc | branch: master | Simon Latapie <garf at videolan.org> | Wed Apr 18 18:39:10 2018 +0200| [c62afbf826f9e749a3a9732511c99824ed9e76ff] | committer: Hugo Beauzée-Luyssen
> 
> win32: build.sh: add an interactive mode
> 
> Adds an option to get a shell with the right environment set to build
> VLC.
> 
> Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>
> 
> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c62afbf826f9e749a3a9732511c99824ed9e76ff
> ---
> 
>  extras/package/win32/build.sh | 27 ++++++++++++++++++++++-----
>  1 file changed, 22 insertions(+), 5 deletions(-)
> 
> diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
> index fac89cabb7..7470b62a59 100755
> --- a/extras/package/win32/build.sh
> +++ b/extras/package/win32/build.sh
> @@ -25,12 +25,13 @@ OPTIONS:
>     -c            Create a Prebuilt contrib package (rarely used)
>     -l            Enable translations (can be slow)
>     -i <n|r|u>    Create an Installer (n: nightly, r: release, u: unsigned release archive)
> +   -s            Interactive shell (get correct environment variables for build)
>     -b <url>      Enable breakpad support and send crash reports to this URL
>  EOF
>  }
>  
>  ARCH="x86_64"
> -while getopts "hra:pcli:b:" OPTION
> +while getopts "hra:pcli:sb:" OPTION
>  do
>       case $OPTION in
>           h)
> @@ -56,6 +57,9 @@ do
>           i)
>               INSTALLER=$OPTARG
>           ;;
> +         s)
> +             INTERACTIVE="yes"
> +         ;;
>           b)
>               BREAKPAD=$OPTARG
>           ;;
> @@ -87,13 +91,29 @@ TRIPLET=$ARCH-w64-mingw32
>  
>  info "Building extra tools"
>  cd extras/tools
> +# bootstrap only if needed in interactive mode
> +if [ "$INTERACTIVE" != "yes" || ! -f ./Makefile ]; then
>  ./bootstrap
> +fi

>From jenkins nightlies:

+ cd extras/tools
+ [  != yes
extras/package/win32/build.sh: 95: [: missing ]
+ -f ./Makefile ]
extras/package/win32/build.sh: 95: extras/package/win32/build.sh: -f: not
found
+ ./bootstrap


So I guess there should be two [] ?

-- 
VideoLAN, Vice President
www.videolan.org
+7 926 165 45 31
@cryothresh