Skip to content

Commit 6b3b822

Browse files
committed
wolfTPM fixes for HAL and whitespace.
1 parent 1e03129 commit 6b3b822

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

wolfTPM/Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -865,7 +865,7 @@ WARN_LOGFILE =
865865
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
866866
# Note: If this tag is empty the current directory is searched.
867867

868-
INPUT = ./docs/README.md ./wolftpm/tpm2.h ./wolftpm/tpm2_wrap.h ./examples/tpm_io.h
868+
INPUT = ./docs/README.md ./wolftpm/tpm2.h ./wolftpm/tpm2_wrap.h ./hal/tpm_io.h
869869

870870
# This tag can be used to specify the character encoding of the source files
871871
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses

wolfTPM/Makefile

+15-15
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ SOURCES = chapter01.md \
99
chapter03.md \
1010
chapter04.md \
1111
chapter05.md \
12-
chapter06.md
12+
chapter06.md
1313

1414
ifeq ($(DOC_LANG),JA)
1515
DOXY = Doxyfile-ja
@@ -51,13 +51,13 @@ html-prep: api
5151
@cp -a api/md/*8h* build/html/
5252
endif
5353

54-
@rm -rf build/html/chapter05.md
55-
@perl -i -pe "s/\[(.*?)\]\(Classes\/.*?.md\)/\[\1\]\(#typedef-\1\)/g" build/html/group* build/html/*8h*
54+
@rm -rf build/html/chapter05.md
55+
@perl -i -pe "s/\[(.*?)\]\(Classes\/.*?.md\)/\[\1\]\(#typedef-\1\)/g" build/html/group* build/html/*8h*
5656
@perl -i -pe "s/(?<=md\#function\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/html/group* build/html/*8h*
5757
@perl -i -pe "s/(?<=md\#typedef\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/html/group* build/html/*8h*
58-
@perl -i -pe "s/(?<=md\#enum\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/html/group* build/html/*8h*
58+
@perl -i -pe "s/(?<=md\#enum\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" build/html/group* build/html/*8h*
5959
@perl -i -pe "s/\/group_/group_/g" build/html/group* build/html/*8h*
60-
@perl -i -pe "s/\/tpm2_/tpm2_/g" build/html/group* build/html/*8h*
60+
@perl -i -pe "s/\/tpm2_/tpm2_/g" build/html/group* build/html/*8h*
6161
@perl -i -pe "s/dox_comments\/header_files\///" build/html/*8h*
6262

6363
# Set input format to gfm to fix issues with converted API docs
@@ -70,23 +70,23 @@ html-prep: api
7070
# 6. Two regexes to handle bad Doxygen that didn't convert and the LaTeX processor thinks is LaTeX commands
7171
.PHONY: pdf-prep
7272
pdf-prep: api
73-
@perl -i -pe "s/# /## /g" api/md/*.md
73+
@perl -i -pe "s/# /## /g" api/md/*.md
7474
@perl -i -pe "s/(\/group_.*|Classes\/struct.*|\/.*8h)\.md//g" api/md/*.md
75-
@perl -i -pe "s/^-(-)+$$//" api/md/*.md
76-
@perl -i -pe "s/^title:.*//" api/md/*.md
75+
@perl -i -pe "s/^-(-)+$$//" api/md/*.md
76+
@perl -i -pe "s/^title:.*//" api/md/*.md
7777
@perl -i -pe "s/^Updated on.*//" api/md/*.md
78-
@perl -i -pe "s/^summary.*//" api/md/*.md
79-
@perl -i -pe "s/dox_comments\/header_files\///" api/md/*.md
80-
@perl -i -pe "s/^\\\\//" api/md/*.md
81-
@perl -i -pe "s/\\\\par/par/g" api/md/*.md
78+
@perl -i -pe "s/^summary.*//" api/md/*.md
79+
@perl -i -pe "s/dox_comments\/header_files\///" api/md/*.md
80+
@perl -i -pe "s/^\\\\//" api/md/*.md
81+
@perl -i -pe "s/\\\\par/par/g" api/md/*.md
8282
@perl -i -pe "s/\[(.*?)\]\(Classes\/.*?.md\)/\[\1\]\(#typedef-\1\)/g" api/md/*.md
8383
@perl -i -pe "s/(?<=md\#function\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" api/md/*.md
8484
@perl -i -pe "s/(?<=md\#typedef\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" api/md/*.md
85-
@perl -i -pe "s/(?<=md\#enum\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" api/md/*.md
85+
@perl -i -pe "s/(?<=md\#enum\-)(.*)(?=\))/\$$1=~s#-#_#gr/ge" api/md/*.md
8686
@rm -rf build/pdf/chapter05.md
8787
@echo '# API Reference' >> build/pdf/chapter05.md
8888
ifeq ($(DOC_LANG),JA)
89-
@cat header-ja/group__TPM2__Proprietary.md header-ja/tpm2_8h.md header-ja/tpm2__wrap_8h.md header-ja/group__wolfTPM2__Wrappers.md >> build/pdf/chapter05.md
89+
@cat header-ja/group__TPM2__Proprietary.md header-ja/tpm2_8h.md header-ja/tpm2__wrap_8h.md header-ja/group__wolfTPM2__Wrappers.md >> build/pdf/chapter05.md
9090
else
91-
@cat api/md/group__TPM2__Proprietary.md api/md/tpm2_8h.md api/md/tpm2__wrap_8h.md api/md/group__wolfTPM2__Wrappers.md >> build/pdf/chapter05.md
91+
@cat api/md/group__TPM2__Proprietary.md api/md/tpm2_8h.md api/md/tpm2__wrap_8h.md api/md/tpm__io_8h.md api/md/group__wolfTPM2__Wrappers.md >> build/pdf/chapter05.md
9292
endif

0 commit comments

Comments
 (0)