Packaging and Makefile fixes.

This commit is contained in:
Matthew
2010-08-06 12:00:26 +12:00
parent 71792a8f09
commit 120a5fa66b
5 changed files with 13 additions and 11 deletions

View File

@@ -115,7 +115,7 @@ install: all
@echo "#!/bin/sh" > openra @echo "#!/bin/sh" > openra
@echo "cd "$(datadir)"/openra" >> openra @echo "cd "$(datadir)"/openra" >> openra
@echo "mono "$(datadir)"/openra/OpenRA.Game.exe" >> openra @echo "mono "$(datadir)"/openra/OpenRA.Game.exe SupportDir=.openra" >> openra
@$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR) @$(INSTALL_PROGRAM) -d $(BIN_INSTALL_DIR)
@$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR) @$(INSTALL_PROGRAM) -m +rx openra $(BIN_INSTALL_DIR)

View File

@@ -1,6 +1,6 @@
# Contributor: Matthew Bowra-Dean <matthew@ijw.co.nz> # Contributor: Matthew Bowra-Dean <matthew@ijw.co.nz>
pkgname=openra-git pkgname=openra-git
pkgver=20100511 pkgver=20100801.2
pkgrel=1 pkgrel=1
pkgdesc="Open Source rebuild of the Red Alert game engine using Mono/OpenGL." pkgdesc="Open Source rebuild of the Red Alert game engine using Mono/OpenGL."
arch=(any) arch=(any)
@@ -41,7 +41,8 @@ build() {
rm -rf "$srcdir/$_gitname-build" rm -rf "$srcdir/$_gitname-build"
git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build" git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
cd "$srcdir/$_gitname-build" cd "$srcdir/$_gitname-build"
git checkout $_gittag _fixedgittag=`echo $_gittag | sed "s/\\./-/g"`
git checkout $_fixedgittag
# #
# BUILD HERE # BUILD HERE

View File

@@ -8,11 +8,12 @@ then
exit $E_BADARGS exit $E_BADARGS
fi fi
sed -i "s/pkgver=[0-9]\+/pkgver=$5/" PKGBUILD PKGVERSION=`echo $5 | sed "s/-/\\./g"`
sed -i "s/pkgver=[0-9\\.]\+/pkgver=$PKGVERSION/" PKGBUILD
makepkg --holdver makepkg --holdver
PACKAGEFILE="openra-git-$5-1-any.pkg.tar.xz" PACKAGEFILE="openra-git-$PKGVERSION-1-any.pkg.tar.xz"
size=`stat -c "%s" $PACKAGEFILE` size=`stat -c "%s" $PACKAGEFILE`

View File

@@ -8,20 +8,21 @@ then
exit $E_BADARGS exit $E_BADARGS
fi fi
sed -i "s/%define version [0-9]\+/%define version $5/" openra.spec PKGVERSION=`echo $5 | sed "s/-/\\./g"`
sed -i "s/%define version [0-9\\.]\+/%define version $PKGVERSION/" openra.spec
cp openra.spec $6/SPECS/ cp openra.spec $6/SPECS/
cd $6 cd $6
wget http://github.com/chrisforbes/OpenRA/tarball/playtest-$5 -O SOURCES/openra-$5.tar.gz wget http://github.com/chrisforbes/OpenRA/tarball/playtest-$5 -O SOURCES/openra-$PKGVERSION.tar.gz
folder=`tar -ztf SOURCES/openra-$5.tar.gz | head -n 1 | grep -o -E [[:alnum:]-]+` folder=`tar -ztf SOURCES/openra-$PKGVERSION.tar.gz | head -n 1 | grep -o -E [[:alnum:]-]+`
sed -i "s/%define folder [[:alnum:]-]\+/%define folder $folder/" SPECS/openra.spec sed -i "s/%define folder [[:alnum:]-]\+/%define folder $folder/" SPECS/openra.spec
rpmbuild --target noarch -bb SPECS/openra.spec rpmbuild --target noarch -bb SPECS/openra.spec
cd RPMS/noarch/ cd RPMS/noarch/
PACKAGEFILE=openra-$5-1.noarch.rpm PACKAGEFILE=openra-$PKGVERSION-1.noarch.rpm
size=`stat -c "%s" $PACKAGEFILE` size=`stat -c "%s" $PACKAGEFILE`
echo "$5,$size,$PACKAGEFILE" > /tmp/rpmlatest.txt echo "$5,$size,$PACKAGEFILE" > /tmp/rpmlatest.txt

View File

@@ -1,5 +1,5 @@
%define name openra %define name openra
%define version 20100511 %define version 20100801.2
%define folder chrisforbes-openra-51b83e0 %define folder chrisforbes-openra-51b83e0
Name: %{name} Name: %{name}
Version: %{version} Version: %{version}
@@ -75,7 +75,6 @@ gacutil -i $RPM_BUILD_ROOT/usr/share/openra/thirdparty/Tao/Tao.Sdl.dll
/usr/share/openra/*.exe /usr/share/openra/*.exe
/usr/share/openra/*.ttf /usr/share/openra/*.ttf
/usr/share/openra/*.dll /usr/share/openra/*.dll
/usr/share/openra/*.ini
/usr/share/openra/shaders/ /usr/share/openra/shaders/
/usr/share/openra/mods/ /usr/share/openra/mods/
/usr/share/openra/thirdparty/ /usr/share/openra/thirdparty/