Skip to content

Commit

Permalink
Merge pull request #625 from WhyNotHugo/drop-autotools
Browse files Browse the repository at this point in the history
Remove autotools build system
  • Loading branch information
smcv authored Sep 3, 2024
2 parents dc63ec6 + 2834c01 commit d2f85e5
Show file tree
Hide file tree
Showing 10 changed files with 4 additions and 1,031 deletions.
68 changes: 2 additions & 66 deletions .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,66 +9,6 @@ on:
- main

jobs:
check:
name: Build with Autotools and gcc, and test
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v1
- name: Install build-dependencies
run: sudo ./ci/builddeps.sh
- name: Create logs dir
run: mkdir test-logs
- name: autogen.sh
run: NOCONFIGURE=1 ./autogen.sh
- name: configure
run: |
mkdir _build
pushd _build
../configure \
--enable-man \
--enable-selinux \
${NULL+}
popd
env:
CFLAGS: >-
-O2
-Wp,-D_FORTIFY_SOURCE=2
-fsanitize=address
-fsanitize=undefined
- name: make
run: make -C _build -j $(getconf _NPROCESSORS_ONLN) V=1
- name: smoke-test
run: |
set -x
./_build/bwrap --bind / / --tmpfs /tmp true
env:
ASAN_OPTIONS: detect_leaks=0
- name: check
run: |
make -C _build -j $(getconf _NPROCESSORS_ONLN) check VERBOSE=1 BWRAP_MUST_WORK=1
env:
ASAN_OPTIONS: detect_leaks=0
- name: Collect overall test logs on failure
if: failure()
run: mv _build/test-suite.log test-logs/ || true
- name: Collect individual test logs on cancel
if: failure() || cancelled()
run: mv _build/tests/*.log test-logs/ || true
- name: Upload test logs
uses: actions/upload-artifact@v1
if: failure() || cancelled()
with:
name: test logs
path: test-logs
- name: install
run: |
make -C _build install DESTDIR="$(pwd)/DESTDIR"
( cd DESTDIR && find -ls )
- name: distcheck
run: |
make -C _build -j $(getconf _NPROCESSORS_ONLN) distcheck VERBOSE=1 BWRAP_MUST_WORK=1
meson:
name: Build with Meson and gcc, and test
runs-on: ubuntu-latest
Expand Down Expand Up @@ -152,16 +92,12 @@ jobs:
uses: actions/checkout@v1
- name: Install build-dependencies
run: sudo ./ci/builddeps.sh --clang
- name: autogen.sh
run: NOCONFIGURE=1 ./autogen.sh
- name: configure
run: ./configure --enable-selinux
- run: meson build -Dselinux=enabled
env:
CC: clang
CFLAGS: >-
-O2
-Werror=unused-variable
- name: make
run: make -j $(getconf _NPROCESSORS_ONLN) V=1
- run: meson compile -C build
- name: CodeQL analysis
uses: github/codeql-action/analyze@v2
12 changes: 0 additions & 12 deletions Makefile-bwrap.am

This file was deleted.

18 changes: 0 additions & 18 deletions Makefile-docs.am

This file was deleted.

102 changes: 0 additions & 102 deletions Makefile.am

This file was deleted.

14 changes: 2 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -92,25 +92,15 @@ Installation
bubblewrap is available in the package repositories of the most Linux distributions
and can be installed from there.

If you need to build bubblewrap from source, you can do this with meson or autotools.
If you need to build bubblewrap from source, you can do this with meson:

meson:

```
```sh
meson _builddir
meson compile -C _builddir
meson test -C _builddir
meson install -C _builddir
```

autotools:

```
./autogen.sh
make
sudo make install
```

Usage
-----

Expand Down
19 changes: 0 additions & 19 deletions autogen.sh

This file was deleted.

4 changes: 0 additions & 4 deletions ci/builddeps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ done
if dpkg-vendor --derives-from Debian; then
apt-get -y update
apt-get -q -y install \
autoconf \
automake \
build-essential \
docbook-xml \
docbook-xsl \
Expand All @@ -81,8 +79,6 @@ if command -v yum; then
yum -y install \
'pkgconfig(libselinux)' \
/usr/bin/eu-readelf \
autoconf \
automake \
docbook-style-xsl \
gcc \
git \
Expand Down
Loading

0 comments on commit d2f85e5

Please sign in to comment.