Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
steam-runtime-tools
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
steamrt
steam-runtime-tools
Commits
623d594e
Commit
623d594e
authored
4 years ago
by
Simon McVittie
Browse files
Options
Downloads
Patches
Plain Diff
debian: Use a builddir that won't get copied into src/
Signed-off-by:
Simon McVittie
<
smcv@collabora.com
>
parent
e6333c42
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
debian/rules
+7
-7
7 additions, 7 deletions
debian/rules
tests/valgrind.sh
+1
-1
1 addition, 1 deletion
tests/valgrind.sh
with
8 additions
and
8 deletions
debian/rules
+
7
−
7
View file @
623d594e
...
...
@@ -37,7 +37,7 @@ endif
# knowledge of Meson.
override_dh_auto_clean:
rm -fr build
dir
rm -fr
_
build
rm -fr debian/locales
libexecdir := libexec
...
...
@@ -48,7 +48,7 @@ DESTDIR := $(CURDIR)/debian/tmp
relocatable_pkglibdir := $(CURDIR)/debian/libsteam-runtime-tools-0-relocatable-libs/usr/$(pkglibdir)
override_dh_auto_configure:
if ! meson build
dir
\
if ! meson
_
build \
--prefix=/usr \
--libexecdir=$(libexecdir) \
--libdir=$(libdir) \
...
...
@@ -60,24 +60,24 @@ override_dh_auto_configure:
-Dversion=$(DEB_VERSION) \
$(meson_options) \
; then \
cat build
dir
/meson-logs/meson-log.txt; \
cat
_
build/meson-logs/meson-log.txt; \
exit 1; \
fi
override_dh_auto_build:
ninja -v -C build
dir
ninja -v -C
_
build
override_dh_auto_test:
ifeq ($(filter nocheck,$(DEB_BUILD_OPTIONS)),)
debian/check-version-number.sh $(CURDIR)/build
dir
$(DEB_VERSION_UPSTREAM)
debian/check-version-number.sh $(CURDIR)/
_
build $(DEB_VERSION_UPSTREAM)
mkdir debian/locales
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 \
meson test -C build
dir
--verbose
meson test -C
_
build --verbose
endif
override_dh_auto_install:
DESTDIR=$(DESTDIR) ninja -C build
dir
install
DESTDIR=$(DESTDIR) ninja -C
_
build install
ln -s ../../bin/$(DEB_HOST_MULTIARCH)-vulkaninfo \
$(DESTDIR)/usr/$(pkglibexecdir)/
ln -s ../../bin/$(DEB_HOST_MULTIARCH)-wflinfo \
...
...
This diff is collapsed.
Click to expand it.
tests/valgrind.sh
+
1
−
1
View file @
623d594e
...
...
@@ -24,7 +24,7 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
# Usage:
# meson test -C build
dir
-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:
# $(pwd)/tests/valgrind.sh /usr/libexec/installed-tests/steam-runtime-tools-0/test-architecture
#
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment