diff options
| author |  Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-01-23 23:03:57 -0300 |
|---|---|---|
| committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-01-27 23:20:40 -0300 |
| commit | 88ba851893362dacdbde6ff9527675b07affff27 (patch) | |
| tree | e5d10d7aedd06142588e25b51a1a07f97378be75 | |
| parent | build: move man page targets to after seccomp filters (diff) | |
| download | firejail-88ba851893362dacdbde6ff9527675b07affff27.tar.gz firejail-88ba851893362dacdbde6ff9527675b07affff27.tar.zst firejail-88ba851893362dacdbde6ff9527675b07affff27.zip | |
build: move syntax files to contrib/syntax/files
Having all of syntax files in the same directory makes it easier to
reference all of them at once on a makefile (such as with
`contrib/syntax/files/*.in`).
Also, this makes the path to the gtksourceview language-spec shorter.
Current path/new path:
* contrib/gtksourceview-5/language-specs/firejail-profile.lang
* contrib/syntax/files/firejail-profile.lang
Currently, adding a rule to the root Makefile to generate the
language-spec in the same directory as an input file would take at least
95 characters (with only a single dependency):
contrib/gtksourceview-5/language-specs/%.lang: contrib/gtksourceview-5/language-specs/%.lang.in
With this commit, the above shortened to 59 characters:
contrib/syntax/files/%.lang: contrib/syntax/files/%.lang.in
Which should make it more readable.
Relates to #2679 #5502.
| -rw-r--r-- | .github/workflows/build-extra.yml | 4 | ||||
| -rw-r--r-- | .github/workflows/codeql-analysis.yml | 4 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | contrib/syntax/files/firejail-profile.lang (renamed from contrib/gtksourceview-5/language-specs/firejail-profile.lang) | 0 | ||||
| -rw-r--r-- | contrib/syntax/files/firejail.vim (renamed from contrib/vim/syntax/firejail.vim) | 0 |
5 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/build-extra.yml b/.github/workflows/build-extra.yml index f777174d7..a7b7c8a3e 100644 --- a/.github/workflows/build-extra.yml +++ b/.github/workflows/build-extra.yml | |||
| @@ -5,7 +5,7 @@ on: | |||
| 5 | branches: [ master ] | 5 | branches: [ master ] |
| 6 | paths-ignore: | 6 | paths-ignore: |
| 7 | - '.github/ISSUE_TEMPLATE/*' | 7 | - '.github/ISSUE_TEMPLATE/*' |
| 8 | - 'contrib/gtksourceview-5/**' | 8 | - 'contrib/syntax/**' |
| 9 | - 'contrib/vim/**' | 9 | - 'contrib/vim/**' |
| 10 | - 'etc/**' | 10 | - 'etc/**' |
| 11 | - 'src/man/*.txt' | 11 | - 'src/man/*.txt' |
| @@ -27,7 +27,7 @@ on: | |||
| 27 | branches: [ master ] | 27 | branches: [ master ] |
| 28 | paths-ignore: | 28 | paths-ignore: |
| 29 | - '.github/ISSUE_TEMPLATE/*' | 29 | - '.github/ISSUE_TEMPLATE/*' |
| 30 | - 'contrib/gtksourceview-5/**' | 30 | - 'contrib/syntax/**' |
| 31 | - 'contrib/vim/**' | 31 | - 'contrib/vim/**' |
| 32 | - 'etc/**' | 32 | - 'etc/**' |
| 33 | - 'src/man/*.txt' | 33 | - 'src/man/*.txt' |
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index 115919477..eb9c28345 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml | |||
| @@ -10,7 +10,7 @@ on: | |||
| 10 | branches: [ master ] | 10 | branches: [ master ] |
| 11 | paths-ignore: | 11 | paths-ignore: |
| 12 | - '.github/ISSUE_TEMPLATE/*' | 12 | - '.github/ISSUE_TEMPLATE/*' |
| 13 | - 'contrib/gtksourceview-5/**' | 13 | - 'contrib/syntax/**' |
| 14 | - 'contrib/vim/**' | 14 | - 'contrib/vim/**' |
| 15 | - 'etc/**' | 15 | - 'etc/**' |
| 16 | - 'src/man/*.txt' | 16 | - 'src/man/*.txt' |
| @@ -32,7 +32,7 @@ on: | |||
| 32 | branches: [ master ] | 32 | branches: [ master ] |
| 33 | paths-ignore: | 33 | paths-ignore: |
| 34 | - '.github/ISSUE_TEMPLATE/*' | 34 | - '.github/ISSUE_TEMPLATE/*' |
| 35 | - 'contrib/gtksourceview-5/**' | 35 | - 'contrib/syntax/**' |
| 36 | - 'contrib/vim/**' | 36 | - 'contrib/vim/**' |
| 37 | - 'etc/**' | 37 | - 'etc/**' |
| 38 | - 'src/man/*.txt' | 38 | - 'src/man/*.txt' |
| @@ -124,10 +124,10 @@ ifeq ($(HAVE_CONTRIB_INSTALL),yes) | |||
| 124 | install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect | 124 | install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect |
| 125 | install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax | 125 | install -m 0755 -d $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax |
| 126 | install -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect | 126 | install -m 0644 contrib/vim/ftdetect/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/ftdetect |
| 127 | install -m 0644 contrib/vim/syntax/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax | 127 | install -m 0644 contrib/syntax/files/firejail.vim $(DESTDIR)$(datarootdir)/vim/vimfiles/syntax |
| 128 | # gtksourceview-5 language-specs | 128 | # gtksourceview language-specs |
| 129 | install -m 0755 -d $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs | 129 | install -m 0755 -d $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs |
| 130 | install -m 0644 contrib/gtksourceview-5/language-specs/firejail-profile.lang $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs | 130 | install -m 0644 contrib/syntax/files/firejail-profile.lang $(DESTDIR)$(datarootdir)/gtksourceview-5/language-specs |
| 131 | endif | 131 | endif |
| 132 | # documents | 132 | # documents |
| 133 | install -m 0755 -d $(DESTDIR)$(docdir) | 133 | install -m 0755 -d $(DESTDIR)$(docdir) |
diff --git a/contrib/gtksourceview-5/language-specs/firejail-profile.lang b/contrib/syntax/files/firejail-profile.lang index 61c37f98f..61c37f98f 100644 --- a/contrib/gtksourceview-5/language-specs/firejail-profile.lang +++ b/contrib/syntax/files/firejail-profile.lang | |||
diff --git a/contrib/vim/syntax/firejail.vim b/contrib/syntax/files/firejail.vim index c844350d8..c844350d8 100644 --- a/contrib/vim/syntax/firejail.vim +++ b/contrib/syntax/files/firejail.vim | |||