LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 19:23:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed autobuild system so it uses the correct architecture on Linux.

Browse Source
This commit is contained in:
rude
2009-08-31 21:10:56 +02:00
parent 0c946c00fe
commit 0264c9a6c8
5 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.in
+1 -1
View File
@@ -1,4 +1,4 @@
AC_INIT([love], [20090829-40a9af50de1f]) AC_INIT([love], [20090831-cb0095a0fc04])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AC_CONFIG_AUX_DIR([platform/unix]) AC_CONFIG_AUX_DIR([platform/unix])
AC_CONFIG_MACRO_DIR([platform/unix/m4]) AC_CONFIG_MACRO_DIR([platform/unix/m4])
platform/unix/autobuild
+9 -3
View File
@@ -65,9 +65,11 @@ else
buildrev=$2 buildrev=$2
fi fi
echo $buildrev
# Upload to the appropriate revision. # Upload to the appropriate revision.
hg pull hg pull
hg update $buildrev hg update -r $buildrev
# Set the displayversion. # Set the displayversion.
if [ -z $3 ]; then if [ -z $3 ]; then
@@ -86,6 +88,8 @@ else
displayversion=$3 displayversion=$3
fi fi
echo $displayversion
# Update version in configure. # Update version in configure.
# cat configure.in | sed "s/LOVE_VERSION/$displayversion/g" > configure.in # cat configure.in | sed "s/LOVE_VERSION/$displayversion/g" > configure.in
head -c 15 configure.in > configure.in.tmp head -c 15 configure.in > configure.in.tmp
@@ -109,12 +113,14 @@ mv "love-$displayversion.tar.gz" platform/unix/$tar
cd platform/unix cd platform/unix
sh make-package deb $displayversion sh make-package deb $displayversion
machine=`uname -m`
# Move and rename the deb. # Move and rename the deb.
deb="love-$displayversion-ubuntu-x86.deb" deb="love-$displayversion-ubuntu-$machine.deb"
mv "love-$displayversion.deb" $deb mv "love-$displayversion.deb" $deb
# Copy and rename the binary. # Copy and rename the binary.
binary="love-$displayversion-linux-x86" binary="love-$displayversion-linux-$machine"
cp ../../src/love $binary cp ../../src/love $binary
# Deal with uploading. # Deal with uploading.
platform/unix/debian
+1 -1
View File
@@ -2,7 +2,7 @@ Package: love
Version: %VERSION% Version: %VERSION%
Section: games Section: games
Priority: optional Priority: optional
Architecture: i386 Architecture: %ARCHITECTURE%
Essential: no Essential: no
Depends: libdevil1c2, libfreetype6, libgl1-mesa-glx, liblua5.1-0, libphysfs-1.0-0, libsdl1.2debian, libopenal1, libogg0, libvorbis0a, libvorbisfile3, libflac8, libflac++6, libmodplug0c2, libmpg123-0 Depends: libdevil1c2, libfreetype6, libgl1-mesa-glx, liblua5.1-0, libphysfs-1.0-0, libsdl1.2debian, libopenal1, libogg0, libvorbis0a, libvorbisfile3, libflac8, libflac++6, libmodplug0c2, libmpg123-0
Installed-Size: %INSTALLSIZE% Installed-Size: %INSTALLSIZE%
platform/unix/get-libs
+7
View File
@@ -0,0 +1,7 @@
#!/bin/sh
# Get required packages.
sudo apt-get -y install subversion build-essential automake autoconf libtool \
liblua5.1-dev libopenal-dev libsdl1.2-dev libfreetype6-dev \
libphysfs-dev libdevil-dev libtiff4-dev libmng-dev \
liblcms1-dev ftp-upload libmpg123-dev libmodplug-dev libpng12-dev \
libvorbis-dev libflac-dev libflac++-dev
platform/unix/make-package
+9 -1
View File
@@ -2,6 +2,13 @@
echo echo
echo "Packing LÖVE to go v1.2" echo "Packing LÖVE to go v1.2"
echo echo
arch="i386"
if [ -n "`uname -m | grep -c -G x86_64`" ]; then
arch="amd64"
fi
if [ -z "$2" ]; then if [ -z "$2" ]; then
echo "Syntax: ./make-package <package> <version>" echo "Syntax: ./make-package <package> <version>"
echo "Example: ./make-package deb 0.3.0-1" echo "Example: ./make-package deb 0.3.0-1"
@@ -14,7 +21,8 @@ case "$1" in
strip ../../src/love strip ../../src/love
mkdir deb mkdir deb
mkdir deb/DEBIAN mkdir deb/DEBIAN
sed "s/%VERSION%/$2/" < debian > deb/DEBIAN/tmp cat debian | sed "s/%VERSION%/$2/" | sed "s/%ARCHITECTURE%/$arch/g" > deb/DEBIAN/tmp
cat deb/DEBIAN/tmp
sed "s/%INSTALLSIZE%/`ls -l ../../src/love | awk '{ sum += $5 } END { printf "%.2f", sum / 1000 }'`/" < deb/DEBIAN/tmp > deb/DEBIAN/control sed "s/%INSTALLSIZE%/`ls -l ../../src/love | awk '{ sum += $5 } END { printf "%.2f", sum / 1000 }'`/" < deb/DEBIAN/tmp > deb/DEBIAN/control
rm deb/DEBIAN/tmp rm deb/DEBIAN/tmp
cp mimescript deb/DEBIAN/postinst cp mimescript deb/DEBIAN/postinst