Merge branch 'turn-meson-terminfo-option-into-a-feature'

This commit is contained in:
Daniel Eklöf 2021-02-09 21:30:12 +01:00
commit c97e5da7c6
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
6 changed files with 11 additions and 8 deletions

View file

@ -28,11 +28,11 @@ sources:
tasks:
- debug: |
mkdir -p bld/debug
meson --buildtype=debug -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
meson --buildtype=debug -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/debug
ninja -C bld/debug -k0
meson test -C bld/debug --print-errorlogs
- release: |
mkdir -p bld/release
meson --buildtype=minsize -Dterminfo=false -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release
meson --buildtype=minsize -Dterminfo=disabled -Dfcft:text-shaping=enabled -Dfcft:test-text-shaping=true foot bld/release
ninja -C bld/release -k0
meson test -C bld/release --print-errorlogs

View file

@ -67,6 +67,7 @@
`resize-delay-ms` (https://codeberg.org/dnkl/foot/issues/301).
* The IME state no longer stays stuck in the terminal if the IME goes
away during preedit.
* `-Dterminfo` changed from a `boolean` to a `feature` option.
### Deprecated
@ -89,6 +90,7 @@
* [craigbarnes](https://codeberg.org/craigbarnes)
* [tdeo](https://codeberg.org/tdeo)
* jbeich
## 1.6.3

View file

@ -120,9 +120,10 @@ mkdir -p bld/release && cd bld/release
Available compile-time options:
| Option | Type | Default | Description | Extra dependencies |
|----------|------|---------|---------------------|--------------------|
| `-Dime` | bool | `true` | Enables IME support | None |
| Option | Type | Default | Description | Extra dependencies |
|-------------|---------|---------|---------------------|--------------------|
| `-Dime` | bool | `true` | Enables IME support | None |
| `-Dterminfo | feature | `auto` | Build terminfo | `tic` (ncurses) |
### Release build

View file

@ -30,7 +30,7 @@ in this order:
*term*
Value to set the environment variable *TERM* to. Default: _foot_
or _xterm-256color_ if built with _-Dterminfo=false_
or _xterm-256color_ if built with _-Dterminfo=disabled_
*font*, *font-bold*, *font-italic*, *font-bold-italic*
Comma separated list of fonts to use, in fontconfig format. That

View file

@ -1,7 +1,7 @@
# -*- conf -*-
# shell=$SHELL (if set, otherwise user's default shell from /etc/passwd)
# term=foot (or xterm-256color if built with -Dterminfo=false)
# term=foot (or xterm-256color if built with -Dterminfo=disabled)
# login-shell=no
# font=monospace:size=8

View file

@ -1,2 +1,2 @@
option('ime', type: 'boolean', value: true, description: 'IME (Input Method Editor) support')
option('terminfo', type: 'boolean', value: true, description: 'Install terminfo')
option('terminfo', type: 'feature', description: 'Install terminfo')