From 8b8090d35579b0291a052abaf582ee29afd2c727 Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Tue, 8 Mar 2011 21:56:30 -0500 Subject: [PATCH] enable winsparkle-debug and winsparkle updates based on debug or release mode --- admin/mac/sparkle-beta.rss | 17 +++++++++++++++++ admin/win/sparklewin-beta.rss | 17 +++++++++++++++++ src/CMakeLists.txt | 4 ++++ src/config.h.in | 1 + src/tomahawkwindow.cpp | 28 +++++++++++++++++----------- 5 files changed, 56 insertions(+), 11 deletions(-) create mode 100755 admin/mac/sparkle-beta.rss create mode 100644 admin/win/sparklewin-beta.rss diff --git a/admin/mac/sparkle-beta.rss b/admin/mac/sparkle-beta.rss new file mode 100755 index 000000000..7022539c7 --- /dev/null +++ b/admin/mac/sparkle-beta.rss @@ -0,0 +1,17 @@ + + + + Tomahawk Player Changelog + http://download.tomahawk-player.org/sparkle + Most recent changes with links to updates. + en + + Version 0.0.1 (Tomahawk Player - It Lives!) + + + + Fri, 04 Mar 2011 16:05:15 -0500 + + + + diff --git a/admin/win/sparklewin-beta.rss b/admin/win/sparklewin-beta.rss new file mode 100644 index 000000000..7f2f405e1 --- /dev/null +++ b/admin/win/sparklewin-beta.rss @@ -0,0 +1,17 @@ + + + + Tomahawk Player + http://www.gettomahawk.com + Tomahawk Player + en + + Version 0.0.1 (Tomahawk Player - It Lives!) + + https://github.com/tomahawk-player/tomahawk/blob/master/ChangeLog + + Fri, 04 Mar 2011 16:05:15 -0500 + + + + diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aabb01aa9..afa26e89b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -17,6 +17,10 @@ SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" ) SET( TOMAHAWK_INC_DIR "${CMAKE_SOURCE_DIR}/include/" ) +IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" ) + MESSAGE( "Building in debug mode, enabling all debug updates" ) + SET( DEBUG_BUILD ON ) +ENDIF() # build plugins # use glob, but hardcoded list for now: diff --git a/src/config.h.in b/src/config.h.in index 59e6bc80e..f8246a54d 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -6,6 +6,7 @@ #cmakedefine APPLICATION_NAME "${APPLICATION_NAME}" #cmakedefine VERSION "${VERSION}" +#cmakedefine DEBUG_BUILD #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" diff --git a/src/tomahawkwindow.cpp b/src/tomahawkwindow.cpp index 04e64e8d4..1265b01e7 100644 --- a/src/tomahawkwindow.cpp +++ b/src/tomahawkwindow.cpp @@ -127,19 +127,25 @@ TomahawkWindow::TomahawkWindow( QWidget* parent ) toolbar->setIconSize( QSize( 32, 32 ) ); toolbar->setToolButtonStyle( Qt::ToolButtonFollowStyle ); toolbar->installEventFilter( new WidgetDragFilter( toolbar ) ); - + #if defined( Q_OS_DARWIN ) && defined( HAVE_SPARKLE ) - QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") ); - checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole ); - connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); + QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") ); + checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole ); + connect(checkForUpdates, SIGNAL( triggered( bool ) ), SLOT( checkForUpdates() ) ); #elif defined( WIN32 ) - qtsparkle::Updater* updater = new qtsparkle::Updater( QUrl( "http://download.tomahawk-player.org/sparklewin" ), this ); - updater->SetNetworkAccessManager( TomahawkUtils::nam() ); - updater->SetVersion( VERSION ); - - QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") ); - checkForUpdates->setMenuRole( QAction::ApplicationSpecificRole ); - connect( checkForUpdates, SIGNAL( triggered() ), updater, SLOT( CheckNow() ) ); + QUrl updaterUrl; + #ifdef DEBUG_BUILD + updaterUrl.setUrl( "http://download.tomahawk-player.org/sparklewin-debug" ); + #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 ); + + ui->menu_Help->addSeparator(); + QAction* checkForUpdates = ui->menu_Help->addAction( tr( "Check for updates...") ); + connect( checkForUpdates, SIGNAL( triggered() ), updater, SLOT( CheckNow() ) ); #endif m_backAvailable = toolbar->addAction( QIcon( RESPATH "images/back.png" ), tr( "Back" ), PlaylistManager::instance(), SLOT( historyBack() ) );