Skip to content
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

[WIP] Build refactor #129

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

[WIP] Build refactor #129

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
81212b2
build: split makefile
TFSThiagoBR98 Mar 22, 2022
dfd8dbf
build: do not clean untracked files
TFSThiagoBR98 Mar 22, 2022
0ef4dc5
build: checkout submodules in the right version
TFSThiagoBR98 Mar 22, 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
7 changes: 6 additions & 1 deletion build/m4/brotli.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#
# Brotli
#
BROTLI_GIT_VERSION:=v1.0.9

build/lib/brotli/js/decode.js: build/lib/brotli/configured
build/lib/brotli/js/polyfill.js: build/lib/brotli/configured
build/lib/brotli/configured: lib/brotli $(wildcard $(BASE_DIR)build/patches/brotli/*.patch)
Expand Down Expand Up @@ -37,4 +39,7 @@ git-brotli:
cd lib/brotli && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(BROTLI_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dislike how this requires duplicating the submodule version information which is already stored in our root git itself.
Instead the following can do the same without duplication:

    cd lib/brotli && \
    git reset --hard && \
    git clean -dfx
    git submodule update --force lib/

On another note; those targets seem to have originally been intended to update our submodules all at once as the git-update name of the target invoking all other git-* targets suggests. This commit changes their purpose to resetting/syncing the working state to the HEAD state. Imho this is new purpose is more useful, but perhaps we should then also rename the git-update target to something like git-smreset or so?

7 changes: 6 additions & 1 deletion build/m4/expat.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#
# Expat
#
EXPAT_GIT_VERSION:=R_2_4_1

build/lib/expat/configured: lib/expat
mkdir -p build/lib/expat
touch build/lib/expat/configured
Expand Down Expand Up @@ -31,4 +33,7 @@ git-expat:
cd lib/expat && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(EXPAT_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive
7 changes: 6 additions & 1 deletion build/m4/fontconfig.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#
# Fontconfig
#
FONTCONFIG_GIT_VERSION:=2.13.94

build/lib/fontconfig/configure: lib/fontconfig $(wildcard $(BASE_DIR)build/patches/fontconfig/*.patch)
rm -rf build/lib/fontconfig
cp -r lib/fontconfig build/lib/fontconfig
Expand Down Expand Up @@ -34,4 +36,7 @@ git-fontconfig:
cd lib/fontconfig && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(FONTCONFIG_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive
6 changes: 5 additions & 1 deletion build/m4/freetype.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#
# Freetype
#
FREETYPE_GIT_VERSION:=VER-2-11-0

## Without Harfbuzz (Bootstrap)
build/lib/freetype/build_hb/dist_hb/lib/libfreetype.a: $(DIST_DIR)/lib/libbrotlidec.a $(wildcard $(BASE_DIR)build/patches/freetype/*.patch)
Expand Down Expand Up @@ -66,4 +67,7 @@ git-freetype:
cd lib/freetype && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(FREETYPE_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive
7 changes: 6 additions & 1 deletion build/m4/fribidi.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#
# Fribidi
#
FRIBIDI_GIT_VERSION:=v1.0.10

build/lib/fribidi/configure: lib/fribidi $(wildcard $(BASE_DIR)build/patches/fribidi/*.patch)
rm -rf build/lib/fribidi
mkdir -p build/lib
Expand Down Expand Up @@ -34,4 +36,7 @@ git-fribidi:
cd lib/fribidi && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(FRIBIDI_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive
7 changes: 6 additions & 1 deletion build/m4/harfbuzz.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#
# Harfbuzz
#
HARFBUZZ_GIT_VERSION:=2.8.2

build/lib/harfbuzz/configure: lib/harfbuzz $(wildcard $(BASE_DIR)build/patches/harfbuzz/*.patch)
rm -rf build/lib/harfbuzz
cp -r lib/harfbuzz build/lib/harfbuzz
Expand Down Expand Up @@ -48,4 +50,7 @@ git-harfbuzz:
cd lib/harfbuzz && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(HARFBUZZ_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive
7 changes: 6 additions & 1 deletion build/m4/libass.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
#
# libass
#
LIBASS_GIT_VERSION:=643829edd8408ec37182a04040fe5a7bf54dccc3

build/lib/libass/configured: lib/libass
rm -rf build/lib/libass
cd lib/libass && NOCONFIGURE=1 ./autogen.sh
Expand Down Expand Up @@ -34,4 +36,7 @@ git-libass:
cd lib/libass && \
git reset --hard && \
git clean -dfx && \
git pull origin master
git fetch origin && \
git checkout $(LIBASS_GIT_VERSION) && \
git submodule sync --recursive && \
git submodule update --init --recursive