Skip to content

Commit 489d284

Browse files
rickrick
rick
authored and
rick
committed
disable tidy logic after i wrecked my code
1 parent 822b59d commit 489d284

File tree

12 files changed

+173
-16
lines changed

12 files changed

+173
-16
lines changed

‎.gitmodules

+6
Original file line numberDiff line numberDiff line change
@@ -1021,3 +1021,9 @@
10211021
[submodule "submodules/whereami"]
10221022
path = submodules/whereami
10231023
url = https://github.com/gpakosz/whereami
1024+
[submodule "submodules/lodepng"]
1025+
path = submodules/lodepng
1026+
url = https://github.com/lvandeve/lodepng
1027+
[submodule "submodules/libnsgif"]
1028+
path = submodules/libnsgif
1029+
url = https://github.com/netsurf-plan9/libnsgif

‎etc/meson.mk

+2-8
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,11 @@ BUILD_JOBS ?=15
77
TEST_JOBS ?=3
88
MESON_DEFAULT_LIBRARY ?=shared
99
BUILD_OPTIMIZATION ?=0
10-
WARN_LEVEL ?=2
10+
WARN_LEVEL ?=1
1111
MESON_PARALLEL_JOBS=$(BUILD_JOBS)
1212
MESON_BUILD_TYPE=$(BUILD_TYPE)
1313
MESON_BUILD_LOG=$(MESON_BUILD_DIR)/build.log
14-
MESON_SETUP_ARGS=\
15-
--fatal-meson-warnings \
16-
--buildtype $(MESON_BUILD_TYPE) \
17-
--default-library $(MESON_DEFAULT_LIBRARY) \
18-
--warnlevel $(WARN_LEVEL) \
19-
--backend ninja \
20-
--errorlogs
14+
MESON_SETUP_ARGS=--fatal-meson-warnings --buildtype $(MESON_BUILD_TYPE) --default-library $(MESON_DEFAULT_LIBRARY) --warnlevel $(WARN_LEVEL) --backend ninja --errorlogs
2115
meson-setup:
2216
@if [[ -d $(MESON_BUILD_DIR) ]]; then $(MESON) setup $(MESON_SETUP_ARGS) --reconfigure $(MESON_BUILD_DIR); else $(MESON) setup $(MESON_SETUP_ARGS) $(MESON_BUILD_DIR); fi
2317
meson-build: meson-setup

‎etc/tidy.mk

