diff --git a/configure.in b/configure.in index b053e07d7..6c06dc6f8 100644 --- a/configure.in +++ b/configure.in @@ -1,9 +1,9 @@ -AC_INIT([love], [r718]) +AC_INIT([love], [20090829-40a9af50de1f]) AC_CONFIG_HEADERS([config.h]) AC_CONFIG_AUX_DIR([platform/unix]) AC_CONFIG_MACRO_DIR([platform/unix/m4]) AC_CONFIG_SRCDIR([src/love.cpp]) -AM_INIT_AUTOMAKE([-Wall foreign]) +AM_INIT_AUTOMAKE([foreign -Wall foreign tar-ustar]) AC_PREFIX_DEFAULT([/usr]) AC_PROG_LIBTOOL AC_PROG_CC diff --git a/platform/unix/autobuild b/platform/unix/autobuild old mode 100644 new mode 100755 index 59085b60e..c5355197c --- a/platform/unix/autobuild +++ b/platform/unix/autobuild @@ -23,8 +23,8 @@ # # revision: # -# The SVN revision that should be built. Should be a valid revision -# number or HEAD. If not specified, it defaults to HEAD. +# The revision that should be built. Should be a valid revision +# number or tip. If not specified, it defaults to tip. # # version: # @@ -37,11 +37,11 @@ # (Builds HEAD, but does not upload) # # autobuild build -# (Builds HEAD and uploads to tehlol server with the current svn rev. as +# (Builds tip and uploads to tehlol server with the current rev. as # version number) # -# autobuild build HEAD 1.0 -# (Builds HEAD and uploads it using the version 1.0) +# autobuild build tip 1.0 +# (Builds tip and uploads it using the version 1.0) # # # Passwords for servers must be in these external files: @@ -53,31 +53,33 @@ cd ../.. # Get required packages. -sudo apt-get -y install subversion build-essential liblua5.1-dev \ -libopenal-dev libsdl1.2-dev libsdl-sound1.2-dev libfreetype6-dev \ -libphysfs-dev libdevil-dev libtiff4-dev libalut-dev libmng-dev \ -liblcms1-dev ftp-upload libmpg123-dev libmodplug-dev libpng12-dev +#sudo apt-get -y install subversion build-essential 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 # Check which revision to build. if [ -z $2 ]; then - buildrev="HEAD" + buildrev="tip" else buildrev=$2 fi # Upload to the appropriate revision. -svn up -r $buildrev +hg pull +hg update $buildrev # Set the displayversion. if [ -z $3 ]; then - if [ "$buildrev" == "HEAD" ]; then + if [ "$buildrev" == "tip" ]; then # Get the current SVN version, use sed to remove any non-numbers. - currentsvnversion=`svnversion | sed 's/[a-zA-Z: ]//g'` - displayversion="r$currentsvnversion" + currentversion=`hg log -l1 | grep changeset | sed 's/.*://g'` + currentdate=`date +%Y%m%d` + displayversion="$currentdate-$currentversion" else # The revision is already specified, so we'll use that as the # display version. - displayversion="r$buildrev" + displayversion="$buildrev" fi else # If the param is present, it overrides everything else. @@ -112,7 +114,7 @@ deb="love-$displayversion-ubuntu-x86.deb" mv "love-$displayversion.deb" $deb # Copy and rename the binary. -binary="love-$displayversion" +binary="love-$displayversion-linux-x86" cp ../../src/love $binary # Deal with uploading. diff --git a/platform/unix/debian b/platform/unix/debian index c969bb127..21bf8c539 100644 --- a/platform/unix/debian +++ b/platform/unix/debian @@ -4,7 +4,7 @@ Section: games Priority: optional Architecture: i386 Essential: no -Depends: libdevil1c2, libfreetype6, libgl1-mesa-glx, liblua5.1-0, libphysfs-1.0-0, libsdl1.2debian, libsdl-sound1.2, libopenal1, libalut0 +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% Maintainer: Tommy Nguyen [tn0502@hotmail.com] Provides: love diff --git a/platform/unix/make-package b/platform/unix/make-package old mode 100644 new mode 100755 index 1b62e8c1b..39061e94f --- a/platform/unix/make-package +++ b/platform/unix/make-package @@ -26,11 +26,11 @@ case "$1" in ;; src ) cd ../../../ - tar -czf love/platform/unix/love-$2-src.tar.gz --exclude=.svn love/demos/* love/*.txt love/makefile-ancient love/src/ && \ + tar -czf love/platform/unix/love-$2-src.tar.gz --exclude=*.o --exclude=.* love/demos/* love/*.txt love/src/ && \ echo " * love-$2-src.tar.gz created" - tar -cjf love/platform/unix/love-$2-src.tar.bz2 --exclude=.svn love/demos/* love/*.txt love/makefile-ancient love/src/ && \ + tar -cjf love/platform/unix/love-$2-src.tar.bz2 --exclude=*.o --exclude=.* love/demos/* love/*.txt love/src/ && \ echo " * love-$2-src.tar.bz2 created" - zip -9q love/platform/unix/love-$2-src.zip love/*.txt love/demos/* love/makefile-ancient `find love/src/* | grep -viE svn` && \ + zip -9q love/platform/unix/love-$2-src.zip love/*.txt love/demos/* `find love/src/* | grep -viE *.o` && \ echo " * love-$2-src.zip created" ;; * )