Skip to content

Commit 37bee5a

Browse files
committed
Removed doxygen as a build requirement.
I fixed the library so doxygen is no longer needed to compile. This change speeds up the compilation time as well.
1 parent 5fad2fc commit 37bee5a

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

.github/workflows/macOS.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
run: |
2323
brew install --force ninja
2424
brew install --force sdl2
25-
brew install --force doxygen
2625
git submodule update --init -- lib/pycparser
2726
git submodule update --init --jobs 4 -- lib/micropython
2827
git submodule update --init --jobs 4 -- lib/lvgl

.github/workflows/unix.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
- name: Install Deps
2626
run: |
27-
sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev doxygen ccache
27+
sudo apt-get update && sudo apt-get install --assume-yes --allow-downgrades --allow-remove-essential --allow-change-held-packages build-essential pkg-config cmake ninja-build libffi-dev gnome-desktop-testing libasound2-dev libpulse-dev libaudio-dev libjack-dev libsndio-dev libx11-dev libxext-dev libxrandr-dev libxcursor-dev libxfixes-dev libxi-dev libxss-dev libxkbcommon-dev libdrm-dev libgbm-dev libgl1-mesa-dev libgles2-mesa-dev libegl1-mesa-dev libdbus-1-dev libibus-1.0-dev libudev-dev fcitx-libs-dev libpipewire-0.3-dev libwayland-dev libdecor-0-dev ccache
2828
git submodule update --init -- lib/pycparser
2929
git submodule update --init --jobs 4 -- lib/micropython
3030
git submodule update --init --jobs 4 -- lib/lvgl

README.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,14 +178,12 @@ To compile you will need Python >= 3.10 for for all build types.
178178
* ninja-build
179179
* python
180180
* libusb-1.0-0-dev
181-
* doxygen
182181

183182
* macOS
184183
* `xcode-select -–install`
185184
* `brew install cmake`
186185
* `brew install ninja`
187186
* `brew install python`
188-
* `brew install doxygen`
189187

190188

191189
#### Compiling for RP2:
@@ -197,7 +195,6 @@ To compile you will need Python >= 3.10 for for all build types.
197195
* python
198196
* gcc-arm-none-eabi
199197
* libnewlib-arm-none-eabi
200-
* doxygen
201198

202199
* macOS
203200
* `command xcode-select–install`
@@ -206,7 +203,6 @@ To compile you will need Python >= 3.10 for for all build types.
206203
* `brew install ninja`
207204
* `brew install python`
208205
* `brew install armmbed/formulae/arm-none-eabi-gcc`
209-
* `brew install doxygen`
210206

211207
* Windows
212208
* Not yet supported
@@ -220,15 +216,13 @@ To compile you will need Python >= 3.10 for for all build types.
220216
* build-essential
221217
* ninja-build
222218
* python
223-
* doxygen
224219

225220
* macOS
226221
* `command xcode-select–install`
227222
* `brew install make`
228223
* `brew install ninja`
229224
* `brew install python`
230225
* `brew install armmbed/formulae/arm-none-eabi-gcc`
231-
* `brew install doxygen`
232226

233227
* Windows
234228
* Not yet supported
@@ -269,7 +263,6 @@ To compile you will need Python >= 3.10 for for all build types.
269263
* libpipewire-0.3-dev
270264
* libwayland-dev
271265
* libdecor-0-dev
272-
* doxygen
273266

274267

275268
#### Compiling for macOS:
@@ -279,7 +272,6 @@ To compile you will need Python >= 3.10 for for all build types.
279272
* `brew install ninja`
280273
* `brew install make`
281274
* `brew install SDL2`
282-
* `brew install doxygen`
283275

284276

285277
#### Compiling for Windows:

gen/fixed_gen_json.py

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,29 @@
1515
import pycparser_monkeypatch # NOQA
1616
import pycparser # NOQA
1717

18+
1819
temp_directory = tempfile.mkdtemp(suffix='.lvgl_json')
1920

2021

22+
def dummy_list():
23+
return []
24+
25+
26+
def dummy_doc(_):
27+
return None
28+
29+
30+
pycparser_monkeypatch.get_enum_item_docs = dummy_doc
31+
pycparser_monkeypatch.get_enum_docs = dummy_doc
32+
pycparser_monkeypatch.get_func_docs = dummy_doc
33+
pycparser_monkeypatch.get_var_docs = dummy_doc
34+
pycparser_monkeypatch.get_union_docs = dummy_doc
35+
pycparser_monkeypatch.get_struct_docs = dummy_doc
36+
pycparser_monkeypatch.get_typedef_docs = dummy_doc
37+
pycparser_monkeypatch.get_macro_docs = dummy_doc
38+
pycparser_monkeypatch.get_macros = dummy_list
39+
40+
2141
def run(lvgl_config_path, target_header, filter_private):
2242

2343
pycparser_monkeypatch.FILTER_PRIVATE = filter_private
@@ -112,9 +132,6 @@ def run(lvgl_config_path, target_header, filter_private):
112132
cparser = pycparser.CParser()
113133
ast = cparser.parse(pp_data, target_header)
114134

115-
ast.setup_docs(temp_directory)
116-
117135
shutil.rmtree(temp_directory)
118136

119137
return ast
120-

0 commit comments

Comments
 (0)