updpkg 0.66_release-1; enable testing

2 files changed, 82 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5a8f883c0f58..896ee2637b5e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,29 @@
 pkgbase = corsix-th
 	pkgdesc = Reimplementation of the game engine of Theme Hospital
-	pkgver = 0.66_beta2
+	pkgver = 0.66_release
 	pkgrel = 1
-	url = https://github.com/CorsixTH/CorsixTH
+	url = https://corsixth.com/
 	install = corsix-th.install
 	arch = i686
 	arch = x86_64
 	arch = armv7h
 	license = MIT
+	checkdepends = busted
+	checkdepends = luacheck
+	makedepends = catch2
 	makedepends = cmake
 	makedepends = ninja
 	makedepends = doxygen
+	depends = ffmpeg
 	depends = freetype2
+	depends = hicolor-icon-theme
 	depends = lua
-	depends = lua-lpeg
 	depends = lua-filesystem
+	depends = lua-lpeg
 	depends = sdl2_mixer
-	depends = ffmpeg
 	optdepends = freepats-legacy: Soundfont for Midi playback
 	optdepends = soundfont-fluid: Alternative soundfont for Midi playback
-	source = corsix-th-0.66-beta2.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/v0.66-beta2.tar.gz
-	b2sums = 0b95e0aac169370c48758c91749f433b4e272e747b486c8026999e94b25f2f4a3b7a5fb6c33095ac097ba1b1ceea36627a3226a219d5d4a443fe0183478c9775
+	source = CorsixTH-0.66.tar.gz::https://github.com/CorsixTH/CorsixTH/archive/refs/tags/v0.66.tar.gz
+	b2sums = 7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75
 
 pkgname = corsix-th
diff --git a/PKGBUILD b/PKGBUILD
index 04e33270ea3d..1006c07aeaf0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,37 +4,66 @@
 # Contributors: jdc, rayman2200, TheCycoONE
 
 pkgname='corsix-th'
-# TODO: fix versioning next time if needed: 0.66_beta is higher than 0.66
-pkgver=0.66_beta2
-_tagver=0.66-beta2
+_projectname='CorsixTH'
+# TODO: fix versioning: from 0.67, format should be (in increasing order): 0.67beta1, 0.67rc, 0.67
+pkgver=0.66_release
+_tagver=0.66
 pkgrel=1
 pkgdesc='Reimplementation of the game engine of Theme Hospital'
-url='https://github.com/CorsixTH/CorsixTH'
+url='https://corsixth.com/'
+_repourl="https://github.com/${_projectname}/${_projectname}"
 arch=('i686' 'x86_64' 'armv7h')
 license=('MIT')
-makedepends=('cmake' 'ninja' 'doxygen')
-depends=('freetype2' 'lua' 'lua-lpeg' 'lua-filesystem' 'sdl2_mixer' 'ffmpeg')
-optdepends=('freepats-legacy: Soundfont for Midi playback'
-            'soundfont-fluid: Alternative soundfont for Midi playback')
+depends=(
+  'ffmpeg'
+  'freetype2'
+  'hicolor-icon-theme'
+  'lua'
+  'lua-filesystem'
+  'lua-lpeg'
+  'sdl2_mixer'
+)
+makedepends=(
+  'catch2'
+  'cmake'
+  'ninja'
+  'doxygen'
+)
+checkdepends=(
+  'busted'
+  'luacheck'
+)
+optdepends=(
+  'freepats-legacy: Soundfont for Midi playback'
+  'soundfont-fluid: Alternative soundfont for Midi playback'
+)
 install="${pkgname}.install"
-source=("${pkgname}-${_tagver}.tar.gz::${url}/archive/v${_tagver}.tar.gz")
-b2sums=('0b95e0aac169370c48758c91749f433b4e272e747b486c8026999e94b25f2f4a3b7a5fb6c33095ac097ba1b1ceea36627a3226a219d5d4a443fe0183478c9775')
+_tarname="${_projectname}-${_tagver}"
+source=("${_tarname}.tar.gz::${_repourl}/archive/refs/tags/v${_tagver}.tar.gz")
+b2sums=('7bceb0d5893849ba906ccd9516ecd52f0a1c54f3a91bff932c0db053f66e71a3d38dfdb55979cb9bb2047c7338b3badbb32defa216a9867fb7166f4ca14bfa75')
 
 prepare() {
-  printf 'Checking if ccache is enabled for makepkg... '
+  printf 'Checking if ccache is enabled... '
 
-  if check_buildoption 'ccache' 'y'; then
-    printf 'yes\n'
-    printf 'Enabling C++ ccache for CMake...\n'
-    export CMAKE_CXX_COMPILER_LAUNCHER='ccache'
+  if ! check_buildoption "ccache" "y"; then
+    echo 'no'
   else
-    printf 'no\n'
+    echo 'yes'
+
+    echo '-- Enabling ccache for the C++ compiler in CMake'
+    export CMAKE_CXX_COMPILER_LAUNCHER='ccache'
   fi
 
-  printf 'Configuring build with CMake...\n\n'
-  export CXXFLAGS+=" ${CPPFLAGS}" # CMake ignores CPPFLAGS
+  echo 'Configuring external build flags for CMake...'
+  echo '-- Adding CPPFLAGS to CFLAGS and CXXFLAGS; otherwise it might be ignored by CMake'
+  export CXXFLAGS+=" ${CPPFLAGS}"
 
-  cmake -S "CorsixTH-${_tagver}" \
+  echo
+  echo "Configuring ${_projectname} CMake build..."
+
+  echo '-- Adding LDFLAGS to LINKER_FLAGS_INIT vars, otherwise it might be ignored by CMake'
+
+  cmake -S "${_tarname}" \
         -B 'build' \
         -G 'Ninja' \
         -Wno-dev \
@@ -43,19 +72,39 @@ prepare() {
         -DCMAKE_EXE_LINKER_FLAGS_INIT="${LDFLAGS}" \
         -DCMAKE_SHARED_LINKER_FLAGS_INIT="${LDFLAGS}" \
         -DCMAKE_MODULE_LINKER_FLAGS_INIT="${LDFLAGS}" \
-        -DWITH_FREETYPE2='ON'
+        -DENABLE_UNIT_TESTS='ON'
 }
 
 build() {
-  printf 'Building with CMake...\n\n'
+  echo "Building ${_projectname} with CMake..."
   cmake --build 'build'
 }
 
+check() {
+  cd "${srcdir}/${_tarname}"
+
+  echo "--> Executing luacheck... "
+  luacheck --codes --ranges "${_projectname}"
+  echo
+
+  echo "--> Executing busted..."
+  busted \
+    --verbose \
+    --directory="${_projectname}/Luatest" \
+    --filter-out="Calculate simple VIP rating"
+  echo
+
+  cd "${srcdir}/build/${_projectname}"
+
+  echo "--> Executing CMake ctest..."
+  ctest --extra-verbose --build-config Release --output-on-failure
+}
+
 package() {
-  printf 'Installing with CMake...\n\n'
+  echo "Installing ${_projectname} with CMake..."
   DESTDIR="${pkgdir}/" cmake --install 'build'
 
   # license
   install -dm 755 "${pkgdir}/usr/share/licenses/${pkgname}"
-  ln -s '/usr/share/corsix-th/LICENSE.txt' "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  ln -s "/usr/share/${pkgname}/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }