summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorxDShot2021-10-09 03:29:21 +0300
committerxDShot2021-10-09 03:29:21 +0300
commita75aeac3c5b4c79228ed3b3f70120a4c090d948c (patch)
tree19c13863dc5b578766de995947dc2d88ff009641
parent39630650da0e1e9cd07825026a7c629c9d958c1e (diff)
downloadaur-a75aeac3c5b4c79228ed3b3f70120a4c090d948c.tar.gz
Clone and use submodule repositories
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore3
-rw-r--r--PKGBUILD22
3 files changed, 27 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index beee5cbc1b6b..d368fb5ae4aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ericw-tools-git
pkgdesc = Quake/Hexen 2 Map compiling tools
- pkgver = 0.18.2.rc1.r166.gac79487
+ pkgver = 0.18.2.rc1.r354.gf0e3d32f
pkgrel = 1
url = https://ericwa.github.io/ericw-tools
arch = x86_64
@@ -12,6 +12,12 @@ pkgbase = ericw-tools-git
provides = ericw-tools
conflicts = ericw-tools
source = ericw-tools::git+https://github.com/ericwa/ericw-tools.git
+ source = fmt::git+https://github.com/fmtlib/fmt.git
+ source = googletest::git+https://github.com/google/googletest.git
+ source = json::git+https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git
+ sha256sums = SKIP
+ sha256sums = SKIP
+ sha256sums = SKIP
sha256sums = SKIP
pkgname = ericw-tools-git
diff --git a/.gitignore b/.gitignore
index a1e83af89562..74f6512acb9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,6 @@
src/*
pkg/*
ericw-tools/*
+fmt/*
+googletest/*
+json/*
diff --git a/PKGBUILD b/PKGBUILD
index f0a844965391..cf6810488d9b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
_pkgname=ericw-tools
pkgname=${_pkgname}-git
-pkgver=0.18.2.rc1.r166.gac79487
+pkgver=0.18.2.rc1.r354.gf0e3d32f
pkgrel=1
pkgdesc="Quake/Hexen 2 Map compiling tools"
arch=('x86_64')
@@ -11,8 +11,15 @@ depends=('embree' 'groff')
makedepends=('cmake' 'git')
provides=(${_pkgname})
conflicts=(${_pkgname})
-source=("${_pkgname}::git+${_giturl}.git")
-sha256sums=('SKIP')
+source=("${_pkgname}::git+${_giturl}.git"
+ "fmt::git+https://github.com/fmtlib/fmt.git"
+ "googletest::git+https://github.com/google/googletest.git"
+ "json::git+https://github.com/ArthurSonzogni/nlohmann_json_cmake_fetchcontent.git"
+)
+sha256sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
pkgver() {
cd ${_pkgname}
@@ -20,8 +27,13 @@ pkgver() {
}
prepare() {
- cd ${_pkgname}
- git submodule update --init --recursive --force
+ cd "${_pkgname}/3rdparty/"
+ rm -r "fmt"
+ ln -s "${srcdir}/fmt"
+ rm -r "googletest"
+ ln -s "${srcdir}/googletest"
+ rm -r "json"
+ ln -s "${srcdir}/json"
}
build() {