Skip to content

[TheOneric] Submodules cleanup #42

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
dmitrylyzo merged 3 commits into from
Dec 26, 2022
Merged

[TheOneric] Submodules cleanup #42

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
401db10
make: macroise submodule updates
TheOneric May 27, 2022
a3f6190
make: replace submodule update with reset
TheOneric May 27, 2022
7013229
cosmetic/make: move server target down
TheOneric May 27, 2022
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
51 changes: 7 additions & 44 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ all: subtitleoctopus

subtitleoctopus: dist

include functions.mk

# Fribidi
build/lib/fribidi/configure: lib/fribidi $(wildcard $(BASE_DIR)build/patches/fribidi/*.patch)
rm -rf build/lib/fribidi
Expand Down Expand Up @@ -368,49 +370,10 @@ git-checkout:
git submodule sync --recursive && \
git submodule update --init --recursive

SUBMODULES := brotli expat fontconfig freetype fribidi harfbuzz libass
git-smreset: $(addprefix git-, $(SUBMODULES))

$(foreach subm, $(SUBMODULES), $(eval $(call TR_GIT_SM_RESET,$(subm))))

server: # Node http server npm i -g http-server
http-server

git-update: git-freetype git-fribidi git-fontconfig git-expat git-harfbuzz git-libass git-brotli

git-brotli:
cd lib/brotli && \
git reset --hard && \
git clean -dfx && \
git pull origin master

git-freetype:
cd lib/freetype && \
git reset --hard && \
git clean -dfx && \
git pull origin master

git-fribidi:
cd lib/fribidi && \
git reset --hard && \
git clean -dfx && \
git pull origin master

git-fontconfig:
cd lib/fontconfig && \
git reset --hard && \
git clean -dfx && \
git pull origin master

git-expat:
cd lib/expat && \
git reset --hard && \
git clean -dfx && \
git pull origin master

git-harfbuzz:
cd lib/harfbuzz && \
git reset --hard && \
git clean -dfx && \
git pull origin master

git-libass:
cd lib/libass && \
git reset --hard && \
git clean -dfx && \
git pull origin master
20 changes: 20 additions & 0 deletions functions.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# For inclusion in toplevel Makefile
# Defines some useful macros and variables for building etc
# If arguments are expected (macro) it needs to be invoked with $(call ...),
# if no arguments are supported the definition is aregular avariable and can be used as such.
# Special macros of the name TR_... create targets (and always take arguments)
# and thus also need to be $(eval ...)'ed


## Clean and git related

# @arg1: submodule name
define TR_GIT_SM_RESET
git-$(1):
cd lib/$(1) && \
git reset --hard && \
git clean -dfx
git submodule update --force lib/$(1)

.PHONY: git-$(1)
endef