Skip to content
Snippets Groups Projects
Commit 623d594e authored by Simon McVittie's avatar Simon McVittie
Browse files

debian: Use a builddir that won't get copied into src/

parent e6333c42
No related branches found
No related tags found
No related merge requests found
...@@ -37,7 +37,7 @@ endif ...@@ -37,7 +37,7 @@ endif
# knowledge of Meson. # knowledge of Meson.
override_dh_auto_clean: override_dh_auto_clean:
rm -fr builddir rm -fr _build
rm -fr debian/locales rm -fr debian/locales
libexecdir := libexec libexecdir := libexec
...@@ -48,7 +48,7 @@ DESTDIR := $(CURDIR)/debian/tmp ...@@ -48,7 +48,7 @@ DESTDIR := $(CURDIR)/debian/tmp
relocatable_pkglibdir := $(CURDIR)/debian/libsteam-runtime-tools-0-relocatable-libs/usr/$(pkglibdir) relocatable_pkglibdir := $(CURDIR)/debian/libsteam-runtime-tools-0-relocatable-libs/usr/$(pkglibdir)
override_dh_auto_configure: override_dh_auto_configure:
if ! meson builddir \ if ! meson _build \
--prefix=/usr \ --prefix=/usr \
--libexecdir=$(libexecdir) \ --libexecdir=$(libexecdir) \
--libdir=$(libdir) \ --libdir=$(libdir) \
...@@ -60,24 +60,24 @@ override_dh_auto_configure: ...@@ -60,24 +60,24 @@ override_dh_auto_configure:
-Dversion=$(DEB_VERSION) \ -Dversion=$(DEB_VERSION) \
$(meson_options) \ $(meson_options) \
; then \ ; then \
cat builddir/meson-logs/meson-log.txt; \ cat _build/meson-logs/meson-log.txt; \
exit 1; \ exit 1; \
fi fi
override_dh_auto_build: override_dh_auto_build:
ninja -v -C builddir ninja -v -C _build
override_dh_auto_test: override_dh_auto_test:
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),) ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
debian/check-version-number.sh $(CURDIR)/builddir $(DEB_VERSION_UPSTREAM) debian/check-version-number.sh $(CURDIR)/_build $(DEB_VERSION_UPSTREAM)
mkdir debian/locales mkdir debian/locales
localedef -f UTF-8 -i en_US --no-archive debian/locales/en_US.UTF-8 localedef -f UTF-8 -i en_US --no-archive debian/locales/en_US.UTF-8
env LOCPATH=$(CURDIR)/debian/locales LC_ALL=en_US.UTF-8 \ env LOCPATH=$(CURDIR)/debian/locales LC_ALL=en_US.UTF-8 \
meson test -C builddir --verbose meson test -C _build --verbose
endif endif
override_dh_auto_install: override_dh_auto_install:
DESTDIR=$(DESTDIR) ninja -C builddir install DESTDIR=$(DESTDIR) ninja -C _build install
ln -s ../../bin/$(DEB_HOST_MULTIARCH)-vulkaninfo \ ln -s ../../bin/$(DEB_HOST_MULTIARCH)-vulkaninfo \
$(DESTDIR)/usr/$(pkglibexecdir)/ $(DESTDIR)/usr/$(pkglibexecdir)/
ln -s ../../bin/$(DEB_HOST_MULTIARCH)-wflinfo \ ln -s ../../bin/$(DEB_HOST_MULTIARCH)-wflinfo \
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Usage: # Usage:
# meson test -C builddir -v --wrap=$(pwd)/tests/valgrind.sh # meson test -C _build -v --wrap=$(pwd)/tests/valgrind.sh
# or build with DEB_BUILD_OPTIONS=nostrip and use: # or build with DEB_BUILD_OPTIONS=nostrip and use:
# $(pwd)/tests/valgrind.sh /usr/libexec/installed-tests/steam-runtime-tools-0/test-architecture # $(pwd)/tests/valgrind.sh /usr/libexec/installed-tests/steam-runtime-tools-0/test-architecture
# #
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment