[vlc-commits] [Git][videolan/vlc][master] 3 commits: configure: allow setting the directory where packaged files are put
Jean-Baptiste Kempf (@jbk)
gitlab at videolan.org
Thu Nov 24 08:07:02 UTC 2022
Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC
Commits:
56faa4e1 by Steve Lhomme at 2022-11-24T07:52:41+00:00
configure: allow setting the directory where packaged files are put
By default packaged files (Windows, Mac) are build in <top_build>/vlc-4.0.0-dev.
This allows setting a different directory which might avoid some copies when
building into a third party project.
- - - - -
939e574e by Steve Lhomme at 2022-11-24T07:52:41+00:00
win32: package: use the package dir instead of vlc-4.0.0-dev
- - - - -
74361e27 by Steve Lhomme at 2022-11-24T07:52:41+00:00
package: win32: set -o option to write in a packaged form
No-one on Windows expects to use bin, lib, include, share directories, which is
what package-win-install produces.
- - - - -
4 changed files:
- configure.ac
- extras/package/win32/build.sh
- extras/package/win32/msi.mak
- extras/package/win32/package.mak
Changes:
=====================================
configure.ac
=====================================
@@ -298,6 +298,21 @@ int foo() { return my_array[0]; }
AC_DEFINE([_BSD_SOURCE], [1], [ISO C, POSIX, and 4.3BSD things.])
AC_DEFINE([_SVID_SOURCE], [1], [ISO C, POSIX, and SVID things.])
+ AC_ARG_WITH(packagedir,
+ AS_HELP_STRING([--with-packagedir=DIR],
+ [output the packaged VLC files in DIR (default vlc-$PACKAGE_VERSION)]))
+ AS_IF([test "${with_packagedir}" != ""], [
+ AS_IF([test -d "${with_packagedir}"], [
+ PACKAGE_DIR=`cd "${with_packagedir}" && pwd -P`
+ ],[
+ dnl this should be an absolute path
+ PACKAGE_DIR="${with_packagedir}"
+ ])
+ ], [
+ PACKAGE_DIR=`pwd -P`"/vlc-${PACKAGE_VERSION}"
+ ])
+ AC_SUBST([PACKAGE_DIR])
+
case "${host_os}" in
*mingw32*)
SYS=mingw32
=====================================
extras/package/win32/build.sh
=====================================
@@ -402,7 +402,7 @@ else
CONFIGFLAGS="$CONFIGFLAGS --enable-dvdread --enable-caca"
fi
if [ ! -z "$INSTALL_PATH" ]; then
- CONFIGFLAGS="$CONFIGFLAGS --prefix=$INSTALL_PATH"
+ CONFIGFLAGS="$CONFIGFLAGS --with-packagedir=$INSTALL_PATH"
fi
${SCRIPT_PATH}/configure.sh --host=$TRIPLET --with-contrib=../contrib/$CONTRIB_PREFIX $CONFIGFLAGS
@@ -428,5 +428,5 @@ if [ "$ARCH" != "aarch64" ]; then
make package-msi
fi
elif [ ! -z "$INSTALL_PATH" ]; then
-make package-win-install
+make package-win-common
fi
=====================================
extras/package/win32/msi.mak
=====================================
@@ -7,7 +7,7 @@ WIXPATH=`wine winepath -u 'C:\\Program Files (x86)\\Windows Installer XML v3.5\\
HEAT=$(MSIDIR)/msi-heat.py
CANDLE=wine "$(WIXPATH)/candle.exe"
LIGHT=wine "$(WIXPATH)/light.exe"
-VLCDIR=$(abs_top_builddir)/vlc-$(VERSION)
+VLCDIR=@PACKAGE_DIR@
MSIDIR=$(abs_srcdir)/extras/package/win32/msi
W_MSIDIR=`wine winepath -w '$(MSIDIR)'`
MSIBUILDDIR=$(abs_top_builddir)/extras/package/win32/msi
=====================================
extras/package/win32/package.mak
=====================================
@@ -3,7 +3,7 @@ BUILT_SOURCES_distclean += \
extras/package/win32/NSIS/vlc.win32.nsi extras/package/win32/NSIS/spad.nsi
endif
-win32_destdir=$(top_builddir)/vlc-$(VERSION)
+win32_destdir=@PACKAGE_DIR@
win32_debugdir=$(abs_top_builddir)/symbols-$(VERSION)
7ZIP_OPTS=-t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d430a32330fc822d85f07bb5a99191e6b4c00ebe...74361e27dd77f0c9aba963167ba1532972818b10
--
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/d430a32330fc822d85f07bb5a99191e6b4c00ebe...74361e27dd77f0c9aba963167ba1532972818b10
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