+9-5
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@ fmt-scripts:
1414
@$(SHFMT) -w scripts/*.sh 2>/dev/null||true
1515

1616
uncrustify:
17-
@make -B get-tidied-files|$(XARGS) -P 10 -I {} $(UNCRUSTIFY) -c ~/repos/c_deps/etc/uncrustify.cfg --replace "{}" 2>/dev/null||true
17+
true
18+
# @make -B get-tidied-files|$(XARGS) -P 10 -I {} $(UNCRUSTIFY) -c ~/repos/c_deps/etc/uncrustify.cfg --replace "{}" 2>/dev/null||true
1819

1920
uncrustify-clean:
20-
@$(FIND) -L . -type f -name "*unc-backup*" |$(GREP) -v 'submodules|subprojects'|$(XARGS) -I % $(REALPATH) % | $(SORT) -u|$(XARGS) -P 10 -I % $(UNLINK) % 2>/dev/null ||true
21+
true
22+
# @$(FIND) -L . -type f -name "*unc-backup*" |$(GREP) -v 'submodules|subprojects'|$(XARGS) -I % $(REALPATH) % | $(SORT) -u|$(XARGS) -P 10 -I % $(UNLINK) % 2>/dev/null ||true
2123

2224
fix-dbg:
2325
@$(SED) 's|, %[[:space:]].*u);|, %u);|g' -i $(TIDIED_FILES)
@@ -32,11 +34,12 @@ fix-dbg:
3234
@$(SED) 's|, %[[:space:]].*zu);|, %zu);|g' -i $(TIDIED_FILES)
3335

3436
shfmt:
35-
@if [[ -d scripts ]]; then $(FIND) scripts/*.sh -type f >/dev/null 2>&1 && $(MAKE) -B fmt-scripts 2>/dev/null||true; fi
37+
# @if [[ -d scripts ]]; then $(FIND) scripts/*.sh -type f >/dev/null 2>&1 && $(MAKE) -B fmt-scripts 2>/dev/null||true; fi
3638
@true
3739

3840
do-tidy:
39-
@$(MAKE) -B uncrustify uncrustify-clean shfmt fix-dbg 2>/dev/null||true
41+
true
42+
# @$(MAKE) -B uncrustify uncrustify-clean shfmt fix-dbg 2>/dev/null||true
4043

4144
get-tidied-files-stats:
4245
@printf "%s files, %s lines\n" "$(shell make -B get-tidied-files-qty)" "$(shell make -B get-tidied-files-lines-qty)"
@@ -51,4 +54,5 @@ do-timed-tidy:
5154
ansi --blue ms && sleep 1
5255

5356
tidy:
54-
@passh $(MAKE) -B do-timed-tidy
57+
true
58+
# @$(MAKE) -B do-timed-tidy

‎meson/deps/cbars/meson.build

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
cbars_system_headers = [
2+
3+
]
4+
cbars_local_headers = [
5+
'cbars/include/cbars/cbars.h',
6+
]
7+
cbars_srcs = [
8+
'../../../submodules/cbars/src/cbars.c',
9+
]
10+
11+
cbars_dirs = [
12+
'../../../submodules/cbars',
13+
'../../../submodules/cbars/include',
14+
'../../../submodules/cbars/include/cbars',
15+
'../../../submodules/cbars/src',
16+
inc,
17+
]
18+
19+
cbars_c_args = [
20+
]
21+
22+
cbars_deps = [
23+
24+
]
25+
26+
if cbars_srcs.length() > 0
27+
cbars_lib = library('cbars',
28+
files(cbars_srcs),
29+
install: false,
30+
dependencies: cbars_deps,
31+
include_directories: cbars_dirs,
32+
c_args: cbars_c_args,
33+
)
34+
cbars_links = [cbars_lib]
35+
else
36+
cbars_links = []
37+
endif
38+
39+
cbars_dep = declare_dependency(
40+
include_directories: cbars_dirs,
41+
link_with: cbars_links,
42+
)

‎meson/deps/imagequant/meson.build

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
imagequant_dep = dependency('imagequant', method: 'pkg-config', required : true)

‎meson/deps/libnsgif/meson.build

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
libnsgif_system_headers = [
2+
3+
]
4+
libnsgif_local_headers = [
5+
'libnsgif/include/nsgif.h',
6+
'libnsgif/src/lzw.h',
7+
'libnsgif/test/cli.h',
8+
]
9+
libnsgif_srcs = [
10+
'../../../submodules/libnsgif/src/gif.c',
11+
'../../../submodules/libnsgif/src/lzw.c',
12+
]
13+
14+
libnsgif_dirs = [
15+
'../../../submodules/libnsgif',
16+
'../../../submodules/libnsgif/include',
17+
'../../../submodules/libnsgif/src',
18+
inc,
19+
]
20+
21+
libnsgif_c_args = [
22+
]
23+
24+
libnsgif_deps = [
25+
26+
]
27+
28+
if libnsgif_srcs.length() > 0
29+
libnsgif_lib = library('libnsgif',
30+
files(libnsgif_srcs),
31+
install: false,
32+
dependencies: libnsgif_deps,
33+
include_directories: libnsgif_dirs,
34+
c_args: libnsgif_c_args,
35+
)
36+
libnsgif_links = [libnsgif_lib]
37+
else
38+
libnsgif_links = []
39+
endif
40+
41+
libnsgif_dep = declare_dependency(
42+
include_directories: libnsgif_dirs,
43+
link_with: libnsgif_links,
44+
)

‎meson/deps/lodepng/meson.build

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
lodepng_system_headers = [
2+
3+
]
4+
lodepng_local_headers = [
5+
'lodepng/lodepng.h',
6+
'lodepng/lodepng_util.h',
7+
]
8+
lodepng_srcs = [
9+
'../../../submodules/lodepng/lodepng.c',
10+
]
11+
12+
lodepng_dirs = [
13+
'../../../submodules/lodepng',
14+
inc,
15+
]
16+
17+
lodepng_c_args = [
18+
]
19+
20+
lodepng_deps = [
21+
22+
]
23+
24+
if lodepng_srcs.length() > 0
25+
lodepng_lib = library('lodepng',
26+
files(lodepng_srcs),
27+
install: false,
28+
dependencies: lodepng_deps,
29+
include_directories: lodepng_dirs,
30+
c_args: lodepng_c_args,
31+
)
32+
lodepng_links = [lodepng_lib]
33+
else
34+
lodepng_links = []
35+
endif
36+
37+
lodepng_dep = declare_dependency(
38+
include_directories: lodepng_dirs,
39+
link_with: lodepng_links,
40+
)

‎meson/deps/pngquant/meson.build

+22-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
pngquant_system_headers = [
2+
3+
]
14
pngquant_local_headers = [
25
'pngquant/pngquant_opts.h',
36
'pngquant/rwpng.h',
@@ -16,10 +19,27 @@ pngquant_dirs = [
1619
]
1720

1821
pngquant_c_args = [
22+
'-Wno-unused-parameter',
1923
]
2024

2125
pngquant_deps = [
22-
26+
imagequant_dep,
2327
]
2428

25-
imagequant_dep = dependency('imagequant', method: 'pkg-config', required : true)
29+
if pngquant_srcs.length() > 0
30+
pngquant_lib = library('pngquant',
31+
files(pngquant_srcs),
32+
install: false,
33+
dependencies: pngquant_deps,
34+
include_directories: pngquant_dirs,
35+
c_args: pngquant_c_args,
36+
)
37+
pngquant_links = [pngquant_lib]
38+
else
39+
pngquant_links = []
40+
endif
41+
42+
pngquant_dep = declare_dependency(
43+
include_directories: pngquant_dirs,
44+
link_with: pngquant_links,
45+
)

‎meson/meson.build

+4
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ subdir('deps/tesseract')
231231
subdir('deps/yaml')
232232
subdir('deps/libcyaml')
233233
subdir('deps/wslay')
234+
subdir('deps/imagequant')
234235
subdir('deps/pngquant')
235236
subdir('deps/fs.c')
236237
subdir('deps/termrec')
@@ -241,3 +242,6 @@ subdir('deps/gifdec')
241242
subdir('deps/qoi_ci')
242243
subdir('deps/csv_parser')
243244
subdir('deps/whereami')
245+
subdir('deps/cbars')
246+
subdir('deps/lodepng')
247+
subdir('deps/libnsgif')

‎submodules/libimagequant

Submodule libimagequant updated 76 files

‎submodules/libnsgif

Submodule libnsgif added at a1c4362

‎submodules/lodepng

Submodule lodepng added at 1896455

0 commit comments

Comments
 (0)