Skip to content

Clang format fix #2018

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jminor merged 3 commits into from
Apr 28, 2026
Merged

Clang format fix #2018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
898ebcb
Remove trailing whitespace from Makefile
jminor Apr 28, 2026
2ba04f1
Fix Makefile format rule to catch all source files
jminor Apr 28, 2026
e61f00c
Apply clang-format rules to cpp and h files that were previously missed.
jminor Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,10 +155,11 @@ format:
ifndef CLANG_FORMAT_PROG
$(error $(newline)$(ccred)clang-format is not available on $$PATH$(ccend))
endif
$(eval DIRS = src/opentime src/opentimelineio)
$(eval DIRS += src/py-opentimelineio/opentime-opentime-bindings)
$(eval DIRS += src/py-opentimelineio/opentimelineio-opentime-bindings)
$(eval DIRS = src/opentime src/opentimelineio src/opentimelineio/algo)
$(eval DIRS += src/py-opentimelineio/opentime-bindings)
$(eval DIRS += src/py-opentimelineio/opentimelineio-bindings)
$(eval FILES_TO_FORMAT = $(wildcard $(addsuffix /*.h, $(DIRS)) $(addsuffix /*.cpp, $(DIRS))))
echo "formatting..." $(FILES_TO_FORMAT)
$(shell clang-format -i -style=file $(FILES_TO_FORMAT))

manifest:
Expand All @@ -169,7 +170,7 @@ ifndef CHECK_MANIFEST_PROG
endif
@check-manifest
@echo "check-manifest succeeded"


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

doc-cpp:
@cd doxygen ; doxygen config/dox_config ; cd ..
doc-cpp:
@cd doxygen ; doxygen config/dox_config ; cd ..
@echo "wrote doxygen output to: doxygen/output/html/index.html"

# release related targets
confirm-release-intent:
ifndef OTIO_DO_RELEASE
Expand Down Expand Up @@ -231,7 +232,7 @@ unfreeze-ci-versions:
@echo "unfreezing CI versions..."
@python maintainers/freeze_ci_versions.py -u

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

# make target for preparing a release candidate
# make target for preparing a release candidate
release: \
confirm-release-intent \
check-git-status \
Expand All @@ -264,7 +265,7 @@ release: \
dev-python-install \
version-map-update \
test-core \
update-contributors
update-contributors
@echo "Release is ready. Commit, push and open a PR!"

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