aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCraig Barnes <craigbarnes@protonmail.com>2020-12-19 22:43:09 +0000
committerCraig Barnes <craigbarnes@protonmail.com>2020-12-19 22:43:09 +0000
commit013cca646d226bb2b695154c6735269720ae940f (patch)
treebdddb16b38605dc1c318566986318f8fdccd9c54
parentterm: fix builds with debug logging enabled (diff)
meson: use wrap files for fcft/tllist subprojects
See: https://mesonbuild.com/Wrap-dependency-system-manual.html
-rw-r--r--.builds/alpine-x64.yml6
-rw-r--r--.builds/alpine-x86.yml.disabled6
-rw-r--r--.builds/freebsd-x64.yml.disabled6
-rw-r--r--.gitignore2
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--CHANGELOG.md10
-rw-r--r--INSTALL.md21
-rw-r--r--subprojects/fcft.wrap3
-rw-r--r--subprojects/tllist.wrap3
9 files changed, 20 insertions, 41 deletions
diff --git a/.builds/alpine-x64.yml b/.builds/alpine-x64.yml
index ee81d59e..134a109a 100644
--- a/.builds/alpine-x64.yml
+++ b/.builds/alpine-x64.yml
@@ -24,8 +24,6 @@ packages:
sources:
- https://codeberg.org/dnkl/foot
- - https://codeberg.org/dnkl/tllist
- - https://codeberg.org/dnkl/fcft
# triggers:
# - action: email
@@ -33,10 +31,6 @@ sources:
# to: <committer>
tasks:
- - subprojects: |
- mkdir foot/subprojects
- ln -s ../../tllist foot/subprojects/tllist
- ln -s ../../fcft foot/subprojects/fcft
- debug: |
mkdir -p bld/debug
meson --buildtype=debug -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
diff --git a/.builds/alpine-x86.yml.disabled b/.builds/alpine-x86.yml.disabled
index ee1f27e7..52bb6e26 100644
--- a/.builds/alpine-x86.yml.disabled
+++ b/.builds/alpine-x86.yml.disabled
@@ -23,8 +23,6 @@ packages:
sources:
- https://codeberg.org/dnkl/foot
- - https://codeberg.org/dnkl/tllist
- - https://codeberg.org/dnkl/fcft
# triggers:
# - action: email
@@ -32,10 +30,6 @@ sources:
# to: <committer>
tasks:
- - subprojects: |
- mkdir foot/subprojects
- ln -s ../../tllist foot/subprojects/tllist
- ln -s ../../fcft foot/subprojects/fcft
- debug: |
mkdir -p bld/debug
meson --buildtype=debug -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
diff --git a/.builds/freebsd-x64.yml.disabled b/.builds/freebsd-x64.yml.disabled
index 0f35826e..55c9496a 100644
--- a/.builds/freebsd-x64.yml.disabled
+++ b/.builds/freebsd-x64.yml.disabled
@@ -18,8 +18,6 @@ packages:
sources:
- https://codeberg.org/dnkl/foot
- - https://codeberg.org/dnkl/tllist
- - https://codeberg.org/dnkl/fcft
# triggers:
# - action: email
@@ -27,10 +25,6 @@ sources:
# to: <committer>
tasks:
- - subprojects: |
- mkdir foot/subprojects
- ln -s ../../tllist foot/subprojects/tllist
- ln -s ../../fcft foot/subprojects/fcft
- debug: |
mkdir -p bld/debug
meson --buildtype=debug -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
diff --git a/.gitignore b/.gitignore
index 1e67045e..14c9189d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
/bld/
/pkg/
/src/
-/subprojects/
+/subprojects/*/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index caab2812..ff1b4309 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,10 +13,6 @@ before_script:
- apk add git
- apk add check-dev
- apk add ttf-hack font-noto-emoji
- - mkdir -p subprojects && cd subprojects
- - git clone https://codeberg.org/dnkl/tllist.git
- - git clone https://codeberg.org/dnkl/fcft.git
- - cd ..
debug-x64:
image: alpine:edge
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7ebe440..cc493335 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,14 +20,24 @@
## Unreleased
+
### Added
+
### Changed
+
+* The fcft and tllist library subprojects are now handled via Meson
+ [wrap files](https://mesonbuild.com/Wrap-dependency-system-manual.html)
+ instead of needing to be manually cloned.
+
### Deprecated
### Removed
### Fixed
### Security
+
### Contributors
+* [craigbarnes](https://codeberg.org/craigbarnes)
+
## 1.6.0
diff --git a/INSTALL.md b/INSTALL.md
index 43655b81..891882b4 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -26,15 +26,12 @@ foot makes use of a couple of libraries I have developed:
[tllist](https://codeberg.org/dnkl/tllist) and
[fcft](https://codeberg.org/dnkl/fcft). As such, they will most likely
not have been installed already. You can either install them as system
-libraries, or you can build them as _subprojects_ in foot.
+libraries or build them as _subprojects_ in foot.
When building foot, they will first be searched for as system
libraries. If **found**, foot will link dynamically against them.
-
-If **not** found, they will be searched for as subprojects. In this
-case you need to create the `subprojects` directory and clone
-https://codeberg.org/dnkl/fcft.git and
-https://codeberg.org/dnkl/tllist.git (see [Other](#other) below).
+If **not** found, meson will attempt to download and build them as
+subprojects.
## Requirements
@@ -114,18 +111,6 @@ be interested in the compiler flags used there.
### Setup
-If you have not installed [tllist](https://codeberg.org/dnkl/tllist)
-and [fcft](https://codeberg.org/dnkl/fcft) as system libraries, clone
-them into the `subprojects` directory:
-
-```sh
-mkdir -p subprojects
-pushd subprojects
-git clone https://codeberg.org/dnkl/tllist.git
-git clone https://codeberg.org/dnkl/fcft.git
-popd
-```
-
To build, first, create a build directory, and switch to it:
```sh
mkdir -p bld/release && cd bld/release
diff --git a/subprojects/fcft.wrap b/subprojects/fcft.wrap
new file mode 100644
index 00000000..d2709d47
--- /dev/null
+++ b/subprojects/fcft.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://codeberg.org/dnkl/fcft.git
+revision = master
diff --git a/subprojects/tllist.wrap b/subprojects/tllist.wrap
new file mode 100644
index 00000000..75f395a3
--- /dev/null
+++ b/subprojects/tllist.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://codeberg.org/dnkl/tllist.git
+revision = master