From 23d4a03acae53126cd46c0498ed42b4eb09e2b37 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Thu, 24 Mar 2011 23:54:28 +0000 Subject: [PATCH 1/3] * Prepare version 0.0.2. --- CMakeLists.txt | 2 +- admin/win/nsi/RELEASE_NOTES.txt | 2 +- admin/win/nsi/revision.txt | 2 +- admin/win/nsi/tomahawk.nsi | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6552d24e2..d00a02eec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,7 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 ) SET( ORGANIZATION_NAME "Tomahawk" ) SET( ORGANIZATION_DOMAIN "tomahawk-player.org" ) SET( APPLICATION_NAME "Tomahawk" ) -SET( VERSION "0.0.1" ) +SET( VERSION "0.0.2" ) # set paths diff --git a/admin/win/nsi/RELEASE_NOTES.txt b/admin/win/nsi/RELEASE_NOTES.txt index fd3e8f620..adbeaae55 100755 --- a/admin/win/nsi/RELEASE_NOTES.txt +++ b/admin/win/nsi/RELEASE_NOTES.txt @@ -1 +1 @@ -TO DO \ No newline at end of file +See http://github.com/tomahawk-player/tomahawk/blob/stable/ChangeLog diff --git a/admin/win/nsi/revision.txt b/admin/win/nsi/revision.txt index bd753ccc4..90be1cdd8 100644 --- a/admin/win/nsi/revision.txt +++ b/admin/win/nsi/revision.txt @@ -1 +1 @@ -94 \ No newline at end of file +95 \ No newline at end of file diff --git a/admin/win/nsi/tomahawk.nsi b/admin/win/nsi/tomahawk.nsi index d2681ef8d..4bdb57fa4 100755 --- a/admin/win/nsi/tomahawk.nsi +++ b/admin/win/nsi/tomahawk.nsi @@ -35,7 +35,7 @@ !define VER_MAJOR "0" !define VER_MINOR "0" -!define VER_BUILD "1" +!define VER_BUILD "2" !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}" From 32ed0c748b754070da5ecec7aa54ec40bc9bd025 Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Fri, 25 Mar 2011 00:08:28 +0000 Subject: [PATCH 2/3] * Updated sparkle templates. --- admin/mac/sparkle-beta.rss | 12 ++++++------ admin/mac/sparkle.rss | 8 ++++---- admin/win/nsi/revision.txt | 2 +- admin/win/sparklewin-beta.rss | 10 +++++----- admin/win/sparklewin.rss | 6 +++--- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/admin/mac/sparkle-beta.rss b/admin/mac/sparkle-beta.rss index 0a38d7ee5..e49379f98 100755 --- a/admin/mac/sparkle-beta.rss +++ b/admin/mac/sparkle-beta.rss @@ -2,16 +2,16 @@ Tomahawk Player Changelog - http://download.tomahawk-player.org/sparkle - Most recent changes with links to updates. + http://www.gettomahawk.com + Tomahawk Player Beta en - Version 0.0.1 (Tomahawk Player - It Lives!) + Version 0.0.1 (Tomahawk Player Beta - It Lives?) - https://github.com/tomahawk-player/tomahawk/raw/master/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog - Fri, 04 Mar 2011 16:05:15 -0500 - + Fri, 25 Mar 2011 00:00:01 +0100 + diff --git a/admin/mac/sparkle.rss b/admin/mac/sparkle.rss index 391b34a02..9fa00ed8e 100755 --- a/admin/mac/sparkle.rss +++ b/admin/mac/sparkle.rss @@ -2,15 +2,15 @@ Tomahawk Player Changelog - http://download.tomahawk-player.org/sparkle - Most recent changes with links to updates. + http://www.gettomahawk.com + Tomahawk Player en Version 0.0.1 (Tomahawk Player - It Lives!) - https://github.com/tomahawk-player/tomahawk/raw/master/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog - Fri, 04 Mar 2011 16:05:15 -0500 + Fri, 25 Mar 2011 00:00:01 +0100 diff --git a/admin/win/nsi/revision.txt b/admin/win/nsi/revision.txt index 90be1cdd8..56749c830 100644 --- a/admin/win/nsi/revision.txt +++ b/admin/win/nsi/revision.txt @@ -1 +1 @@ -95 \ No newline at end of file +96 \ No newline at end of file diff --git a/admin/win/sparklewin-beta.rss b/admin/win/sparklewin-beta.rss index 9d1f276cc..14d33d797 100644 --- a/admin/win/sparklewin-beta.rss +++ b/admin/win/sparklewin-beta.rss @@ -3,15 +3,15 @@ Tomahawk Player http://www.gettomahawk.com - Tomahawk Player + Tomahawk Player Beta en - Version 0.0.1 (Tomahawk Player - It Lives!) + Version 0.0.1 (Tomahawk Player Beta - It Lives?) - https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog - Fri, 04 Mar 2011 16:05:15 -0500 - + Fri, 25 Mar 2011 00:00:01 +0100 + diff --git a/admin/win/sparklewin.rss b/admin/win/sparklewin.rss index cec8b11c6..aa9f8f4fa 100644 --- a/admin/win/sparklewin.rss +++ b/admin/win/sparklewin.rss @@ -8,10 +8,10 @@ Version 0.0.1 (Tomahawk Player - It Lives!) - https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog + https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog - Fri, 04 Mar 2011 16:05:15 -0500 - + Fri, 25 Mar 2011 00:00:01 +0100 + From 6c49b2683e6254db487a3995bb84c0f51c78889d Mon Sep 17 00:00:00 2001 From: Christian Muehlhaeuser Date: Mon, 28 Mar 2011 05:27:55 +0200 Subject: [PATCH 3/3] * Changed win32-sparkle behaviour: It'll now look for beta versions if you run Tomahawk with --debug. --- src/tomahawkwindow.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index cc6ea8584..868f1609b 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -152,11 +152,12 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); #elif defined( WIN32 ) QUrl updaterUrl; - #ifdef DEBUG_BUILD + + if ( qApp->arguments().contains( "--debug" ) ) updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin-debug" ); - #else + else updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin" ); - #endif + qtsparkle::Updater* updater = new qtsparkle::Updater( updaterUrl, this ); updater->SetNetworkAccessManager( TomahawkUtils::nam() ); updater->SetVersion( VERSION );