Fixing build errors

3 files changed, 77 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdec6aa898ec..f9e0dfecc236 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = openra-rv-git
 	pkgdesc = A Command & Conquer: Red Alert 2-inspired mod of OpenRA
-	pkgver = 3102.git.dcf73d1
+	pkgver = 3959.git.66c9a08
 	pkgrel = 1
 	url = https://github.com/MustaphaTR/Romanovs-Vengeance
 	install = openra-rv.install
-	arch = any
+	arch = x86_64
 	license = GPL3
 	makedepends = dos2unix
 	makedepends = git
@@ -19,6 +19,8 @@ pkgbase = openra-rv-git
 	depends = lua51
 	depends = hicolor-icon-theme
 	depends = gtk-update-icon-cache
+	depends = libxss
+	depends = java-runtime
 	depends = desktop-file-utils
 	depends = xdg-utils
 	depends = zenity
@@ -29,9 +31,8 @@ pkgbase = openra-rv-git
 	source = openra-rv.appdata.xml
 	source = openra-rv.desktop
 	md5sums = SKIP
-	md5sums = 80198a3797c5f4103536702d15e37f19
+	md5sums = f13888474aeeb31acbe019d10d3d644c
 	md5sums = cdade4bc4fcba3ea1d3dea6bd0e9a2c9
 	md5sums = 98c237db6df1eb777658842765948ea2
 
 pkgname = openra-rv-git
-
diff --git a/PKGBUILD b/PKGBUILD
index ddf3ed0af387..72390efa2e57 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,14 @@
 
 pkgname=openra-rv-git
 _pkgname=openra-rv
-pkgver=3102.git.dcf73d1
+pkgver=3959.git.66c9a08
 pkgrel=1
 pkgdesc="A Command & Conquer: Red Alert 2-inspired mod of OpenRA"
-arch=('any')
+arch=(x86_64)
 url="https://github.com/MustaphaTR/Romanovs-Vengeance"
 license=('GPL3')
 install=openra-rv.install
