Menu
▾
▴
[Armagetronad-commits] SF.net SVN: armagetronad:[9823] armagetronad/trunk
|
From: <z-...@us...> - 2011-08-30 15:23:35
|
Revision: 9823
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9823&view=rev
Author: z-man
Date: 2011-08-30 15:23:28 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Merging branch 0.2.8 from revision 9799 to 9822:
------------------------------------------------------------------------
r9822 | bazaaarmagetron | 2011-08-30 17:18:39 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: Added 64 bit build of latest snapshot.
------------------------------------------------------------------------
r9821 | bazaaarmagetron | 2011-08-30 17:18:14 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: Adding 64 bit build of 0.2.8.3.1.
------------------------------------------------------------------------
r9820 | bazaaarmagetron | 2011-08-30 17:17:47 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: Minor arch corrections.
------------------------------------------------------------------------
r9819 | bazaaarmagetron | 2011-08-30 17:17:18 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: Also depend on armagetronad-libs, even though they're for trunk builds. Whatever works.
------------------------------------------------------------------------
r9818 | bazaaarmagetron | 2011-08-30 17:16:45 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: Don't set release notes and changelogs twice.
------------------------------------------------------------------------
r9813 | bazaaarmagetron | 2011-08-30 10:16:30 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: New builds don't go to armagetronad.xml directly, but to armagetronad-beta.xml.
------------------------------------------------------------------------
r9812 | bazaaarmagetron | 2011-08-30 10:16:04 +0200 (Tue, 30 Aug 2011) | 2 lines
Manuel Moos: Adding beta feed, release stability is now set in the groups.
------------------------------------------------------------------------
r9805 | bazaaarmagetron | 2011-08-30 00:16:38 +0200 (Tue, 30 Aug 2011) | 4 lines
author: Manuel Moos
Tagging releases in 0install with correct CPU architecture individually.
And actually, most past releases have been for i486, not i686.
------------------------------------------------------------------------
r9804 | bazaaarmagetron | 2011-08-29 19:37:58 +0200 (Mon, 29 Aug 2011) | 2 lines
Manuel Moos: Feeds! All versions are now available in the main armagetron feed.
------------------------------------------------------------------------
Revision Links:
--------------
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9799&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9822&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9821&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9820&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9819&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9818&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9813&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9812&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9805&view=rev
http://armagetronad.svn.sourceforge.net/armagetronad/?rev=9804&view=rev
Modified Paths:
--------------
armagetronad/trunk/build/0install/armagetronad-alpha.xml
armagetronad/trunk/build/0install/armagetronad.xml
armagetronad/trunk/build/0install/update
armagetronad/trunk/build/WorkMakefile
armagetronad/trunk/build/configure
armagetronad/trunk/build/scripts/lp-upload
Added Paths:
-----------
armagetronad/trunk/build/0install/armagetronad-beta.xml
armagetronad/trunk/build/Upload
Property Changed:
----------------
armagetronad/trunk/
Property changes on: armagetronad/trunk
___________________________________________________________________
Modified: svn:mergeinfo
- /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9799
/armagetronad/branches/0.2.8.3:9309-9740
+ /armagetronad/branches/0.2.8:8751-8852,8855-9185,9192-9201,9220-9514,9529-9822
/armagetronad/branches/0.2.8.3:9309-9740
Modified: armagetronad/trunk/build/0install/armagetronad-alpha.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-alpha.xml 2011-08-30 15:18:39 UTC (rev 9822)
+++ armagetronad/trunk/build/0install/armagetronad-alpha.xml 2011-08-30 15:23:28 UTC (rev 9823)
@@ -15,19 +15,21 @@
<homepage>http://armagetronad.net</homepage>
<category>Game</category>
<icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
- <group arch="Linux-i686">
- <requires interface="http://www.nongnu.org/clanbomber/zeroinstall/SDL_image.xml">
- <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ <group arch="*-*" stability="developer">
+ <requires interface="http://simamo.de/0install/armagetronad-experimental-libs.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <requires interface="http://www.nongnu.org/clanbomber/zeroinstall/libsdl1.2.xml">
- <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
- </requires>
- <implementation doc-dir="usr/local/share/doc/games/armagetronad-alpha/html" id="sha1new=cd1ec61f60d42fca93959b096724038135682fc0" license="OSI Approved :: GNU General Public License v2" main="usr/local/bin/armagetronad-alpha" released="2011-08-28" stability="developer" version="0.2.8-pre0.20110826">
+ <implementation arch="Linux-i486" doc-dir="usr/local/share/doc/games/armagetronad-alpha/html" id="sha1new=cd1ec61f60d42fca93959b096724038135682fc0" license="OSI Approved :: GNU General Public License v2" main="usr/local/bin/armagetronad-alpha" released="2011-08-28" version="0.2.8" version-modifier="-pre0.20110826">
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110826/+download/armagetronad-alpha-0.2.8_alpha20110826.bin.tar.bz2" size="2113594" type="application/x-bzip-compressed-tar"/>
</implementation>
- <implementation id="sha1new=ae76c42323a6d6a85ea9f3c1550f8c8be06d90ae" main="usr/local/bin/armagetronad-alpha" released="2011-08-29" stability="stable" version="0.2.8-pre0.20110829">
+ <implementation arch="Linux-i486" id="sha1new=ae76c42323a6d6a85ea9f3c1550f8c8be06d90ae" main="usr/local/bin/armagetronad-alpha" released="2011-08-29" version="0.2.8" version-modifier="-pre0.20110829">
<manifest-digest sha256="8724749ad55f630dd8e3e07a8b93b7e6ffbb083e9c0e8ed71ad56eff573f49d7"/>
<archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110829/+download/armagetronad-alpha-0.2.8_alpha20110829.i486-generic-linux-gnu.bin.tar.bz2" size="2122026"/>
</implementation>
+ <implementation arch="Linux-x86_64" id="sha1new=50c2a5b0c193f0c7f688fe7414b270456273e804" main="usr/local/bin/armagetronad-alpha" released="2011-08-30" version="0.2.8-pre0.20110829">
+ <manifest-digest sha256="a899a8a51b3674dd624754d9cc6dd311e154ca54012c03b32aa32d2d611b6e58"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8-snapshots/0.2.8-alpha20110829/+download/armagetronad-alpha-0.2.8_alpha20110829.x86_64-generic-linux-gnu.bin.tar.bz2" size="1746404"/>
+ </implementation>
</group>
</interface>
Copied: armagetronad/trunk/build/0install/armagetronad-beta.xml (from rev 9822, armagetronad/branches/0.2.8/build/0install/armagetronad-beta.xml)
===================================================================
--- armagetronad/trunk/build/0install/armagetronad-beta.xml (rev 0)
+++ armagetronad/trunk/build/0install/armagetronad-beta.xml 2011-08-30 15:23:28 UTC (rev 9823)
@@ -0,0 +1,31 @@
+<?xml version="1.0" ?>
+<?xml-stylesheet type='text/xsl' href='interface.xsl'?>
+<interface uri="http://simamo.de/0install/armagetronad-beta.xml" xmlns="http://zero-install.sourceforge.net/2004/injector/interface">
+ <name>Armagetron Beta</name>
+ <summary>Tron clone in 3D, Beta builds</summary>
+ <description>
+Dumping cores since 2000.
+
+Armagetron Advanced is a lightcylce game with multiplayer focus.
+
+You ride a lightcycle, which leaves a trail of pure energy behind it. Crashing
+into your own trail or that of another player is quite fatal. Battle with others
+for simple kills, for survival, or for territorial dominance in the Sumo and
+Fortress modes.</description>
+ <homepage>http://armagetronad.net</homepage>
+ <category>Game</category>
+ <icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
+ <group arch="*-*" stability="testing">
+ <requires interface="http://simamo.de/0install/armagetronad-experimental-libs.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ </requires>
+ <implementation arch="Linux-i486" id="sha1new=5415f5221f69fe67cc9dc6ca1e027c90b3043199" main="usr/local/bin/armagetronad" released="2011-08-29" version="0.2.8.3.2-rc1">
+ <manifest-digest sha256="5cf75112ac590676fec6e3b40a5e3fbbcf7030b924191238bcb485a2b98d0e9b"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2-rc1/+download/armagetronad-0.2.8.3.2_rc1.i486-generic-linux-gnu.bin.tar.bz2" size="2101995"/>
+</implementation>
+ <implementation arch="Linux-x86_64" id="sha1new=8f931f262396e3faeadea97445c62164a61e3019" main="usr/local/bin/armagetronad" released="2011-08-30" version="0.2.8.3.2-rc1">
+ <manifest-digest sha256="0be3013b8a2b1d354c91fdd35ce5863b4991f8adc3abf9affc06c943a7b50979"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2-rc1/+download/armagetronad-0.2.8.3.2_rc1.x86_64-generic-linux-gnu.bin.tar.bz2" size="1720937"/>
+ </implementation>
+ </group></interface>
Modified: armagetronad/trunk/build/0install/armagetronad.xml
===================================================================
--- armagetronad/trunk/build/0install/armagetronad.xml 2011-08-30 15:18:39 UTC (rev 9822)
+++ armagetronad/trunk/build/0install/armagetronad.xml 2011-08-30 15:23:28 UTC (rev 9823)
@@ -15,18 +15,19 @@
<homepage>http://armagetronad.net</homepage>
<category>Game</category>
<icon href="http://simamo.de/0install/armagetronad.png" type="image/png"/>
- <group arch="Linux-i686">
- <requires interface="http://www.nongnu.org/clanbomber/zeroinstall/SDL_image.xml">
- <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
+ <feed src="http://simamo.de/0install/armagetronad-experimental.xml"/>
+ <feed src="http://simamo.de/0install/armagetronad-alpha.xml"/>
+ <feed src="http://simamo.de/0install/armagetronad-beta.xml"/>
+ <group arch="*-*" stability="stable">
+ <requires interface="http://simamo.de/0install/armagetronad-experimental-libs.xml">
+ <version before="0.3-pre0.1571" not-before="0.3-pre0.1570"/>
+ <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
</requires>
- <requires interface="http://www.nongnu.org/clanbomber/zeroinstall/libsdl1.2.xml">
- <environment insert="lib" mode="prepend" name="LD_LIBRARY_PATH"/>
- </requires>
- <implementation id="sha1new=5415f5221f69fe67cc9dc6ca1e027c90b3043199" main="usr/local/bin/armagetronad" released="2011-08-29" stability="testing" version="0.2.8.3.2-rc1">
- <manifest-digest sha256="5cf75112ac590676fec6e3b40a5e3fbbcf7030b924191238bcb485a2b98d0e9b"/>
- <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.2-rc1/+download/armagetronad-0.2.8.3.2_rc1.i486-generic-linux-gnu.bin.tar.bz2" size="2101995"/>
-</implementation>
- <implementation id="sha1new=dc048fe3943a02054e119d94e4b03ee5c9413bd5" main="usr/local/bin/armagetronad" released="2011-08-29" stability="stable" version="0.2.8.3.1">
+ <implementation arch="Linux-x86_64" id="sha1new=254146b51108ba0dc1b2fc2c03db1b6ac9567750" main="usr/local/bin/armagetronad" released="2011-08-30" version="0.2.8.3.1">
+ <manifest-digest sha256="8cd909f092ac4e8cea318c3c22873cda45f312b2c5798d5482da7b008b463bd8"/>
+ <archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-0.2.8.3.1.x86_64-generic-linux-gnu.bin.tar.bz2" size="1721935"/>
+ </implementation>
+ <implementation arch="Linux-i486" id="sha1new=dc048fe3943a02054e119d94e4b03ee5c9413bd5" main="usr/local/bin/armagetronad" released="2011-08-29" version="0.2.8.3.1">
<manifest-digest sha256="967443a495e4dd5814195368c653bd8c663732ebe0a3d24ae51eed816eb65ee7"/>
<archive href="http://launchpad.net/armagetronad/0.2.8/0.2.8.3.1/+download/armagetronad-0.2.8.3.1.i486-generic-linux-gnu.bin.tar.bz2" size="2101110"/>
</implementation>
Modified: armagetronad/trunk/build/0install/update
===================================================================
--- armagetronad/trunk/build/0install/update 2011-08-30 15:18:39 UTC (rev 9822)
+++ armagetronad/trunk/build/0install/update 2011-08-30 15:23:28 UTC (rev 9823)
@@ -6,6 +6,7 @@
# VERSION
# FILE
# PACKAGE
+# OSTAG_GENERIC
set -x
@@ -19,18 +20,13 @@
# determine xml to modify
XML=
-test ${SERIES} == 0.2.8 && XML=0install/armagetronad.xml
+test ${SERIES} == 0.2.8 && XML=0install/armagetronad-beta.xml
test ${SERIES} == 0.2.8-snapshots && XML=0install/armagetronad-alpha.xml
test ${SERIES} == trunk-snapshots && XML=0install/armagetronad-experimental.xml
test -z ${XML} && { echo "Unknown series: ${SERIES}"; exit 1; }
-EXTRAARG=
-# snapshots are always marked stable right away, the user opted in to get them already
-if echo ${SERIES} | grep snapshots; then
- EXTRAARG=--set-stability=stable
-else
- EXTRAARG=--set-stability=testing
-fi
+OS=Linux
+CPU=$(echo ${OSTAG_GENERIC} | sed -e "s,-.*,,")
# add the release
0launch -c 'http://0install.net/2006/interfaces/0publish' \
@@ -40,4 +36,4 @@
--archive-file=${FILE} \
--set-released=today \
--set-main=usr/local/bin/${PACKAGE} \
- ${EXTRAARG}
+ --set-arch=${OS}-${CPU} \
Copied: armagetronad/trunk/build/Upload (from rev 9822, armagetronad/branches/0.2.8/build/Upload)
===================================================================
--- armagetronad/trunk/build/Upload (rev 0)
+++ armagetronad/trunk/build/Upload 2011-08-30 15:23:28 UTC (rev 9823)
@@ -0,0 +1 @@
+link builds/b_0.2.8_alpha20110829/B1/Upload
\ No newline at end of file
Modified: armagetronad/trunk/build/WorkMakefile
===================================================================
--- armagetronad/trunk/build/WorkMakefile 2011-08-30 15:18:39 UTC (rev 9822)
+++ armagetronad/trunk/build/WorkMakefile 2011-08-30 15:23:28 UTC (rev 9823)
@@ -534,7 +534,7 @@
# * update zeroinstall stream
# *****************************************
#
- PACKAGE=${PACKAGE} SERIES=${SERIES} FILE=${BINARY_TARBALL} VERSION=${VERSION} 0install/update
+ OSTAG_GENERIC=${OSTAG_GENERIC} PACKAGE=${PACKAGE} SERIES=${SERIES} FILE=${BINARY_TARBALL} VERSION=${VERSION} 0install/update
touch $@
APFILE=$(RCDIR)/.package
Modified: armagetronad/trunk/build/configure
===================================================================
--- armagetronad/trunk/build/configure 2011-08-30 15:18:39 UTC (rev 9822)
+++ armagetronad/trunk/build/configure 2011-08-30 15:23:28 UTC (rev 9823)
@@ -231,6 +231,12 @@
#OSTAG=i386-pc-solaris2.9
#OSTAG=i586-mandrake-linux-gnu
+# ubuntu 10.4, gcc 4.1
+#OSTAG=i486-linux-gnu
+#OSTAG=i486-linux-gnu
+# gcc 4.6, self compiled
+#OSTAG=i686-pc-linux-gnu
+
# OpenBSD: semi-well formed
#OSTAG=i386-unknown-openbsd3.4
Modified: armagetronad/trunk/build/scripts/lp-upload
===================================================================
--- armagetronad/trunk/build/scripts/lp-upload 2011-08-30 15:18:39 UTC (rev 9822)
+++ armagetronad/trunk/build/scripts/lp-upload 2011-08-30 15:23:28 UTC (rev 9823)
@@ -197,22 +197,22 @@
print "Creating release %s..." % version
release = create_release(proj, series, version)
- print "Setting changelog..."
changelog = "ChangeLog"
if os.path.exists(changelog):
release.changelog = open(changelog, 'r').read().strip()
else:
changelog = edit_file('changelog', 'changelog')
- if changelog:
+ if changelog and ( not release.changelog or len(release.changelog) == 0):
+ print "Setting changelog..."
release.changelog = changelog
- print "Setting release notes..."
release_notes = "releasenotes.txt"
if os.path.exists(release_notes):
release.release_notes = open(release_notes, 'r').read().strip()
else:
release_notes = edit_file('releasenotes', 'release notes')
- if release_notes:
+ if release_notes and ( not release.release_notes or len(release.release_notes) == 0):
+ print "Setting release notes..."
release.release_notes = release_notes
# create new summary
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
![http://simamo.de/0install/armagetronad.png"](http://simamo.de/0install/armagetronad.png"){kind=link}