nsxivfb9686c
Move uncritical files into `etc/` (#350)
This is mainly just to reduce the amount of files in the project root. The criteria of what gets into `etc/` are the following: * The file should not be necessary for building nsxiv. This excludes the `icon/*` stuff since that's needed by `window.c`. * The file shouldn't have any valid reason to stay in the project root. This excludes things like `README.md`, `.gitignore` etc.
+13 −13
16 files changed
- M .github/workflows/build.yml +1 −1
- M Makefile +4 −4
- M README.md +4 −4
- R CHANGELOG.md → etc/CHANGELOG.md +0 −0
- R CONTRIBUTING.md → etc/CONTRIBUTING.md +2 −2
- R examples/image-info → etc/examples/image-info +0 −0
- R examples/key-handler → etc/examples/key-handler +0 −0
- R examples/thumb-info → etc/examples/thumb-info +0 −0
- R examples/win-title → etc/examples/win-title +0 −0
- R nsxiv.1 → etc/nsxiv.1 +0 −0
- R nsxiv.desktop → etc/nsxiv.desktop +0 −0
- R .woodpecker/CFLAGS → etc/woodpecker/CFLAGS +0 −0
- R .woodpecker/analysis.yml → etc/woodpecker/analysis.yml +1 −1
- R .woodpecker/build.yml → etc/woodpecker/build.yml +1 −1
- R .woodpecker/clang-tidy-checks → etc/woodpecker/clang-tidy-checks +0 −0
- R .woodpecker/spell.yml → etc/woodpecker/spell.yml +0 −0
| @@ -21,7 +21,7 @@ jobs: | |||
| 21 | 21 | ( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; ) | |
| 22 | 22 | - name: build | |
| 23 | 23 | run: | | |
| 24 | − | CFLAGS="$(sed '/^#/d' .woodpecker/CFLAGS | paste -d ' ' -s)" | |
| 24 | + | CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)" | |
| 25 | 25 | build () { | |
| 26 | 26 | for cc in "gcc" "clang" "tcc"; do | |
| 27 | 27 | echo "### $cc - $2 build ###" | |
| @@ -66,7 +66,7 @@ install-all: install install-desktop install-icon | |||
| 66 | 66 | install-desktop: | |
| 67 | 67 | @echo "INSTALL nsxiv.desktop" | |
| 68 | 68 | mkdir -p $(DESTDIR)$(PREFIX)/share/applications | |
| 69 | − | cp nsxiv.desktop $(DESTDIR)$(PREFIX)/share/applications | |
| 69 | + | cp etc/nsxiv.desktop $(DESTDIR)$(PREFIX)/share/applications | |
| 70 | 70 | ||
| 71 | 71 | install-icon: | |
| 72 | 72 | @echo "INSTALL icon" | |
| @@ -91,12 +91,12 @@ install: all | |||
| 91 | 91 | chmod 755 $(DESTDIR)$(PREFIX)/bin/nsxiv | |
| 92 | 92 | @echo "INSTALL nsxiv.1" | |
| 93 | 93 | mkdir -p $(DESTDIR)$(MANPREFIX)/man1 | |
| 94 | − | sed "s!EGPREFIX!$(EGPREFIX)!g; s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" nsxiv.1 \ | |
| 95 | − | >$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1 | |
| 94 | + | sed "s!EGPREFIX!$(EGPREFIX)!g; s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" \ | |
| 95 | + | etc/nsxiv.1 >$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1 | |
| 96 | 96 | chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1 | |
| 97 | 97 | @echo "INSTALL share/nsxiv/" | |
| 98 | 98 | mkdir -p $(DESTDIR)$(EGPREFIX) | |
| 99 | − | cp examples/* $(DESTDIR)$(EGPREFIX) | |
| 99 | + | cp etc/examples/* $(DESTDIR)$(EGPREFIX) | |
| 100 | 100 | chmod 755 $(DESTDIR)$(EGPREFIX)/* | |
| 101 | 101 | ||
| 102 | 102 | uninstall: uninstall-icon | |
| @@ -15,10 +15,10 @@ under GPLv2 and aims to be easy to modify and customize. | |||
| 15 | 15 | ||
| 16 | 16 | Please file a bug report if something does not work as documented or expected on | |
| 17 | 17 | [Codeberg] after making sure you are using the latest release. Contributions | |
| 18 | − | are welcome, see [CONTRIBUTING.md] to get started. | |
| 18 | + | are welcome, see [CONTRIBUTING] to get started. | |
| 19 | 19 | ||
| 20 | 20 | [Codeberg]: https://codeberg.org/nsxiv/nsxiv/issues/new | |
| 21 | − | [CONTRIBUTING.md]: CONTRIBUTING.md#contribution-guideline | |
| 21 | + | [CONTRIBUTING]: etc/CONTRIBUTING.md#contribution-guideline | |
| 22 | 22 | ||
| 23 | 23 | ||
| 24 | 24 | Features | |
| @@ -185,7 +185,7 @@ or by using Xresources as explained in the manual. If these options are not suff | |||
| 185 | 185 | you may implement your own features by following | |
| 186 | 186 | [this guide](https://codeberg.org/nsxiv/nsxiv-extra/src/branch/master/CUSTOMIZATION.md). | |
| 187 | 187 | ||
| 188 | − | Due to our limited [project scope](CONTRIBUTING.md#project-scope), certain features or | |
| 188 | + | Due to our limited [project scope](etc/CONTRIBUTING.md#project-scope), certain features or | |
| 189 | 189 | customization cannot be merged into nsxiv mainline. Following the spirit of suckless | |
| 190 | 190 | software, we host the [nsxiv-extra](https://codeberg.org/nsxiv/nsxiv-extra) repo where users | |
| 191 | 191 | are free to submit whatever patches or scripts they wish. | |
| @@ -206,7 +206,7 @@ on CodeBerg or get a copy using git with the following command: | |||
| 206 | 206 | ||
| 207 | 207 | $ git clone https://codeberg.org/nsxiv/nsxiv.git | |
| 208 | 208 | ||
| 209 | − | You can view the changelog [here](CHANGELOG.md) | |
| 209 | + | You can view the changelog [here](etc/CHANGELOG.md) | |
| 210 | 210 | ||
| 211 | 211 | ||
| 212 | 212 | Similar projects | |
[No content changes]
| @@ -23,7 +23,7 @@ Contribution Guideline | |||
| 23 | 23 | When contributing, make sure: | |
| 24 | 24 | ||
| 25 | 25 | * Your contribution falls under nsxiv's scope and aim | |
| 26 | − | * You follow the existing code style (see [.editorconfig](.editorconfig)) | |
| 26 | + | * You follow the existing code style (see [.editorconfig](../.editorconfig)) | |
| 27 | 27 | * You open the pull request from a new branch, not from master | |
| 28 | 28 | * To avoid using force pushes, especially for bigger patches. Only use them | |
| 29 | 29 | when there's merge conflicts. | |
| @@ -68,7 +68,7 @@ For releases, the process is the following: | |||
| 68 | 68 | the commit message and tag description for the release commit to "Release | |
| 69 | 69 | version N". Make sure to use an annotated tag. | |
| 70 | 70 | * Update `VERSION` macro in `config.mk`. | |
| 71 | − | * Update the changelog (`CHANGELOG.md`): | |
| 71 | + | * Update the changelog (`etc/CHANGELOG.md`): | |
| 72 | 72 | * Include link to the release tarball and add the release date. | |
| 73 | 73 | * Document only the changes or fixes between releases. Don't document | |
| 74 | 74 | changes which never made it into a release. | |
[No content changes]
[No content changes]
[No content changes]
[No content changes]
[No content changes]
[No content changes]
[No content changes]
| @@ -18,7 +18,7 @@ pipeline: | |||
| 18 | 18 | *.c | |
| 19 | 19 | } | |
| 20 | 20 | run_tidy() { | |
| 21 | − | checks="$(sed '/^#/d' .woodpecker/clang-tidy-checks | paste -d ',' -s)" | |
| 21 | + | checks="$(sed '/^#/d' etc/woodpecker/clang-tidy-checks | paste -d ',' -s)" | |
| 22 | 22 | clang-tidy --warnings-as-errors="*" --checks="$checks" --quiet *.c \ | |
| 23 | 23 | -- -std="$std" $(make OPT_DEP_DEFAULT="$1" dump_cppflags) | |
| 24 | 24 | } | |
| @@ -14,7 +14,7 @@ pipeline: | |||
| 14 | 14 | wget "https://github.com/TinyCC/tinycc/archive/$TCC_SHA.tar.gz" >/dev/null | |
| 15 | 15 | tar xzf "$TCC_SHA.tar.gz" >/dev/null | |
| 16 | 16 | ( cd "tinycc-$TCC_SHA" && ./configure --config-musl && make -s -j"$(nproc)" && make install; ) >/dev/null | |
| 17 | − | CFLAGS="$(sed '/^#/d' .woodpecker/CFLAGS | paste -d ' ' -s)" | |
| 17 | + | CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)" | |
| 18 | 18 | build () { | |
| 19 | 19 | for cc in "gcc" "clang" "tcc"; do | |
| 20 | 20 | echo "### $cc - $2 build ###" | |
[No content changes]
[No content changes]