mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 22:26:32 +02:00
Code Issues Releases Wiki Activity

Merge branch 'stable' of github.com:tomahawk-player/tomahawk

Browse Source
This commit is contained in:
Christian Muehlhaeuser
2011-03-28 05:58:26 +02:00
parent b9d218b823 6c49b2683e
commit 7b714f1735
9 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
SET( ORGANIZATION_NAME "Tomahawk" ) SET( ORGANIZATION_NAME "Tomahawk" )
SET( ORGANIZATION_DOMAIN "tomahawk-player.org" ) SET( ORGANIZATION_DOMAIN "tomahawk-player.org" )
SET( APPLICATION_NAME "Tomahawk" ) SET( APPLICATION_NAME "Tomahawk" )
SET( VERSION "0.0.1" ) SET( VERSION "0.0.2" )
# set paths # set paths

12
admin/mac/sparkle-beta.rss
View File

@@ -2,16 +2,16 @@
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel> <channel>
<title>Tomahawk Player Changelog</title> <title>Tomahawk Player Changelog</title>
<link>http://download.tomahawk-player.org/sparkle</link> <link>http://www.gettomahawk.com</link>
<description>Most recent changes with links to updates.</description> <description>Tomahawk Player Beta</description>
<language>en</language> <language>en</language>
<item> <item>
<title>Version 0.0.1 (Tomahawk Player - It Lives!)</title> <title>Version 0.0.1 (Tomahawk Player Beta - It Lives?)</title>
<sparkle:releaseNotesLink> <sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/master/ChangeLog https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
</sparkle:releaseNotesLink> </sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate> <pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparkle-debug/updates/tomahawk-beta-0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" /> <enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-beta-0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
</item> </item>
</channel> </channel>
</rss> </rss>

8
admin/mac/sparkle.rss
View File

@@ -2,15 +2,15 @@
<rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/"> <rss version="2.0" xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" xmlns:dc="http://purl.org/dc/elements/1.1/">
<channel> <channel>
<title>Tomahawk Player Changelog</title> <title>Tomahawk Player Changelog</title>
<link>http://download.tomahawk-player.org/sparkle</link> <link>http://www.gettomahawk.com</link>
<description>Most recent changes with links to updates.</description> <description>Tomahawk Player</description>
<language>en</language> <language>en</language>
<item> <item>
<title>Version 0.0.1 (Tomahawk Player - It Lives!)</title> <title>Version 0.0.1 (Tomahawk Player - It Lives!)</title>
<sparkle:releaseNotesLink> <sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/master/ChangeLog https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog
</sparkle:releaseNotesLink> </sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate> <pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" /> <enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.1.tar.bz2" sparkle:version="0.0.1" length="10627176" type="application/octet-stream" sparkle:dsaSignature="MC0CFAyYNZq58X7hPC7Qn+DtotVgym7pAhUA5hkLGllYxjOwwCf7i2LxUsvGyps=" />
</item> </item>
</channel> </channel>

2
admin/win/nsi/RELEASE_NOTES.txt
View File

@@ -1 +1 @@
TO DO See http://github.com/tomahawk-player/tomahawk/blob/stable/ChangeLog

2
admin/win/nsi/revision.txt
View File

@@ -1 +1 @@
94 96

2
admin/win/nsi/tomahawk.nsi
View File

@@ -35,7 +35,7 @@
!define VER_MAJOR "0" !define VER_MAJOR "0"
!define VER_MINOR "0" !define VER_MINOR "0"
!define VER_BUILD "1" !define VER_BUILD "2"
!define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}" !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"

10
admin/win/sparklewin-beta.rss
View File

@@ -3,15 +3,15 @@
<channel> <channel>
<title>Tomahawk Player</title> <title>Tomahawk Player</title>
<link>http://www.gettomahawk.com</link> <link>http://www.gettomahawk.com</link>
<description>Tomahawk Player</description> <description>Tomahawk Player Beta</description>
<language>en</language> <language>en</language>
<item> <item>
<title>Version 0.0.1 (Tomahawk Player - It Lives!)</title> <title>Version 0.0.1 (Tomahawk Player Beta - It Lives?)</title>
<sparkle:releaseNotesLink> <sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
</sparkle:releaseNotesLink> </sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate> <pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" /> <enclosure url="http://download.tomahawk-player.org/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" />
</item> </item>
</channel> </channel>
</rss> </rss>

6
admin/win/sparklewin.rss
View File

@@ -8,10 +8,10 @@
<item> <item>
<title>Version 0.0.1 (Tomahawk Player - It Lives!)</title> <title>Version 0.0.1 (Tomahawk Player - It Lives!)</title>
<sparkle:releaseNotesLink> <sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog
</sparkle:releaseNotesLink> </sparkle:releaseNotesLink>
<pubDate>Fri, 04 Mar 2011 16:05:15 -0500</pubDate> <pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparklewin/updates/tomahawk-0.0.1.exe" sparkle:version="0.0.1" /> <enclosure url="http://download.tomahawk-player.org/tomahawk-0.0.1.exe" sparkle:version="0.0.1" />
</item> </item>
</channel> </channel>
</rss> </rss>

7
src/tomahawkwindow.cpp
View File

@@ -152,11 +152,12 @@ TomahawkWindow::TomahawkWindow( QWidget* parent )
connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) );
#elif defined( WIN32 ) #elif defined( WIN32 )
QUrl updaterUrl; QUrl updaterUrl;
#ifdef DEBUG_BUILD
if ( qApp->arguments().contains( "--debug" ) )
updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin-debug" ); updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin-debug" );
#else else
updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin" ); updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin" );
#endif
qtsparkle::Updater* updater = new qtsparkle::Updater( updaterUrl, this ); qtsparkle::Updater* updater = new qtsparkle::Updater( updaterUrl, this );
updater->SetNetworkAccessManager( TomahawkUtils::nam() ); updater->SetNetworkAccessManager( TomahawkUtils::nam() );
updater->SetVersion( VERSION ); updater->SetVersion( VERSION );