-depends=('mono' 'ttf-dejavu' 'openal' 'libgl' 'freetype2' 'sdl2' 'lua51' 'hicolor-icon-theme' 'gtk-update-icon-cache'
+depends=('mono' 'ttf-dejavu' 'openal' 'libgl' 'freetype2' 'sdl2' 'lua51' 'hicolor-icon-theme' 'gtk-update-icon-cache' 'libxss' 'java-runtime'
          'desktop-file-utils' 'xdg-utils' 'zenity')
 makedepends=('dos2unix' 'git' 'unzip' 'msbuild')
 provides=('openra-rv')
@@ -19,7 +19,7 @@ source=("git+${url}.git"
 "openra-rv.appdata.xml"
 "openra-rv.desktop")
 md5sums=('SKIP'
-         '80198a3797c5f4103536702d15e37f19'
+         'f13888474aeeb31acbe019d10d3d644c'
          'cdade4bc4fcba3ea1d3dea6bd0e9a2c9'
          '98c237db6df1eb777658842765948ea2')
 
@@ -38,30 +38,32 @@ prepare() {
 
 build() {
     cd $srcdir/Romanovs-Vengeance
+    make
     make version VERSION="${pkgver}"
-    printf "Success in setting version\n"
-    make || (printf "make failed; please do not complain at the AUR about this, as this is an upstream issue.\n" && \
-	printf "So report this at https://github.com/MustaphaTR/Romanovs-Vengeance/issues/new, after checking\n" && \
-	printf "for existing issues.\n")
+    printf "Success in setting version\n" 
 }
 
 package() {
     cd $srcdir/Romanovs-Vengeance
-    mkdir -p $pkgdir/usr/{lib/openra-rv/mods,bin,share/pixmaps,share/doc/packages/openra-rv,share/applications,share/appdata}
-    install -dm775 $pkgdir/var/games/openra-rv
-    cp -r engine/* $pkgdir/usr/lib/openra-rv
-    cp -r mods/rv $pkgdir/usr/lib/openra-rv/mods
-    cp -r engine/mods/{as,common,modcontent} $pkgdir/usr/lib/openra-rv/mods
-    install -Dm755 $srcdir/openra-rv $pkgdir/usr/bin/openra-rv
-    cp -r $srcdir/openra-rv.appdata.xml $pkgdir/usr/share/appdata/openra-rv.appdata.xml
-    cp -r README.md $pkgdir/usr/share/doc/packages/openra-rv/README.md
-    install -Dm644 $srcdir/openra-rv.desktop $pkgdir/usr/share/applications/openra-rv.desktop
+    mkdir -p $pkgdir/usr/{lib/${_pkgname}/mods,bin,share/pixmaps,share/doc/packages/${_pkgname},share/applications,share/appdata}
+    install -dm775 $pkgdir/var/games/${_pkgname}
+    cp -r engine/* $pkgdir/usr/lib/${_pkgname}
+    cp -r mods/rv $pkgdir/usr/lib/${_pkgname}/mods
+    cp -r mod.config $pkgdir/usr/lib/${_pkgname}
+    sed -i -e "s|./engine\"|/usr/lib/${_pkgname}\"|g" $pkgdir/usr/lib/${_pkgname}/mod.config
+    cp -r engine/mods/{common,modcontent} $pkgdir/usr/lib/${_pkgname}/mods
+    cp -r engine/bin/{*.dll*,*.so} $pkgdir/usr/lib/${_pkgname}
+    cp -r engine/{glsl,lua,AUTHORS,COPYING,'global mix database.dat',VERSION} $pkgdir/usr/lib/${_pkgname}
+    install -Dm755 $srcdir/${_pkgname} $pkgdir/usr/bin/${_pkgname}
+    cp -r $srcdir/../${_pkgname}.appdata.xml $pkgdir/usr/share/appdata/${_pkgname}.appdata.xml
+    cp -r README.md $pkgdir/usr/share/doc/packages/${_pkgname}/README.md
+    install -Dm644 $srcdir/${_pkgname}.desktop $pkgdir/usr/share/applications/${_pkgname}.desktop
     mkdir -p $pkgdir/usr/share/icons/hicolor/{16x16,32x32,48x48,64x64,128x128,256x256,512x512}/apps
-    for size in 16 32 48 64 128 256 512; do
-      size="${size}x${size}"
+    for length in 16 32 48 64 128 256 512; do
+      size="${length}x${length}"
       cp packaging/artwork/icon_${size}.png "$pkgdir/usr/share/icons/hicolor/${size}/apps/${pkgname}.png"
     done
     install -Dm644 packaging/artwork/icon_512x512.png ${pkgdir}/usr/share/pixmaps/${pkgname}.png
-    rm -rf $pkgdir/usr/lib/openra-rv/*{.txt,nunit,.yml,.xslt,.cmd,.md,Mono,.sh,Makefile,sln.*,Test,.mdb,.pdb,.ps1,.AS,packaging,thirdparty,engines,OpenRA.Mods}*
-    rm -rf $pkgdir/usr/lib/openra-rv/{mods/{all,cnc,d2k,ra,ts},OpenRA.Mods.*,OpenRA.Platforms.Default,OpenRA.Server,OpenRA.Game,OpenRA.Utility,Settings.StyleCop}
+    rm -rf $pkgdir/usr/lib/openra-rv/*{.txt,nunit,.yml,.xslt,.cmd,.md,Mono,Makefile,.sh,sln.*,Test,.mdb,.pdb,.ps1,.AS,packaging,thirdparty,engines,OpenRA.Mods}*
+    rm -rf $pkgdir/usr/lib/openra-rv/{mods/{all,ra,cnc,d2k,ts},OpenRA.Mods.*,OpenRA.Platforms.Default,OpenRA.Server,OpenRA.Game,OpenRA.Utility,Settings.StyleCop}
 }
diff --git a/openra-rv b/openra-rv
index 1943f58bfab8..b7e79307d7ef 100755
--- a/openra-rv
+++ b/openra-rv
@@ -1,19 +1,52 @@
 #!/bin/sh
-cd "/usr/lib/openra-rv"
-
-# Run the game
-mono --debug OpenRA.Game.exe Game.Mod=rv Engine.LaunchPath="/usr/bin/openra-rv" "Engine.ModSearchPaths=/usr/lib/openra-rv/mods" "$@"
-
-# Show a crash dialog if something went wrong
-if [ $? != 0 ] && [ $? != 1 ]; then
-  ERROR_MESSAGE="OpenRA Romanov's Vengeance has encountered a fatal error.\nPlease refer to the crash logs and FAQ for more information.\n\nLog files are located in ~/.openra/Logs\nThe FAQ is available at http://wiki.openra.net/FAQ"
-  if command -v zenity > /dev/null; then
-    zenity --no-wrap --error --title "OpenRA Romanov's Vengeance" --text "${ERROR_MESSAGE}" 2> /dev/null
-  elif command -v kdialog > /dev/null; then
-    kdialog --title "OpenRA Romanov's Vengeance" --error "${ERROR_MESSAGE}"
-  else
-    printf "${ERROR_MESSAGE}\n"
-  fi
-  exit 1
+
+set -e
+command -v mono >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires mono."; exit 1; }
+if command -v python3 >/dev/null 2>&1; then
+	PYTHON="python3"
+else
+	command -v python >/dev/null 2>&1 || { echo >&2 "The OpenRA mod SDK requires python."; exit 1; }
+	PYTHON="python"
+fi
+
+require_variables() {
+	missing=""
+	for i in "$@"; do
+		eval check="\$$i"
+		[ -z "${check}" ] && missing="${missing}   ${i}\n"
+	done
+	if [ ! -z "${missing}" ]; then
+		echo "Required mod.config variables are missing:\n${missing}Repair your mod.config (or user.config) and try again."
+		exit 1
+	fi
+}
+
+TEMPLATE_LAUNCHER=$(${PYTHON} -c "import os; print(os.path.realpath('$0'))")
+PRELIM_MOD_ID=$(echo $TEMPLATE_LAUNCHER | cut -d '/' -f 4)
+TEMPLATE_ROOT=/usr/lib/$PRELIM_MOD_ID
+MOD_SEARCH_PATHS="${TEMPLATE_ROOT}/mods,./mods"
+
+# shellcheck source=mod.config
+. "${TEMPLATE_ROOT}/mod.config"
+
+if [ -f "${TEMPLATE_ROOT}/user.config" ]; then
+	# shellcheck source=user.config
+	. "${TEMPLATE_ROOT}/user.config"
+fi
+
+require_variables "MOD_ID" "ENGINE_VERSION" "ENGINE_DIRECTORY"
+cd "${TEMPLATE_ROOT}"
+if [ ! -f "${ENGINE_DIRECTORY}/bin/OpenRA.dll" ] || [ "$(cat "${ENGINE_DIRECTORY}/VERSION")" != "${ENGINE_VERSION}" ]; then
+	echo "Required engine files not found."
+	echo "Run \`make\` in the mod directory to fetch and build the required files, then try again.";
+	exit 1
+fi
+
+if command -v mono >/dev/null 2>&1 && [ "$(grep -c .NETCoreApp,Version= ${ENGINE_DIRECTORY}/bin/OpenRA.dll)" = "0" ]; then
+	RUNTIME_LAUNCHER="mono --debug"
+else
+	RUNTIME_LAUNCHER="dotnet"
 fi
 
+cd "${ENGINE_DIRECTORY}"
+${RUNTIME_LAUNCHER} bin/OpenRA.dll Engine.EngineDir=".." Engine.LaunchPath="${TEMPLATE_LAUNCHER}" "Engine.ModSearchPaths=${MOD_SEARCH_PATHS}" Game.Mod="${MOD_ID}" "$@"