summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartchus2019-08-24 23:15:32 +0200
committerMartchus2019-08-24 23:15:32 +0200
commiteef935a81a5ee28ce8735c65353d1363ba5758ea (patch)
tree27706165b7ebc00b50062746307cefa09d2efe83
parente04a999c71bd472b7aa647752100ea096da0a757 (diff)
downloadaur-eef935a81a5ee28ce8735c65353d1363ba5758ea.tar.gz
Update version
-rw-r--r--.SRCINFO4
-rw-r--r--.sync-conflict-20190519-131720-PKPUQWZ.SRCINFO27
-rw-r--r--PKGBUILD75
3 files changed, 78 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index e408948aa56..9626635f847 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mingw-w64-reflective-rapidjson
pkgdesc = Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON (mingw-w64)
- pkgver = 0.0.8
+ pkgver = 0.0.9
pkgrel = 1
url = https://github.com/Martchus/reflective-rapidjson
arch = any
@@ -20,7 +20,7 @@ pkgbase = mingw-w64-reflective-rapidjson
options = staticlibs
options = !strip
options = !emptydirs
- source = reflective-rapidjson-0.0.8.tar.gz::https://github.com/Martchus/reflective-rapidjson/archive/v0.0.8.tar.gz
+ source = reflective-rapidjson-0.0.9.tar.gz::https://github.com/Martchus/reflective-rapidjson/archive/v0.0.9.tar.gz
sha256sums = 18b99bd820e033eba5aa8b40eca3d3c6fe06722eafe6ea79c298d8b5bc7f434a
pkgname = mingw-w64-reflective-rapidjson
diff --git a/.sync-conflict-20190519-131720-PKPUQWZ.SRCINFO b/.sync-conflict-20190519-131720-PKPUQWZ.SRCINFO
new file mode 100644
index 00000000000..618eb497ad5
--- /dev/null
+++ b/.sync-conflict-20190519-131720-PKPUQWZ.SRCINFO
@@ -0,0 +1,27 @@
+pkgbase = mingw-w64-reflective-rapidjson
+ pkgdesc = Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON (mingw-w64)
+ pkgver = 0.0.7
+ pkgrel = 1
+ url = https://github.com/Martchus/reflective-rapidjson
+ arch = any
+ license = GPL
+ checkdepends = mingw-w64-cppunit
+ checkdepends = mingw-w64-wine
+ checkdepends = mingw-w64-boost
+ makedepends = mingw-w64-gcc
+ makedepends = mingw-w64-cmake
+ depends = mingw-w64-crt
+ depends = mingw-w64-c++utilities
+ depends = mingw-w64-rapidjson
+ depends = reflective-rapidjson
+ optdepends = mingw-w64-boost: use Boost.Hana instead of code generator
+ optdepends = reflective-rapidjson-doc: API documentation
+ options = !buildflags
+ options = staticlibs
+ options = !strip
+ options = !emptydirs
+ source = reflective-rapidjson-0.0.7.tar.gz::https://github.com/Martchus/reflective-rapidjson/archive/v0.0.7.tar.gz
+ sha256sums = d10e21909b29f960a9dc5e8d925511597e35e2a8436b2732bc2e224acbd62b73
+
+pkgname = mingw-w64-reflective-rapidjson
+
diff --git a/PKGBUILD b/PKGBUILD
index bb3467db116..158f5b4475f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
_reponame=reflective-rapidjson
pkgname=mingw-w64-reflective-rapidjson
_name=${pkgname#mingw-w64-}
-pkgver=0.0.8
+pkgver=0.0.9
pkgrel=1
arch=('any')
pkgdesc='Code generator for serializing/deserializing C++ objects to/from JSON using Clang and RapidJSON (mingw-w64)'
@@ -20,45 +20,68 @@ url="https://github.com/Martchus/${_reponame}"
source=("${_name}-${pkgver}.tar.gz::https://github.com/Martchus/${_reponame}/archive/v${pkgver}.tar.gz")
sha256sums=('18b99bd820e033eba5aa8b40eca3d3c6fe06722eafe6ea79c298d8b5bc7f434a')
options=(!buildflags staticlibs !strip !emptydirs)
-_architectures='i686-w64-mingw32 x86_64-w64-mingw32'
-[[ $NO_STATIC_LIBS ]] || _configurations='-DENABLE_STATIC_LIBS:BOOL=ON'
-[[ $NO_SHARED_LIBS ]] && _configurations+=' -DDISABLE_SHARED_LIBS:BOOL=ON'
+
+_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
+_configurations=()
+[[ $NO_SHARED_LIBS ]] || _configurations+=('shared')
+[[ $NO_STATIC_LIBS ]] || _configurations+=('static')
build() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
- for _arch in ${_architectures}; do
- mkdir -p "build-${_arch}" && pushd "build-${_arch}"
- # disable building the code generator since it is not useful for cross-compilation
- ${_arch}-cmake -DCMAKE_BUILD_TYPE=Release \
- -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
- -DNO_GENERATOR=ON \
- ${_configurations} \
- ../
- # workaround issue https://gitlab.kitware.com/cmake/cmake/issues/19095
- find -iname 'includes_CXX.rsp' -exec sed -i -e "s|-isystem /usr/$_arch/include ||" {} \;
+ declare -A _config_flags=(
+ [shared]='
+ -DBUILD_SHARED_LIBS:BOOL=ON
+ '
+ [static]='
+ -DBUILD_SHARED_LIBS:BOOL=OFF
+ -DCMAKE_FIND_LIBRARY_SUFFIXES:STRING=.a;.lib
+ -DSTATIC_LINKAGE:BOOL=ON
+ -DSTATIC_LIBRARY_LINKAGE:BOOL=ON
+ '
+ )
- make
- popd
+ for _arch in "${_architectures[@]}"; do
+ for _cfg in "${_configurations[@]}"; do
+ msg2 "${_arch}-${_cfg}"
+ mkdir -p "build-${_arch}-${_cfg}" && pushd "build-${_arch}-${_cfg}"
+ ${_arch}-cmake \
+ -DCMAKE_BUILD_TYPE:STRING='Release' \
+ -DCMAKE_INSTALL_PREFIX="/usr/${_arch}" \
+ -DCONFIGURATION_NAME:STRING="${_cfg}" \
+ -DCONFIGURATION_PACKAGE_SUFFIX:STRING="-${_cfg}" \
+ -DNO_GENERATOR:BOOL=ON \
+ -DENABLE_TARGETS_FOR_MINGW64_CROSS_PACKAGING:BOOL=ON \
+ ${_config_flags[$_cfg]} \
+ ../
+ make
+ popd
+ done
done
}
check() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
- for _arch in ${_architectures}; do
- mkdir -p "build-${_arch}" && pushd "build-${_arch}"
- export WINEPATH="/usr/${_arch}/bin"
- export WINEDEBUG=-all
- make check
- popd
+
+ for _arch in "${_architectures[@]}"; do
+ for _cfg in "${_configurations[@]}"; do
+ msg2 "${_arch}-${_cfg}"
+ pushd "build-${_arch}-${_cfg}"
+ make WINEPATH="/usr/${_arch}/bin" WINEDEBUG=-all check
+ popd
+ done
done
}
package() {
cd "$srcdir/${PROJECT_DIR_NAME:-$_reponame-$pkgver}"
- for _arch in ${_architectures}; do
- mkdir -p "build-${_arch}" && pushd "build-${_arch}"
- make DESTDIR="${pkgdir}" install-mingw-w64-strip
- popd
+
+ for _arch in "${_architectures[@]}"; do
+ for _cfg in "${_configurations[@]}"; do
+ msg2 "${_arch}-${_cfg}"
+ pushd "build-${_arch}-${_cfg}"
+ make DESTDIR="${pkgdir}" install-mingw-w64-strip
+ popd
+ done
done
}