From faea358023c1269e26a0e644b8d128035b60eb4f Mon Sep 17 00:00:00 2001 From: Stephan Lachnit Date: Fri, 13 Mar 2020 18:54:08 +0100 Subject: [PATCH] Use wrap instead of git submodule Signed-off-by: Stephan Lachnit --- .gitmodules | 3 --- scripts/mkrelease.sh | 4 ++-- subprojects/inih | 1 - subprojects/inih.wrap | 3 +++ 4 files changed, 5 insertions(+), 6 deletions(-) delete mode 100644 .gitmodules delete mode 160000 subprojects/inih create mode 100644 subprojects/inih.wrap diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 4f4dc5d..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "subprojects/inih"] - path = subprojects/inih - url = https://github.com/benhoyt/inih.git diff --git a/scripts/mkrelease.sh b/scripts/mkrelease.sh index 56bf604..26829be 100755 --- a/scripts/mkrelease.sh +++ b/scripts/mkrelease.sh @@ -2,9 +2,9 @@ set -e # Simple script to construct a redistributable and complete tarball of the -# gamemode tree, including the git submodules, so that it can be trivially +# gamemode tree, including the subprojects, so that it can be trivially # packaged by distributions banning networking during build. -git submodule init +meson subprojects download # Bump in tandem with meson.build, run script once new tag is up. VERSION="1.6-dev" diff --git a/subprojects/inih b/subprojects/inih deleted file mode 160000 index 3512171..0000000 --- a/subprojects/inih +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 351217124ddb3e3fe2b982248a04c672350bb0af diff --git a/subprojects/inih.wrap b/subprojects/inih.wrap new file mode 100644 index 0000000..ccf2706 --- /dev/null +++ b/subprojects/inih.wrap @@ -0,0 +1,3 @@ +[wrap-git] +url = https://github.com/benhoyt/inih.git +revision = r49