diff options
| -rw-r--r-- | .SRCINFO | 22 | ||||
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | PKGBUILD | 54 |
3 files changed, 50 insertions, 30 deletions
@@ -1,22 +1,24 @@ pkgbase = jsettlers-git - pkgdesc = A Remake of "The Settlers III" for Windows, Linux, Mac and Android - pkgver = 0.4.0.alpha.r693.g5576c872d + pkgdesc = A Remake of "The Settlers III" for Windows, Linux, Mac and Android - forked by paulwedeck + pkgver = 0.6.0.6.alpha.r2.gf7597a2f2 pkgrel = 1 - url = https://github.com/jsettlers/settlers-remake + url = https://github.com/paulwedeck/settlers-remake install = jsettlers-git.install arch = any license = MIT - makedepends = jdk8-openjdk + makedepends = jdk11-openjdk makedepends = unzip - depends = java-environment + makedepends = git + depends = java-runtime>=11 depends = sh optdepends = settlers3-demo-data provides = jsettlers - noextract = gradle-4.6-all.zip - source = jsettlers::git+https://github.com/jsettlers/settlers-remake.git - source = https://services.gradle.org/distributions/gradle-4.6-all.zip + noextract = gradle-7.4.2-all.zip + source = jsettlers::git+https://github.com/paulwedeck/settlers-remake.git + source = https://services.gradle.org/distributions/gradle-7.4.2-all.zip + source = jsettlers-mapcreator.desktop + source = jsettlers.desktop sha512sums = SKIP - sha512sums = 36249d86e5e35d793448960251c9db1be36643ea4846be35e7b9af5c0bed245dac20c4682580c53ff80f6745369cb5dad8dd840a9b00f7b67d1ec563a9e6e106 + sha512sums = 2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf pkgname = jsettlers-git - diff --git a/.gitignore b/.gitignore index 9ed1da9adfad..1f4dda92dbc7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ pkg/ src/ jsettlers/ -jsettlers-git-*.pkg.tar.xz -gradle-*.zip
\ No newline at end of file +jsettlers-git-*.pkg.tar.* +gradle-*.zip @@ -1,29 +1,33 @@ -# Maintainer: aligator <aligator at-symbol suncraft-server dot de> +# Maintainer: aligator <aligator at-symbol aligator.dev> pkgrel=1 _pkgname='jsettlers' pkgname=${_pkgname}'-git' -pkgver=0.4.0.alpha.r693.g5576c872d +pkgver=0.6.0.8.alpha.r0.g990134459 pkgver() { cd ${_pkgname} git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g' } -_gradlever='4.6' +_gradlever='7.4.2' arch=('any') -pkgdesc='A Remake of "The Settlers III" for Windows, Linux, Mac and Android' -url='https://github.com/jsettlers/settlers-remake' +pkgdesc='A Remake of "The Settlers III" for Windows, Linux, Mac and Android - forked by paulwedeck' +url='https://github.com/paulwedeck/settlers-remake' license=('MIT') provides=(${_pkgname}) -depends=('java-runtime=8' 'sh') +depends=('java-runtime>=11' 'sh') optdepends=('settlers3-demo-data') -makedepends=('java-environment=8' 'unzip') +makedepends=('jdk11-openjdk' 'unzip' 'git') install=${pkgname}'.install' -source=("jsettlers::git+https://github.com/jsettlers/settlers-remake.git" - "https://services.gradle.org/distributions/gradle-${_gradlever}-all.zip") +source=("jsettlers::git+https://github.com/paulwedeck/settlers-remake.git" + "https://services.gradle.org/distributions/gradle-${_gradlever}-all.zip" + "jsettlers-mapcreator.desktop" + "jsettlers.desktop") noextract=("gradle-${_gradlever}-all.zip") sha512sums=('SKIP' - '36249d86e5e35d793448960251c9db1be36643ea4846be35e7b9af5c0bed245dac20c4682580c53ff80f6745369cb5dad8dd840a9b00f7b67d1ec563a9e6e106') + '2e1d05486baa9661d5c8ffead2df87874a66f6cfc958ee6840432b89d221d8b0af9e3cad3675766f5413d12aa61c5b5fb0dd82f4164e5da3022865eba9ceadbf' + '67d61b580daeb1dd098f10af99dccf81986732d9c6720432ec78cdfc093681b8f1a537c13b7460520ab0ae7443c1dc8da765f49cc8e90c27d59d14e6ee260179' + '0c875bb6eb384867d46048054679ca555ff0600cbf197d170f9afda2b4a6c5e7bb275a08dad903cbf499508e2a96906a0f0267b4122f7cde8b42ed668ec17cc0') prepare() { # prepare gradle to use downloaded zip @@ -35,7 +39,9 @@ build() { cd ${srcdir}/${_pkgname} # build game (without android) - JAVA_HOME="/usr/lib/jvm/java-8-openjdk" ANDROID_HOME="" ./gradlew --gradle-user-home=. releaseJSettlers || return 1 + JAVA_HOME="/usr/lib/jvm/java-11-openjdk" ANDROID_HOME="" ./gradlew --gradle-user-home=. releaseJSettlers || return 1 + # build server + JAVA_HOME="/usr/lib/jvm/java-11-openjdk" ANDROID_HOME="" ./gradlew --gradle-user-home=. releaseDedicatedServer || return 1 } package() { @@ -46,10 +52,13 @@ package() { _progName='JSettlers' - _workingDir='~/.'${_pkgname} _mapCreatorName='MapCreator' _mapCreatorScript=${_pkgname}'-'${_mapCreatorName,,} - + + _serverJar='DedicatedJSettlersServer.jar' + _serverName='Server' + _serverScript=${_pkgname}'-'${_serverName,,} + # create destination-dirs mkdir -p ${_jarDest} ${_dataDest} ${_licenseDest} @@ -58,7 +67,8 @@ package() { unzip -j ${_progName}'.zip' ${_progName}'/'${_progName}'.jar' -d ${_jarDest} unzip -j ${_progName}'.zip' ${_progName}'/'${_mapCreatorName}'.jar' -d ${_jarDest} unzip -j ${_progName}'.zip' ${_progName}'/maps/*' -d ${_dataDest}'/maps' - + cp ${_serverJar} ${_jarDest} + # copy license cd ${srcdir} cp ${_pkgname}'/LICENSE.txt' ${_licenseDest} @@ -66,17 +76,25 @@ package() { # create launch-scripts mkdir -p ${bin} echo '#!/bin/sh' > ${bin}/${_pkgname} - echo 'cd '${_workingDir} >> ${bin}/${_pkgname} + echo 'mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_pkgname} + echo 'cd "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_pkgname} echo 'exec /usr/bin/java -jar /usr/share/java/'${_pkgname}'/'${_progName}'.jar --maps=/usr/share/'${_pkgname}'/maps "$@"' >> ${bin}/${_pkgname} chmod +x ${bin}/${_pkgname} echo '#!/bin/sh' > ${bin}/${_mapCreatorScript} - echo 'cd '${_workingDir} >> ${bin}/${_mapCreatorScript} + echo 'mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_mapCreatorScript} + echo 'cd "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_mapCreatorScript} echo 'exec /usr/bin/java -jar /usr/share/java/'${_pkgname}'/'${_mapCreatorName}'.jar --maps=/usr/share/'${_pkgname}'/maps "$@"' >> ${bin}/${_mapCreatorScript} chmod +x ${bin}/${_mapCreatorScript} + echo '#!/bin/sh' > ${bin}/${_serverScript} + echo 'mkdir -p "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_serverScript} + echo 'cd "${XDG_DATA_HOME:-$HOME/.local/share}/'${_pkgname}'"' >> ${bin}/${_serverScript} + echo 'exec /usr/bin/java -jar /usr/share/java/'${_pkgname}'/'${_serverJar}' "$@"' >> ${bin}/${_serverScript} + chmod +x ${bin}/${_serverScript} + install -Dm644 ../${_pkgname}.desktop "${pkgdir}/usr/share/applications/${_pkgname}.desktop" install -Dm644 ../${_mapCreatorScript}.desktop "${pkgdir}/usr/share/applications/${_mapCreatorScript}.desktop" - install -Dm644 ${srcdir}/jsettlers/jsettlers.mapcreator/src/main/resources/jsettlers/mapcreator/main/window/icon.png "${pkgdir}/usr/share/pixmaps/${_pkgname}.png" - install -Dm644 ${srcdir}/jsettlers/jsettlers.mapcreator/src/main/resources/jsettlers/mapcreator/main/window/icon.png "${pkgdir}/usr/share/pixmaps/${_mapCreatorScript}.png" + install -Dm644 ${srcdir}/jsettlers/jsettlers.main.swing/src/main/resources/jsettlers/main/swing/icon.png "${pkgdir}/usr/share/pixmaps/${_pkgname}.png" + install -Dm644 ${srcdir}/jsettlers/jsettlers.main.swing/src/main/resources/jsettlers/main/swing/icon.png "${pkgdir}/usr/share/pixmaps/${_mapCreatorScript}.png" } |