Skip to content

Commit 05416ab

Browse files
authored
Clang format fix (#2018)
* Remove trailing whitespace from Makefile * Fix Makefile format rule to catch all source files * Apply clang-format rules to cpp and h files that were previously missed. Signed-off-by: Joshua Minor <joshm@pixar.com>
1 parent 6e13de4 commit 05416ab

20 files changed

Lines changed: 2826 additions & 1572 deletions

Makefile

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,11 @@ format:
155155
ifndef CLANG_FORMAT_PROG
156156
$(error $(newline)$(ccred)clang-format is not available on $$PATH$(ccend))
157157
endif
158-
$(eval DIRS = src/opentime src/opentimelineio)
159-
$(eval DIRS += src/py-opentimelineio/opentime-opentime-bindings)
160-
$(eval DIRS += src/py-opentimelineio/opentimelineio-opentime-bindings)
158+
$(eval DIRS = src/opentime src/opentimelineio src/opentimelineio/algo)
159+
$(eval DIRS += src/py-opentimelineio/opentime-bindings)
160+
$(eval DIRS += src/py-opentimelineio/opentimelineio-bindings)
161161
$(eval FILES_TO_FORMAT = $(wildcard $(addsuffix /*.h, $(DIRS)) $(addsuffix /*.cpp, $(DIRS))))
162+
echo "formatting..." $(FILES_TO_FORMAT)
162163
$(shell clang-format -i -style=file $(FILES_TO_FORMAT))
163164

164165
manifest:
@@ -169,7 +170,7 @@ ifndef CHECK_MANIFEST_PROG
169170
endif
170171
@check-manifest
171172
@echo "check-manifest succeeded"
172-
173+
173174

174175
doc-model:
175176
@python src/py-opentimelineio/opentimelineio/console/autogen_serialized_datamodel.py --dryrun
@@ -196,10 +197,10 @@ doc-html:
196197
@# if you just want to build the docs yourself outside of RTD
197198
@cd docs; ${MAKE_PROG} html
198199

199-
doc-cpp:
200-
@cd doxygen ; doxygen config/dox_config ; cd ..
200+
doc-cpp:
201+
@cd doxygen ; doxygen config/dox_config ; cd ..
201202
@echo "wrote doxygen output to: doxygen/output/html/index.html"
202-
203+
203204
# release related targets
204205
confirm-release-intent:
205206
ifndef OTIO_DO_RELEASE
@@ -231,7 +232,7 @@ unfreeze-ci-versions:
231232
@echo "unfreezing CI versions..."
232233
@python maintainers/freeze_ci_versions.py -u
233234

234-
# needs to happen _before_ version-map-update so that version in
235+
# needs to happen _before_ version-map-update so that version in
235236
# CORE_VERSION_MAP does not have the .dev1 suffix at release time
236237
remove-dev-suffix:
237238
@echo "Removing .dev1 suffix"
@@ -252,7 +253,7 @@ update-contributors: check-github-token
252253
dev-python-install:
253254
@python setup.py install
254255

255-
# make target for preparing a release candidate
256+
# make target for preparing a release candidate
256257
release: \
257258
confirm-release-intent \
258259
check-git-status \
@@ -264,7 +265,7 @@ release: \
264265
dev-python-install \
265266
version-map-update \
266267
test-core \
267-
update-contributors
268+
update-contributors
268269
@echo "Release is ready. Commit, push and open a PR!"
269270

270271
# targets for creating a new version (after making a release, to start the next

0 commit comments

Comments
 (0)