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. Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/350 Reviewed-by: explosion-mental <explosion-mental@noreply.codeberg.org>
This commit is contained in:
parent
8dc126194f
commit
fb9686c650
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
|
@ -21,7 +21,7 @@ jobs:
|
||||||
( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; )
|
( cd "tinycc-$TCC_SHA" && ./configure && make && sudo make install; )
|
||||||
- name: build
|
- name: build
|
||||||
run: |
|
run: |
|
||||||
CFLAGS="$(sed '/^#/d' .woodpecker/CFLAGS | paste -d ' ' -s)"
|
CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)"
|
||||||
build () {
|
build () {
|
||||||
for cc in "gcc" "clang" "tcc"; do
|
for cc in "gcc" "clang" "tcc"; do
|
||||||
echo "### $cc - $2 build ###"
|
echo "### $cc - $2 build ###"
|
||||||
|
|
8
Makefile
8
Makefile
|
@ -66,7 +66,7 @@ install-all: install install-desktop install-icon
|
||||||
install-desktop:
|
install-desktop:
|
||||||
@echo "INSTALL nsxiv.desktop"
|
@echo "INSTALL nsxiv.desktop"
|
||||||
mkdir -p $(DESTDIR)$(PREFIX)/share/applications
|
mkdir -p $(DESTDIR)$(PREFIX)/share/applications
|
||||||
cp nsxiv.desktop $(DESTDIR)$(PREFIX)/share/applications
|
cp etc/nsxiv.desktop $(DESTDIR)$(PREFIX)/share/applications
|
||||||
|
|
||||||
install-icon:
|
install-icon:
|
||||||
@echo "INSTALL icon"
|
@echo "INSTALL icon"
|
||||||
|
@ -91,12 +91,12 @@ install: all
|
||||||
chmod 755 $(DESTDIR)$(PREFIX)/bin/nsxiv
|
chmod 755 $(DESTDIR)$(PREFIX)/bin/nsxiv
|
||||||
@echo "INSTALL nsxiv.1"
|
@echo "INSTALL nsxiv.1"
|
||||||
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
mkdir -p $(DESTDIR)$(MANPREFIX)/man1
|
||||||
sed "s!EGPREFIX!$(EGPREFIX)!g; s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" nsxiv.1 \
|
sed "s!EGPREFIX!$(EGPREFIX)!g; s!PREFIX!$(PREFIX)!g; s!VERSION!$(VERSION)!g" \
|
||||||
>$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
|
etc/nsxiv.1 >$(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
|
||||||
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
|
chmod 644 $(DESTDIR)$(MANPREFIX)/man1/nsxiv.1
|
||||||
@echo "INSTALL share/nsxiv/"
|
@echo "INSTALL share/nsxiv/"
|
||||||
mkdir -p $(DESTDIR)$(EGPREFIX)
|
mkdir -p $(DESTDIR)$(EGPREFIX)
|
||||||
cp examples/* $(DESTDIR)$(EGPREFIX)
|
cp etc/examples/* $(DESTDIR)$(EGPREFIX)
|
||||||
chmod 755 $(DESTDIR)$(EGPREFIX)/*
|
chmod 755 $(DESTDIR)$(EGPREFIX)/*
|
||||||
|
|
||||||
uninstall: uninstall-icon
|
uninstall: uninstall-icon
|
||||||
|
|
|
@ -15,10 +15,10 @@ under GPLv2 and aims to be easy to modify and customize.
|
||||||
|
|
||||||
Please file a bug report if something does not work as documented or expected on
|
Please file a bug report if something does not work as documented or expected on
|
||||||
[Codeberg] after making sure you are using the latest release. Contributions
|
[Codeberg] after making sure you are using the latest release. Contributions
|
||||||
are welcome, see [CONTRIBUTING.md] to get started.
|
are welcome, see [CONTRIBUTING] to get started.
|
||||||
|
|
||||||
[Codeberg]: https://codeberg.org/nsxiv/nsxiv/issues/new
|
[Codeberg]: https://codeberg.org/nsxiv/nsxiv/issues/new
|
||||||
[CONTRIBUTING.md]: CONTRIBUTING.md#contribution-guideline
|
[CONTRIBUTING]: etc/CONTRIBUTING.md#contribution-guideline
|
||||||
|
|
||||||
|
|
||||||
Features
|
Features
|
||||||
|
@ -185,7 +185,7 @@ or by using Xresources as explained in the manual. If these options are not suff
|
||||||
you may implement your own features by following
|
you may implement your own features by following
|
||||||
[this guide](https://codeberg.org/nsxiv/nsxiv-extra/src/branch/master/CUSTOMIZATION.md).
|
[this guide](https://codeberg.org/nsxiv/nsxiv-extra/src/branch/master/CUSTOMIZATION.md).
|
||||||
|
|
||||||
Due to our limited [project scope](CONTRIBUTING.md#project-scope), certain features or
|
Due to our limited [project scope](etc/CONTRIBUTING.md#project-scope), certain features or
|
||||||
customization cannot be merged into nsxiv mainline. Following the spirit of suckless
|
customization cannot be merged into nsxiv mainline. Following the spirit of suckless
|
||||||
software, we host the [nsxiv-extra](https://codeberg.org/nsxiv/nsxiv-extra) repo where users
|
software, we host the [nsxiv-extra](https://codeberg.org/nsxiv/nsxiv-extra) repo where users
|
||||||
are free to submit whatever patches or scripts they wish.
|
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:
|
||||||
|
|
||||||
$ git clone https://codeberg.org/nsxiv/nsxiv.git
|
$ git clone https://codeberg.org/nsxiv/nsxiv.git
|
||||||
|
|
||||||
You can view the changelog [here](CHANGELOG.md)
|
You can view the changelog [here](etc/CHANGELOG.md)
|
||||||
|
|
||||||
|
|
||||||
Similar projects
|
Similar projects
|
||||||
|
|
|
@ -23,7 +23,7 @@ Contribution Guideline
|
||||||
When contributing, make sure:
|
When contributing, make sure:
|
||||||
|
|
||||||
* Your contribution falls under nsxiv's scope and aim
|
* Your contribution falls under nsxiv's scope and aim
|
||||||
* You follow the existing code style (see [.editorconfig](.editorconfig))
|
* You follow the existing code style (see [.editorconfig](../.editorconfig))
|
||||||
* You open the pull request from a new branch, not from master
|
* You open the pull request from a new branch, not from master
|
||||||
* To avoid using force pushes, especially for bigger patches. Only use them
|
* To avoid using force pushes, especially for bigger patches. Only use them
|
||||||
when there's merge conflicts.
|
when there's merge conflicts.
|
||||||
|
@ -68,7 +68,7 @@ For releases, the process is the following:
|
||||||
the commit message and tag description for the release commit to "Release
|
the commit message and tag description for the release commit to "Release
|
||||||
version N". Make sure to use an annotated tag.
|
version N". Make sure to use an annotated tag.
|
||||||
* Update `VERSION` macro in `config.mk`.
|
* Update `VERSION` macro in `config.mk`.
|
||||||
* Update the changelog (`CHANGELOG.md`):
|
* Update the changelog (`etc/CHANGELOG.md`):
|
||||||
* Include link to the release tarball and add the release date.
|
* Include link to the release tarball and add the release date.
|
||||||
* Document only the changes or fixes between releases. Don't document
|
* Document only the changes or fixes between releases. Don't document
|
||||||
changes which never made it into a release.
|
changes which never made it into a release.
|
|
@ -18,7 +18,7 @@ pipeline:
|
||||||
*.c
|
*.c
|
||||||
}
|
}
|
||||||
run_tidy() {
|
run_tidy() {
|
||||||
checks="$(sed '/^#/d' .woodpecker/clang-tidy-checks | paste -d ',' -s)"
|
checks="$(sed '/^#/d' etc/woodpecker/clang-tidy-checks | paste -d ',' -s)"
|
||||||
clang-tidy --warnings-as-errors="*" --checks="$checks" --quiet *.c \
|
clang-tidy --warnings-as-errors="*" --checks="$checks" --quiet *.c \
|
||||||
-- -std="$std" $(make OPT_DEP_DEFAULT="$1" dump_cppflags)
|
-- -std="$std" $(make OPT_DEP_DEFAULT="$1" dump_cppflags)
|
||||||
}
|
}
|
|
@ -14,7 +14,7 @@ pipeline:
|
||||||
wget "https://github.com/TinyCC/tinycc/archive/$TCC_SHA.tar.gz" >/dev/null
|
wget "https://github.com/TinyCC/tinycc/archive/$TCC_SHA.tar.gz" >/dev/null
|
||||||
tar xzf "$TCC_SHA.tar.gz" >/dev/null
|
tar xzf "$TCC_SHA.tar.gz" >/dev/null
|
||||||
( cd "tinycc-$TCC_SHA" && ./configure --config-musl && make -s -j"$(nproc)" && make install; ) >/dev/null
|
( cd "tinycc-$TCC_SHA" && ./configure --config-musl && make -s -j"$(nproc)" && make install; ) >/dev/null
|
||||||
CFLAGS="$(sed '/^#/d' .woodpecker/CFLAGS | paste -d ' ' -s)"
|
CFLAGS="$(sed '/^#/d' etc/woodpecker/CFLAGS | paste -d ' ' -s)"
|
||||||
build () {
|
build () {
|
||||||
for cc in "gcc" "clang" "tcc"; do
|
for cc in "gcc" "clang" "tcc"; do
|
||||||
echo "### $cc - $2 build ###"
|
echo "### $cc - $2 build ###"
|
Loading…
Reference in a new issue