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
054416b0
Commit
054416b0
authored
9 years ago
by
Alexander Larsson
Browse files
Options
Downloads
Plain Diff
Merge pull request
#20
from cgwalters/travis
Travis
parents
38ca0434
96466f29
No related branches found
Branches containing commit
Tags
v0.20191120.0
Tags containing commit
1 merge request
!365
Build our own bubblewrap, and use it preferentially
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.travis.yml
+23
-0
23 additions, 0 deletions
.travis.yml
Makefile-docs.am
+2
-0
2 additions, 0 deletions
Makefile-docs.am
configure.ac
+26
-0
26 additions, 0 deletions
configure.ac
with
51 additions
and
0 deletions
.travis.yml
0 → 100644
+
23
−
0
View file @
054416b0
language
:
c
dist
:
trusty
addons
:
apt
:
packages
:
-
automake
-
autotools-dev
-
libcap-dev
script
:
-
env NOCONFIGURE=1 ./autogen.sh
-
mkdir build
-
cd build && ../configure
-
make -j
2
-
make check
notifications
:
webhooks
:
http://escher.verbum.org:54856/travis
email
:
false
branches
:
only
:
-
auto
This diff is collapsed.
Click to expand it.
Makefile-docs.am
+
2
−
0
View file @
054416b0
...
...
@@ -11,4 +11,6 @@ XSLTPROC_FLAGS = \
.xml.1:
$(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
if ENABLE_MAN
man_MANS = bwrap.1
endif
This diff is collapsed.
Click to expand it.
configure.ac
+
26
−
0
View file @
054416b0
...
...
@@ -17,6 +17,24 @@ AM_PROG_CC_C_O
AC_CHECK_HEADERS([sys/capability.h], [], [AC_MSG_ERROR([*** POSIX caps headers not found])])
AC_ARG_ENABLE(man,
[AS_HELP_STRING([--enable-man],
[generate man pages [default=auto]])],,
enable_man=maybe)
AS_IF([test "$enable_man" != no], [
AC_PATH_PROG([XSLTPROC], [xsltproc], [])
AS_IF([test -z "$XSLTPROC"], [
AS_IF([test "$enable_man" = yes], [
AC_MSG_ERROR([xsltproc is required for --enable-man])
])
enable_man=no
], [
enable_man=yes
])
])
AM_CONDITIONAL(ENABLE_MAN, test "$enable_man" != no)
changequote(,)dnl
if test "x$GCC" = "xyes"; then
WARN_CFLAGS="-Wall -Werror=missing-prototypes"
...
...
@@ -28,3 +46,11 @@ AC_CONFIG_FILES([
Makefile
])
AC_OUTPUT
echo "
bubblewrap $VERSION
===================
man pages (xsltproc): $enable_man
mysteriously satisfying to pop: yes"
echo ""
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