Skip to content

Commit efb9126

Browse files
committed
Remove all the files related to auto tools
Update docs Update dockerfile to use cmake instead of autotools Remove autotools targets Fix Github CI hash, and fix build.h generation process. Fix README.md
1 parent 9cda6aa commit efb9126

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+244
-8893
lines changed

.github/workflows/ci-master.yml

Lines changed: 155 additions & 188 deletions
Large diffs are not rendered by default.

CMakeLists.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -869,6 +869,9 @@ include(cmake/crc32c.cmake)
869869
include(cmake/leveldb.cmake)
870870
add_subdirectory(src)
871871

872+
# Ensure build info is generated early for all targets that need it
873+
add_dependencies(core_interface generate_build_info)
874+
872875
include(cmake/tests.cmake)
873876

874877
include(Maintenance)

Dockerfile

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@ FROM debian:bullseye as build-image
33

44
# Install required system packages
55
RUN apt-get update && apt-get install -y \
6-
automake \
76
bsdmainutils \
7+
cmake \
88
curl \
99
g++ \
10-
libtool \
1110
make \
1211
pkg-config \
13-
patch
12+
patch \
13+
m4 \
14+
autoconf \
15+
automake \
16+
libtool
1417

1518
# Build Firo
1619
COPY . /tmp/firo/
@@ -20,11 +23,10 @@ WORKDIR /tmp/firo
2023
RUN cd depends && \
2124
NO_QT=true make HOST=$(uname -m)-linux-gnu -j$(nproc)
2225

23-
RUN ./autogen.sh && \
24-
./configure --without-gui --enable-tests --prefix=/tmp/firo/depends/$(uname -m)-linux-gnu && \
25-
make -j$(nproc) && \
26-
make check && \
27-
make install
26+
RUN cmake -B build --toolchain depends/$(uname -m)-linux-gnu/toolchain.cmake -DBUILD_GUI=OFF -DBUILD_TESTS=ON && \
27+
cmake --build build -j$(nproc) && \
28+
cd build && make test && \
29+
cmake --install build --prefix /tmp/firo/depends/$(uname -m)-linux-gnu
2830

2931
# extract shared dependencies of firod and firo-cli
3032
# copy relevant binaries to /usr/bin, the COPY --from cannot use $(uname -m) variable in argument

Makefile.am

Lines changed: 0 additions & 230 deletions
This file was deleted.

0 commit comments

Comments
 (0)