[Performous-commit] Tapio Vierros : Updates to ppa script.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: opengl2
Commit: a18d3356ee3211134f50007375306542e643443a

Author: Tapio Vierros <tap...@gm...>
Date:   Tue Dec 28 23:20:44 2010 +0200

Updates to ppa script.

* Use 0.6.1 package as base
* Get base package with wget instead of apt-get
* Remove old hacks needed with 0.5.1 base package version
* HACK: debian/patches deleted due to errors
  - Effect: probably no icon in launcher
* Fixed control.patch fuzzyness
* Colored status messages

---

 tools/ppa/control.patch |    2 +-
 tools/ppa/ppa.sh        |  108 +++++++++++++++++++++++++++--------------------
 2 files changed, 63 insertions(+), 47 deletions(-)

diff --git a/tools/ppa/control.patch b/tools/ppa/control.patch
index 643442a..1de35d8 100644
--- a/tools/ppa/control.patch
+++ b/tools/ppa/control.patch
@@ -1,6 +1,6 @@
 --- debian/control
 +++ debian/control
 @@ -7,2 +7,3 @@
-  cmake (>= 2.6), pkg-config, quilt, help2man,
+  cmake (>= 2.6), pkg-config, quilt, help2man, gettext,
 + libportmidi-dev, libcv-dev, libhighgui-dev,
   libgl1-mesa-dev, libsdl1.2-dev, libcairo2-dev, librsvg2-dev,
diff --git a/tools/ppa/ppa.sh b/tools/ppa/ppa.sh
index 8f49476..34a01ba 100755
--- a/tools/ppa/ppa.sh
+++ b/tools/ppa/ppa.sh
@@ -17,7 +17,10 @@ export DEBEMAIL="`gpg --list-keys | grep uid | sed 's/ *(.*)//; s/>.*//; s/.*[:<
 # Config
 PKG="performous"
 VERSIONCOMMON="0.6.1-99+git"`date '+%Y%m%d'`"~ppa1"
-SUITES="lucid maverick"
+BASEPKGVERSION="0.6.1" # base version of the base package
+BASEPKGADD="-1" # additional version suffix of the base package
+BASEURL="http://archive.ubuntu.com/ubuntu/pool/universe/p/performous"
+SUITES="lucid maverick natty"
 GITURL="git://git.performous.org/gitroot/performous/performous"
 DESTINATIONPPA="ppa:performous-team/ppa"
 
@@ -25,11 +28,18 @@ TEMPDIR=`mktemp -dt $PKG-ppa.XXXXXXXXXX`
 SOURCEDIR="$TEMPDIR/git"
 PPAPATCHDIR="`pwd`"
 
+	# Print a status message
+	status()
+	{
+		echo -e "\e[0;31m"$@"\e[0m"
+	}
+
 	# Copy the new files for source package
 	CopyNewFiles()
 	{
 		COPYCMD="cp -r"
 		$COPYCMD "$1/CMakeLists.txt" "$2"
+		$COPYCMD "$1/README.txt" "$2"
 		$COPYCMD "$1/cmake" "$2"
 		$COPYCMD "$1/data" "$2"
 		$COPYCMD "$1/docs" "$2"
@@ -37,69 +47,75 @@ PPAPATCHDIR="`pwd`"
 		$COPYCMD "$1/lang" "$2"
 		$COPYCMD "$1/themes" "$2"
 		$COPYCMD "$1/tools" "$2"
-		rm -rf "$2"/libs   # Old libs dir not used anymore
-		rm -rf "$2/editor" # Editor removed
 	}
 
 cd "$TEMPDIR"
+status "Tempdir: `pwd`"
 
 # Figure out the version of the "old" official package
-version=`apt-cache showsrc $PKG | sed -n 's/^Version: \(.*\)/\1/p' | head -n 1`
-echo "Working on $PKG $version"
+status "Working on $PKG ${BASEPKGVERSION}${BASEPKGADD}"
 
