From e906d0597d73e3be2615f41a6e9a63fcec89f766 Mon Sep 17 00:00:00 2001 From: mintsuki Date: Wed, 15 Jun 2022 00:35:16 +0200 Subject: [PATCH] build: autogen.sh -> bootstrap --- .github/workflows/check.yml | 4 ++-- .github/workflows/release.yml | 4 ++-- GNUmakefile.in | 2 +- README.md | 7 ++++--- autogen.sh => bootstrap | 0 5 files changed, 9 insertions(+), 8 deletions(-) rename autogen.sh => bootstrap (100%) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 9bc70547..869d6547 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -15,7 +15,7 @@ jobs: run: sudo apt-get update && sudo apt-get install git build-essential autoconf automake nasm curl mtools llvm clang lld -y - name: Build the bootloader (GNU) - run: ./autogen.sh --enable-werror && make all && make maintainer-clean + run: ./bootstrap && ./configure --enable-werror && make all && make maintainer-clean - name: Build the bootloader (LLVM) - run: ./autogen.sh TOOLCHAIN=llvm --enable-werror && make all && make maintainer-clean + run: ./bootstrap && ./configure TOOLCHAIN=llvm --enable-werror && make all && make maintainer-clean diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index d00dfb31..1159951c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,7 +29,7 @@ jobs: run: ./make_toolchain.sh - name: Regenerate - run: NOCONFIGURE=yes ./autogen.sh + run: ./bootstrap - name: Create build dir run: mkdir -p build @@ -80,7 +80,7 @@ jobs: run: git checkout $TAG_NAME && rm -rf * && git checkout . - name: Package release tarball - run: ./autogen.sh && make dist + run: ./bootstrap && ./configure && make dist - name: Create release notes run: echo "Binary release can be found at https://github.com/limine-bootloader/limine/tree/$TAG_NAME-binary" > rel_notes.txt diff --git a/GNUmakefile.in b/GNUmakefile.in index ece9cd65..d86df616 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -196,7 +196,7 @@ dist: mkdir -p '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" cp -r '$(call SHESCAPE,$(SRCDIR))'/.git '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)"/ cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && git checkout . - cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && NOCONFIGURE=yes ./autogen.sh + cd '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)" && ./bootstrap rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/freestanding_headers/.git" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/limine-efi/.git" rm -rf '$(call SHESCAPE,$(BUILDDIR))'/"limine-$(LIMINE_VERSION)/.git" diff --git a/README.md b/README.md index a2f746cc..ca62e9db 100644 --- a/README.md +++ b/README.md @@ -90,10 +90,11 @@ paragraph as it is built as part of it. If using a release tarball (recommended, see https://github.com/limine-bootloader/limine/releases), run `./configure` directly. -If checking out from the repository, run `./autogen.sh` first (`GNU autoconf` and `GNU automake` required). +If checking out from the repository, run `./bootstrap` first in order to download the +necessary dependencies and generate the configure script (`GNU autoconf` and `GNU automake` required). -Both `./autogen.sh` and `./configure` take arguments and environment variables; -for more information on these, run `./configure --help`. +`./configure` takes arguments and environment variables; for more information on +these, run `./configure --help`. To build using the LLVM toolchain, pass `TOOLCHAIN=llvm` to `./configure`. diff --git a/autogen.sh b/bootstrap similarity index 100% rename from autogen.sh rename to bootstrap