[vlc-commits] [Git][videolan/vlc][master] 3 commits: package/win32: enable extra checks on meson too
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Sun Nov 10 11:42:16 UTC 2024
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
dd15543d by Steve Lhomme at 2024-11-10T11:11:46+00:00
package/win32: enable extra checks on meson too
- - - - -
d8979813 by Steve Lhomme at 2024-11-10T11:11:46+00:00
package/win32: use "-n" instead of "! -z" tests
- - - - -
5080e48b by Steve Lhomme at 2024-11-10T11:11:46+00:00
package/win32: use $()" rather than "``" for commands
- - - - -
1 changed file:
- extras/package/win32/build.sh
Changes:
=====================================
extras/package/win32/build.sh
=====================================
@@ -182,9 +182,9 @@ make -j$JOBS
# avoid installing wine on WSL
# wine is needed to build Qt with shaders
-if test -z "`command -v wine`"
+if test -z "$(command -v wine)"
then
- if test -n "`command -v wsl.exe`"
+ if test -n "$(command -v wsl.exe)"
then
echo "Using wsl.exe to replace wine"
echo "#!/bin/sh" > build/bin/wine
@@ -201,14 +201,14 @@ fi
cd ../../
CONTRIB_PREFIX=$TRIPLET
-if [ ! -z "$BUILD_UCRT" ]; then
+if [ -n "$BUILD_UCRT" ]; then
if [ ! "$COMPILING_WITH_UCRT" -gt 0 ]; then
echo "UCRT builds need a UCRT toolchain"
exit 1
fi
- if [ ! -z "$WINSTORE" ]; then
+ if [ -n "$WINSTORE" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --disable-disc --disable-srt --disable-sdl --disable-SDL_image"
# FIXME enable discs ?
# modplug uses GlobalAlloc/Free and lstrcpyA/wsprintfA/lstrcpynA
@@ -227,7 +227,7 @@ if [ ! -z "$BUILD_UCRT" ]; then
fi
fi
-if [ ! -z "$WIXPATH" ]; then
+if [ -n "$WIXPATH" ]; then
# the CI didn't provide its own WIX, make sure we use our own
CONTRIBFLAGS="$CONTRIBFLAGS --enable-wix"
fi
@@ -269,11 +269,11 @@ unset CPPFLAGS
VLC_LDFLAGS="$LDFLAGS"
unset LDFLAGS
-if [ ! -z "$BUILD_UCRT" ]; then
+if [ -n "$BUILD_UCRT" ]; then
WIDL=${TRIPLET}-widl
VLC_CPPFLAGS="$VLC_CPPFLAGS -D__MSVCRT_VERSION__=0xE00 -D_UCRT"
- if [ ! -z "$WINSTORE" ]; then
+ if [ -n "$WINSTORE" ]; then
SHORTARCH="$SHORTARCH-uwp"
TRIPLET=${TRIPLET}uwp
VLC_CPPFLAGS="$VLC_CPPFLAGS -DWINAPI_FAMILY=WINAPI_FAMILY_APP -D_UNICODE -DUNICODE"
@@ -281,7 +281,7 @@ if [ ! -z "$BUILD_UCRT" ]; then
if [ -z "$NTDDI" ]; then
WINVER=0x0A00
else
- WINVER=`echo ${NTDDI} |cut -c 1-6`
+ WINVER=$(echo ${NTDDI} |cut -c 1-6)
if [ "$WINVER" != "0x0A00" ]; then
echo "Unsupported SDK/NTDDI version ${NTDDI} for Winstore"
fi
@@ -307,13 +307,13 @@ if [ ! -z "$BUILD_UCRT" ]; then
VLC_LDFLAGS="$VLC_LDFLAGS -lucrt"
if [ ! "$COMPILING_WITH_CLANG" -gt 0 ]; then
# assume gcc
- NEWSPECFILE="`pwd`/specfile-$SHORTARCH"
+ NEWSPECFILE="$(pwd)/specfile-$SHORTARCH"
# tell gcc to replace msvcrt with ucrtbase+ucrt
$CC -dumpspecs | sed -e "s/-lmsvcrt/-lucrt/" > $NEWSPECFILE
VLC_CFLAGS="$VLC_CFLAGS -specs=$NEWSPECFILE"
VLC_CXXFLAGS="$VLC_CXXFLAGS -specs=$NEWSPECFILE"
- if [ ! -z "$WINSTORE" ]; then
+ if [ -n "$WINSTORE" ]; then
# trick to provide these libraries instead of -ladvapi32 -lshell32 -luser32 -lkernel32
sed -i -e "s/-ladvapi32/-lwindowsapp -lwindowsappcompat/" $NEWSPECFILE
sed -i -e "s/-lshell32//" $NEWSPECFILE
@@ -327,7 +327,7 @@ else
fi
if [ -n "$NTDDI" ]; then
- WINVER=`echo ${NTDDI} |cut -c 1-6`
+ WINVER=$(echo ${NTDDI} |cut -c 1-6)
VLC_CPPFLAGS="$VLC_CPPFLAGS -DNTDDI_VERSION=$NTDDI"
fi
if [ -z "$WINVER" ]; then
@@ -353,13 +353,13 @@ if [ -n "$WITH_PDB" ]; then
VLC_CXXFLAGS="$VLC_CXXFLAGS -fdebug-prefix-map='$VLC_ROOT_PATH'='$PDB_MAP'"
fi
fi
-if [ ! -z "$BREAKPAD" ]; then
+if [ -n "$BREAKPAD" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --enable-breakpad"
fi
if [ "$RELEASE" != "yes" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --disable-optim"
fi
-if [ ! -z "$DISABLEGUI" ]; then
+if [ -n "$DISABLEGUI" ]; then
CONTRIBFLAGS="$CONTRIBFLAGS --disable-qt --disable-qtsvg --disable-qtdeclarative --disable-qt5compat --disable-qtshadertools --disable-qtwayland"
fi
@@ -457,16 +457,17 @@ if [ "$I18N" != "yes" ]; then
CONFIGFLAGS="$CONFIGFLAGS --disable-nls"
MCONFIGFLAGS="$MCONFIGFLAGS -Dnls=disabled"
fi
-if [ ! -z "$BREAKPAD" ]; then
+if [ -n "$BREAKPAD" ]; then
CONFIGFLAGS="$CONFIGFLAGS --with-breakpad=$BREAKPAD"
fi
-if [ ! -z "$WITH_PDB" ]; then
+if [ -n "$WITH_PDB" ]; then
CONFIGFLAGS="$CONFIGFLAGS --enable-pdb"
fi
-if [ ! -z "$EXTRA_CHECKS" ]; then
+if [ -n "$EXTRA_CHECKS" ]; then
CONFIGFLAGS="$CONFIGFLAGS --enable-extra-checks"
+ MCONFIGFLAGS="$MCONFIGFLAGS -Dextra_checks=true"
fi
-if [ ! -z "$DISABLEGUI" ]; then
+if [ -n "$DISABLEGUI" ]; then
CONFIGFLAGS="$CONFIGFLAGS --disable-vlc --disable-qt --disable-skins2"
MCONFIGFLAGS="$MCONFIGFLAGS -Dvlc=false -Dqt=disabled"
# MCONFIGFLAGS="$MCONFIGFLAGS -Dskins2=disabled"
@@ -475,7 +476,7 @@ else
MCONFIGFLAGS="$MCONFIGFLAGS -Dqt=enabled"
# MCONFIGFLAGS="$MCONFIGFLAGS -Dskins2=enabled"
fi
-if [ ! -z "$WINSTORE" ]; then
+if [ -n "$WINSTORE" ]; then
CONFIGFLAGS="$CONFIGFLAGS --enable-winstore-app"
MCONFIGFLAGS="$MCONFIGFLAGS -Dwinstore_app=true"
# uses CreateFile to access files/drives outside of the app
@@ -489,7 +490,7 @@ else
CONFIGFLAGS="$CONFIGFLAGS --enable-caca"
MCONFIGFLAGS="$MCONFIGFLAGS -Dcaca=enabled"
fi
-if [ ! -z "$INSTALL_PATH" ]; then
+if [ -n "$INSTALL_PATH" ]; then
CONFIGFLAGS="$CONFIGFLAGS --with-packagedir=$INSTALL_PATH"
fi
@@ -601,7 +602,7 @@ else
sha512sum vlc-*-release.7z
elif [ "$INSTALLER" = "m" ]; then
make package-msi
- elif [ ! -z "$INSTALL_PATH" ]; then
+ elif [ -n "$INSTALL_PATH" ]; then
make package-win-common
fi
fi
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/58106d711f3b308bef363df7f1bf7914ae916a84...5080e48b32cc70fbe72f8023c2da5d9003209002
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/58106d711f3b308bef363df7f1bf7914ae916a84...5080e48b32cc70fbe72f8023c2da5d9003209002
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
More information about the vlc-commits
mailing list