-mkdir -p $PKG-$version
-cd $PKG-$version
+mkdir -p $PKG-$BASEPKGVERSION
+cd $PKG-$BASEPKGVERSION
 
 # Download the "old" source package we use as a base
-apt-get --download-only source $PKG
+wget $BASEURL/${PKG}_${BASEPKGVERSION}${BASEPKGADD}.dsc
+wget $BASEURL/${PKG}_${BASEPKGVERSION}.orig.tar.bz2
+wget $BASEURL/${PKG}_${BASEPKGVERSION}${BASEPKGADD}.debian.tar.bz2
 
 # Download fresh version from git
-echo "Fetch from git..."
+status "Fetch from git..."
 git clone "$GITURL" "$SOURCEDIR"
 
 # Get some info from git for changelog
-pushd .
-cd "$SOURCEDIR"
-# 10 chars from the HEAD commit hash
-headcommit=`git log | head -n 1 | cut --delimiter=" " -f 2 | cut -c 1-10`
-popd
+(
+	cd "$SOURCEDIR"
+	# 10 chars from the HEAD commit hash
+	headcommit=`git log | head -n 1 | cut --delimiter=" " -f 2 | cut -c 1-10`
+)
 
 # Loop suites
+status "Do each suite..."
 for suite in $SUITES ; do
 	newversion="${VERSIONCOMMON}~${suite}"
 	rm -rf $suite; mkdir $suite
-	cd $suite
-	ln ../${PKG}_* .
-	dpkg-source -x ${PKG}_${version}.dsc extracted
-	cd extracted
-		# Copy new files
-		echo "Copy new files..."
-		CopyNewFiles "$SOURCEDIR" .
-		# Apply patches
-		echo "Apply some patches..."
-		cp "$PPAPATCHDIR/"*.patch .
-		patch -p0 < *.patch
-		rm *.patch
-
-		# Hack hack
-		echo "// Dummy" > game/screen_configuration.hh
-		echo "// Dummy" > game/screen_configuration.cc
-
-		# Do changelog
-		# Dch complains about unknown suites
-		yes '' | dch -b -v $newversion -D $suite "Upload development version from Git $headcommit to Ubuntu PPA for $suite."
-		if [ -f debian/source/format -a ! -f debian/patches/series ] ; then
-			rm debian/source/format
-		fi
-		# Build package
-		#dpkg-buildpackage -sa -S    # Full .orig.gz
-		dpkg-buildpackage -sd -S    # Only .diff.gz
-	cd ..
-	# Upload to PPA
-	dput $DESTINATIONPPA ${PKG}_${newversion}_source.changes
-	cd ..
+	(
+		cd $suite
+		status "Extracting source for $suite..."
+		ln ../${PKG}_* .
+		dpkg-source -x ${PKG}_${BASEPKGVERSION}${BASEPKGADD}.dsc extracted
+		(
+			cd extracted
+
+			# Copy new files
+			status "Copy new files..."
+			CopyNewFiles "$SOURCEDIR" .
+
+			# Apply patches
+			status "Apply some patches..."
+			cp "$PPAPATCHDIR/"*.patch .
+			for p in *.patch; do
+				patch -p0 < "$p"
+			done
+			rm *.patch
+
+			# Hack hack
+			#TODO: Get rid of these
+			status "Apply some hacks..."
+			rm -rf debian/patches # Delete troublesome patch
+
+			# Do changelog
+			# Dch complains about unknown suites
+			yes '' | dch -b -v $newversion -D $suite "Upload development version from Git $headcommit to Ubuntu PPA for $suite."
+
+			# Build package
+			#dpkg-buildpackage -sa -S    # Full .orig.gz
+			dpkg-buildpackage -sd -S    # Only .diff.gz
+		)
+		# Upload to PPA
+		dput $DESTINATIONPPA ${PKG}_${newversion}_source.changes
+	)
 done
-cd ..
 
-echo "Files were kept in $TEMPDIR"
+status "Files were kept in $TEMPDIR"