[vlc-devel] [PATCH 3.0 06/10] package/win32: build.sh: use a variable for the VLC source directory

[Steve Lhomme]

(cherry picked from commit 1496e914e227e17f16a79db04e070ec8430f5823) (edited)

edited:
- this branch always run the VLC bootstrap when building

Signed-off-by: Steve Lhomme <robux4 at ycbcr.xyz>
---
 extras/package/win32/build.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/extras/package/win32/build.sh b/extras/package/win32/build.sh
index 86274410b1..68568e3fdc 100755
--- a/extras/package/win32/build.sh
+++ b/extras/package/win32/build.sh
@@ -117,6 +117,7 @@ esac
 #####
 
 SCRIPT_PATH="$( cd "$(dirname "$0")" ; pwd -P )"
+VLC_ROOT_PATH="$( cd "${SCRIPT_PATH}/../../.." ; pwd -P )"
 
 JOBS=`getconf _NPROCESSORS_ONLN 2>&1`
 TRIPLET=$ARCH-w64-mingw32
@@ -143,7 +144,7 @@ if [ "$COMPILING_WITH_CLANG" -gt 0 ] && [ ! -d "libtool" ]; then
 fi
 # bootstrap only if needed in interactive mode
 if [ "$INTERACTIVE" != "yes" ] || [ ! -f ./Makefile ]; then
-    NEEDED="$FORCED_TOOLS" ${SCRIPT_PATH}/../../tools/bootstrap
+    NEEDED="$FORCED_TOOLS" ${VLC_ROOT_PATH}/extras/tools/bootstrap
 fi
 make -j$JOBS
 cd ../../
@@ -265,7 +266,7 @@ if [ ! -z "$WINSTORE" ]; then
     # we don't use a special toolchain to trigger the detection in contribs so force it manually
     export HAVE_WINSTORE=1
 fi
-${SCRIPT_PATH}/../../../contrib/bootstrap --host=$TRIPLET --prefix=../$CONTRIB_PREFIX $CONTRIBFLAGS
+${VLC_ROOT_PATH}/contrib/bootstrap --host=$TRIPLET --prefix=../$CONTRIB_PREFIX $CONTRIBFLAGS
 
 # Rebuild the contribs or use the prebuilt ones
 if [ "$PREBUILT" != "yes" ]; then
@@ -286,7 +287,7 @@ cd ../..
 
 info "Bootstrapping"
 
-${SCRIPT_PATH}/../../../bootstrap
+${VLC_ROOT_PATH}/bootstrap
 
 info "Configuring VLC"
 if [ -z "$PKG_CONFIG" ]; then
-- 
2.26.2