Dynamically fetch application icon path

Conflicts:
	src/libtomahawk/CMakeLists.txt

.gitignore

@@ -10,3 +10,8 @@ moc_*
 *~
 /tomahawk
 thirdparty/qtweetlib/WARNING-twitter-api-keys
+.kdev4
+tomahawk.kdev4
+clang/
+win/
+gcc/

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "thirdparty/jreen"]
 	path = thirdparty/jreen
-	url = git://gitorious.org/jreen/jreen.git
+	url = git://github.com/euroelessar/jreen.git
+[submodule "thirdparty/qtweetlib/QTweetLib"]
+	path = thirdparty/qtweetlib/QTweetLib
+	url = git://github.com/minimoog/QTweetLib.git

CMakeLists.txt

@@ -1,18 +1,54 @@
 PROJECT( tomahawk )
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" )
+
+IF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
+  CMAKE_POLICY(SET CMP0017 NEW)
+ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 )
 
 ###
 ### Tomahawk application info
 ###
-SET( ORGANIZATION_NAME "Tomahawk" )
-SET( ORGANIZATION_DOMAIN "tomahawk-player.org" )
-SET( APPLICATION_NAME  "Tomahawk" )
-SET( VERSION "0.0.2" )
+SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" )
+SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" )
+SET( TOMAHAWK_APPLICATION_NAME  "Tomahawk" )
+SET( TOMAHAWK_DESCRIPTION_SUMMARY "The social media player" )
+
+SET( TOMAHAWK_VERSION_MAJOR 0 )
+SET( TOMAHAWK_VERSION_MINOR 1 )
+SET( TOMAHAWK_VERSION_PATCH 0 )
+
+# SET( TOMAHAWK_VERSION_RC 0 )
+
+IF( NOT CMAKE_BUILD_TYPE STREQUAL "Release" )
+  # Use the date as the tweak level.
+  INCLUDE( ${CMAKE_MODULE_PATH}/kwsysDateStamp.cmake )
+  SET( TOMAHAWK_VERSION_TWEAK "${KWSYS_DATE_STAMP_YEAR}${KWSYS_DATE_STAMP_MONTH}${KWSYS_DATE_STAMP_DAY}" )
+  INCLUDE( ${CMAKE_MODULE_PATH}/CMakeVersionSource.cmake )
+ENDIF()
+
+SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION_MAJOR}.${TOMAHAWK_VERSION_MINOR}.${TOMAHAWK_VERSION_PATCH} )
+
+IF( ${TOMAHAWK_VERSION_TWEAK} GREATER 0)
+  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}.${TOMAHAWK_VERSION_TWEAK} )
+ENDIF()
+IF( TOMAHAWK_VERSION_RC )
+  SET( CMake_VERSION ${TOMAHAWK_VERSION}-rc${TOMAHAWK_VERSION_RC} )
+ENDIF()
+IF( CMAKE_VERSION_SOURCE )
+  SET( TOMAHAWK_VERSION ${TOMAHAWK_VERSION}-${CMAKE_VERSION_SOURCE} )
+ENDIF()
+
 
 
 # set paths
-SET( CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${CMAKE_SOURCE_DIR}/CMakeModules" )
 SET( THIRDPARTY_DIR  ${CMAKE_SOURCE_DIR}/thirdparty )
+SET( CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
+SET( CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
+SET( CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}" )
+
+# installer creation
+INCLUDE( CPack.cmake )
 
 # Check if we need qtgui:
 IF( "${gui}" STREQUAL "no" )
@@ -29,11 +65,20 @@ INCLUDE( MacroOptionalFindPackage )
 INCLUDE( MacroLogFeature )
 
 # required
-macro_optional_find_package(LibLastFm 0.3.3)
-macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+#While we distribute our own liblastfm2, don't need to look for it
+#macro_optional_find_package(LibLastFm 0.3.3)
+#macro_log_feature(LIBLASTFM_FOUND "LastFm" "Qt library for the Last.fm webservices" "https://github.com/mxcl/liblastfm" FALSE "" "liblastfm is needed for scrobbling tracks to Last.fm and fetching cover artwork")
+set(LIBLASTFM_FOUND true)
 
-macro_optional_find_package(LibEchonest 1.1.1)
-macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest is needed for dynamic playlists and the infosystem")
+find_package(Phonon REQUIRED)
+if(PHONON_VERSION STRLESS "4.5.0")
+	message(FATAL_ERROR "Phonon version 4.5.0 or higher is required, you have version ${PHONON_VERSION}")
+else()
+	message(STATUS "Phonon found; ensure that phonon-vlc is at least 0.4")
+endif()
+
+macro_optional_find_package(LibEchonest 1.1.7)
+macro_log_feature(LIBECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 1.1.8 is needed for dynamic playlists and the infosystem")
 
 macro_optional_find_package(CLucene 0.9.23)
 macro_log_feature(CLucene_FOUND "CLucene" "The open-source, C++ search engine" "http://clucene.sf.net" TRUE "" "CLucene is used for indexing the collection")
@@ -44,45 +89,62 @@ macro_log_feature(QJSON_FOUND "QJson" "Qt library that maps JSON data to QVarian
 macro_optional_find_package(Taglib 1.6.0)
 macro_log_feature(TAGLIB_FOUND "TagLib" "Audio Meta-Data Library" "http://developer.kde.org/~wheeler/taglib.html" TRUE "" "taglib is needed for reading meta data from audio files")
 
+# this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_JREEN )
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/jreen )
+    SET( LIBJREEN_INCLUDE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
+    SET( LIBJREEN_LIBRARY jreen )
+    SET( LIBJREEN_LIBRARIES ${LIBJREEN_LIBRARY} )
+    SET( LIBJREEN_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
+ELSE( INTERNAL_JREEN )
+    macro_optional_find_package(Jreen)
+ENDIF( INTERNAL_JREEN )
+macro_log_feature(LIBJREEN_FOUND "Jreen" "Qt XMPP Library" "http://gitorious.org/jreen/jreen" FALSE "" "Jreen is needed for the Jabber SIP plugin. \n\n     Use -DINTERNAL_JREEN=ON to build the git submodule inside Tomahawk \n     Be aware this installs a full jreen with headers and everything!\n")
+
+# this installs headers and such and should really be handled in a separate package by packagers
+IF( INTERNAL_QTWEETLIB )
+    ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/qtweetlib )
+    # copy headers to build/QTweetLib so we can use proper includes inside the code
+    FILE( COPY ${CMAKE_SOURCE_DIR}/thirdparty/qtweetlib/QTweetLib/src/ DESTINATION ${CMAKE_BINARY_DIR}/QTweetLib )
+    SET( QTWEETLIB_INCLUDE_DIR  ${CMAKE_BINARY_DIR} )
+    SET( QTWEETLIB_LIBRARY  tomahawk_qtweetlib )
+    SET( QTWEETLIB_LIBRARIES ${QTWEETLIB_LIBRARY} )
+    SET( QTWEETLIB_FOUND  true )
+    MESSAGE(STATUS "INTERNAL libQTweetLib: ${QTWEETLIB_INCLUDE_DIR}, ${QTWEETLIB_LIBRARY}")
+ELSE( INTERNAL_QTWEETLIB )
+    macro_optional_find_package(QTweetLib)
+ENDIF( INTERNAL_QTWEETLIB )
+macro_log_feature(QTWEETLIB_FOUND "QTweetLib" "Qt Twitter Library" "https://github.com/minimoog/QTweetLib" FALSE "" "QTweetLib is needed for the Twitter SIP plugin. \n\n     Use -DINTERNAL_QTWEETLIB=ON to build the git submodule inside Tomahawk \n")
+
+### libportfwd
+SET( LIBPORTFWD_INCLUDE_DIR ${THIRDPARTY_DIR}/libportfwd/include )
+SET( LIBPORTFWD_LIBRARY tomahawk_portfwd )
+SET( LIBPORTFWD_LIBRARIES ${LIBPORTFWD_LIBRARY} )
+ADD_SUBDIRECTORY( ${THIRDPARTY_DIR}/libportfwd )
+
 # we need pthreads too
 find_package(Threads)
 
+find_package(KDE4Installed)
+find_package(KDE4)
+IF(KDE4_FOUND)
+    #KDE4 adds and removes some compiler flags that we don't like
+    STRING( REPLACE "-std=iso9899:1990" "" CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+    SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fexceptions" )
+ELSE()
+    SET( CLEAN_C_FLAGS ${CMAKE_C_FLAGS} )
+ENDIF()
+
 include( CheckTagLibFileName )
 check_taglib_filename( COMPLEX_TAGLIB_FILENAME )
 
-# optional
-macro_optional_find_package(Jreen)
-IF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
-    ADD_SUBDIRECTORY( thirdparty/jreen )
-    SET( LIBJREEN_INCLUDE_DIR  ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/include )
-    IF( UNIX AND NOT APPLE )
-        SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.so )
-    ENDIF( UNIX AND NOT APPLE )
-    IF( WIN32 )
-	SET( LIBJREEN_LIBRARY ${CMAKE_CURRENT_BINARY_DIR}/thirdparty/jreen/libjreen.dll )
-    ENDIF( WIN32 )
-    SET( LIBJREEN_FOUND  true )
-    MESSAGE(STATUS "Internal libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
-ENDIF( ENABLE_JREEN AND NOT LIBJREEN_FOUND )
-
 IF( WIN32 )
   find_library(QTSPARKLE_LIBRARIES qtsparkle)
 ENDIF( WIN32 )
 
-macro_log_feature(JREEN_FOUND "Jreen" "Qt XMPP library" "http://gitorious.org/jreen" FALSE "" "Jreen is needed for the alternative/new Jabber SIP plugin. Built automatically inside Tomahawk, if not installed systemwide and ENABLE_JREEN is true")
-
-macro_optional_find_package(Gloox 1.0)
-IF( ENABLE_JREEN )
-    set( GLOOX_FOUND  false )
-ENDIF( ENABLE_JREEN)
-macro_log_feature(GLOOX_FOUND "Gloox" "A portable high-level Jabber/XMPP library for C++" "http://camaya.net/gloox" FALSE "" "Gloox is needed for the Jabber SIP plugin and the XMPP-Bot")
 #show dep log
 macro_display_feature_log()
-MESSAGE("WARNING!")
-MESSAGE("Phonon is going to replace our own audio abstraction layer soon so we didn't")
-MESSAGE("add checks for libmad, libvorbis and libflac. Make sure they are installed!")
-MESSAGE("")
-MESSAGE("-----------------------------------------------------------------------------")
 
 SET( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
 
@@ -92,9 +154,10 @@ CONFIGURE_FILE(
   "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
   IMMEDIATE @ONLY)
 
-ADD_CUSTOM_TARGET(uninstall
-  "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
-
+# KDE4 defines an uninstall target for us automatically
+IF( NOT KDE4_FOUND )
+    ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+ENDIF()
 
 IF( NOT APPLE )
     # Make linking as strict on linux as it is on osx. Then we don't break linking on mac so often
@@ -103,5 +166,6 @@ ENDIF( NOT APPLE )
 
 ADD_SUBDIRECTORY( thirdparty )
 ADD_SUBDIRECTORY( src/libtomahawk )
+SET( TOMAHAWK_LIBRARIES tomahawklib )
 ADD_SUBDIRECTORY( src )
 ADD_SUBDIRECTORY( admin )

CMakeModules/CMakeVersionSource.cmake

@@ -0,0 +1,37 @@
+# Try to identify the current development source version.
+set(CMAKE_VERSION_SOURCE "")
+if(EXISTS ${CMAKE_SOURCE_DIR}/.git/HEAD)
+  find_program(GIT_EXECUTABLE NAMES git git.cmd)
+  mark_as_advanced(GIT_EXECUTABLE)
+  if(GIT_EXECUTABLE)
+    execute_process(
+      COMMAND ${GIT_EXECUTABLE} rev-parse --verify -q --short=4 HEAD
+      OUTPUT_VARIABLE head
+      OUTPUT_STRIP_TRAILING_WHITESPACE
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      )
+    if(head)
+      set(CMAKE_VERSION_SOURCE "g${head}")
+      execute_process(
+        COMMAND ${GIT_EXECUTABLE} update-index -q --refresh
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+      execute_process(
+        COMMAND ${GIT_EXECUTABLE} diff-index --name-only HEAD --
+        OUTPUT_VARIABLE dirty
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        )
+      if(dirty)
+        set(CMAKE_VERSION_SOURCE "${CMAKE_VERSION_SOURCE}-dirty")
+      endif()
+    endif()
+  endif()
+elseif(EXISTS ${CMAKE_SOURCE_DIR}/CVS/Repository)
+  file(READ ${CMAKE_SOURCE_DIR}/CVS/Repository repo)
+  set(branch "")
+  if("${repo}" MATCHES "\\.git/")
+    string(REGEX REPLACE ".*\\.git/([^\r\n]*).*" "-\\1" branch "${repo}")
+  endif()
+  set(CMAKE_VERSION_SOURCE "cvs${branch}")
+endif()

CMakeModules/FindJreen.cmake

@@ -6,15 +6,15 @@
 # LIBJREEN_FOUND, whether libjreen was found
 
 
-find_path(LIBJREEN_INCLUDE_DIR NAMES jreen.h
+find_path(LIBJREEN_INCLUDE_DIR NAMES jreen/jreen.h
    HINTS
    ~/usr/include
    /opt/local/include
    /usr/include
    /usr/local/include
    /opt/kde4/include
+   ${CMAKE_INSTALL_PREFIX}/include
    ${KDE4_INCLUDE_DIR}
-   PATH_SUFFIXES jreen
 )
 
 find_library( LIBJREEN_LIBRARY NAMES jreen
@@ -25,6 +25,8 @@ find_library( LIBJREEN_LIBRARY NAMES jreen
    /usr/lib64
    /usr/local/lib
    /opt/kde4/lib
+   ${CMAKE_INSTALL_PREFIX}/lib
+   ${CMAKE_INSTALL_PREFIX}/lib64
    ${KDE4_LIB_DIR}
 )
 
@@ -33,7 +35,7 @@ if(LIBJREEN_INCLUDE_DIR AND LIBJREEN_LIBRARY)
    set(LIBJREEN_FOUND TRUE)
    message(STATUS "Found libjreen: ${LIBJREEN_INCLUDE_DIR}, ${LIBJREEN_LIBRARY}")
 else(LIBJREEN_INCLUDE_DIR AND LIBJREEN_LIBRARY)
-   set(LIBJREEN_FOUND FALSE)   
+   set(LIBJREEN_FOUND FALSE)
    if (LIBJREEN_FIND_REQUIRED)
       message(FATAL_ERROR "Could NOT find required package libjreen")
    endif(LIBJREEN_FIND_REQUIRED)

CMakeModules/FindKDE4Installed.cmake

@@ -0,0 +1,20 @@
+# Simple hack to detect wether KDE4 is *installed* -- not anything about the development environment!
+
+FILE(TO_CMAKE_PATH "$ENV{KDEDIRS}" _KDEDIRS)
+
+# For KDE4 kde-config has been renamed to kde4-config
+FIND_PROGRAM(KDE4_KDECONFIG_EXECUTABLE NAMES kde4-config
+   # the suffix must be used since KDEDIRS can be a list of directories which don't have bin/ appended
+   PATH_SUFFIXES bin               
+   HINTS
+   ${CMAKE_INSTALL_PREFIX}
+   ${_KDEDIRS}
+   /opt/kde4
+   ONLY_CMAKE_FIND_ROOT_PATH
+   )
+
+IF (KDE4_KDECONFIG_EXECUTABLE)
+   SET (KDE4_INSTALLED TRUE)
+   message(STATUS "KDE4 is installed, will install protocol file")
+ENDIF (KDE4_KDECONFIG_EXECUTABLE)
+

CMakeModules/FindPhonon.cmake

@@ -0,0 +1,71 @@
+# Find libphonon
+# Once done this will define
+#
+#  PHONON_FOUND    - system has Phonon Library
+#  PHONON_INCLUDES - the Phonon include directory
+#  PHONON_LIBS     - link these to use Phonon
+#  PHONON_VERSION  - the version of the Phonon Library
+
+# Copyright (c) 2008, Matthias Kretz <kretz@kde.org>
+#
+# Redistribution and use is allowed according to the terms of the BSD license.
+# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+macro(_phonon_find_version)
+   set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h")
+   if (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+      set(_phonon_namespace_header_file "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   endif (APPLE AND EXISTS "${PHONON_INCLUDE_DIR}/Headers/phononnamespace.h")
+   file(READ ${_phonon_namespace_header_file} _phonon_header LIMIT 5000 OFFSET 1000)
+   string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
+   set(PHONON_VERSION "${CMAKE_MATCH_1}")
+   message(STATUS "Phonon Version: ${PHONON_VERSION}")
+endmacro(_phonon_find_version)
+
+if(PHONON_FOUND)
+   # Already found, nothing more to do except figuring out the version
+   _phonon_find_version()
+else(PHONON_FOUND)
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_FIND_QUIETLY TRUE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+
+   # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4 PATHS ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR})
+   # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
+   find_library(PHONON_LIBRARY NAMES phonon phonon4)
+
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} ${QT_LIBRARY_DIR})
+   find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
+
+   if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
+      set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR})
+      set(PHONON_FOUND TRUE)
+      _phonon_find_version()
+   else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+      set(PHONON_FOUND FALSE)
+   endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
+
+   if(PHONON_FOUND)
+      if(NOT PHONON_FIND_QUIETLY)
+         message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
+         message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
+      endif(NOT PHONON_FIND_QUIETLY)
+   else(PHONON_FOUND)
+      if(Phonon_FIND_REQUIRED)
+         if(NOT PHONON_INCLUDE_DIR)
+            message(STATUS "Phonon includes NOT found!")
+         endif(NOT PHONON_INCLUDE_DIR)
+         if(NOT PHONON_LIBRARY)
+            message(STATUS "Phonon library NOT found!")
+         endif(NOT PHONON_LIBRARY)
+         message(FATAL_ERROR "Phonon library or includes NOT found!")
+      else(Phonon_FIND_REQUIRED)
+         message(STATUS "Unable to find Phonon")
+      endif(Phonon_FIND_REQUIRED)
+   endif(PHONON_FOUND)
+
+
+   mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES)
+endif(PHONON_FOUND)

CMakeModules/FindQJSON.cmake

@@ -43,4 +43,8 @@ else (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)
   include(FindPackageHandleStandardArgs)
   find_package_handle_standard_args(QJSON DEFAULT_MSG QJSON_LIBRARIES QJSON_INCLUDE_DIR)
 
+  if ( UNIX AND NOT APPLE )
+    set ( QJSON_LIBRARIES "${QJSON_LIBRARIES} ${QJSON_LDFLAGS}" CACHE INTERNAL "")
+  endif ()
+
 endif (QJSON_INCLUDE_DIR AND QJSON_LIBRARIES)

CMakeModules/FindQTweetLib.cmake

@@ -0,0 +1,31 @@
+# - Try to find QTweetLib
+#
+#  QTWEETLIB_FOUND - system has QTweetLib
+#  QTWEETLIB_INCLUDE_DIRS - the QTweetLib include directories
+#  QTWEETLIB_LIBRARIES - link these to use QTweetLib
+#
+# (c) Dominik Schmidt <dev@dominik-schmidt.de>
+#
+
+# Dependencies
+find_package(Qt4 REQUIRED)
+
+# Include dir
+find_path(QTWEETLIB_INCLUDE_DIR
+  NAMES QTweetLib/qtweetlib_global.h
+  PATHS ${KDE4_INCLUDE_DIR}
+)
+
+# Finally the library itself
+find_library(QTWEETLIB_LIBRARY
+  NAMES QTweetLib
+  PATHS ${KDE4_LIB_DIR}
+)
+
+SET( QTWEETLIB_LIBRARIES  ${QTWEETLIB_LIBRARY} ${QJSON_LIBRARIES} )
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(QTweetLib DEFAULT_MSG QTWEETLIB_LIBRARY QTWEETLIB_INCLUDE_DIR)
+
+MARK_AS_ADVANCED(QTWEETLIB_LIBRARIES QTWEETLIB_INCLUDE_DIR)
+

CMakeModules/NSIS.InstallOptions.ini.in

@@ -0,0 +1,24 @@
+[Settings]
+NumFields=3
+
+[Field 1]
+Type=Label
+Left=0
+Right=-1
+Top=0
+Bottom=24
+
+[Field 2]
+Type=RadioButton
+Left=30
+Right=-1
+Top=50
+Bottom=58
+State=1
+
+[Field 3]
+Type=RadioButton
+Left=30
+Right=-1
+Top=70
+Bottom=78

CMakeModules/NSIS.template.in

@@ -0,0 +1,665 @@
+;Tomahawk installer script.
+
+;-----------------------------------------------------------------------------
+; Some installer script options (comment-out options not required)
+;-----------------------------------------------------------------------------
+;!define OPTION_LICENSE_AGREEMENT
+!define OPTION_UAC_PLUGIN_ENHANCED
+!define OPTION_SECTION_SC_START_MENU
+!define OPTION_SECTION_SC_DESKTOP
+!define OPTION_SECTION_SC_QUICK_LAUNCH
+!define OPTION_FINISHPAGE
+!define OPTION_FINISHPAGE_LAUNCHER
+!define OPTION_FINISHPAGE_RELEASE_NOTES
+
+;-----------------------------------------------------------------------------
+; Some paths.
+;-----------------------------------------------------------------------------
+!ifndef MING_PATH
+    !define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
+!endif
+!define MING_BIN "${MING_PATH}/bin"
+!define MING_LIB "${MING_PATH}/lib"
+!define BUILD_PATH "@CMAKE_BINARY_DIR@"
+!define QT_DLL_PATH "${MING_BIN}"
+!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
+!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
+!define VLC_PLUGIN_PATH "${MING_LIB}\vlc\plugins"
+!define NSI_PATH "@CMAKE_SOURCE_DIR@/admin/win/nsi"
+
+;-----------------------------------------------------------------------------
+; Increment installer revision number as part of this script.
+;-----------------------------------------------------------------------------
+!define /file REVISION_LAST ${NSI_PATH}/revision.txt
+!define /math REVISION ${REVISION_LAST} + 1
+!delfile revision.txt
+!appendfile revision.txt ${REVISION}
+
+!define VER_MAJOR "@CPACK_PACKAGE_VERSION_MAJOR@"
+!define VER_MINOR "@CPACK_PACKAGE_VERSION_MINOR@"
+!define VER_BUILD "@CPACK_PACKAGE_VERSION_PATCH@"
+!define VERSION "@CPACK_PACKAGE_VERSION@"
+
+;-----------------------------------------------------------------------------
+; Installer build timestamp.
+;-----------------------------------------------------------------------------
+!define /date BUILD_TIME "built on %Y/%m/%d at %I:%M %p  (rev. ${REVISION})"
+
+;-----------------------------------------------------------------------------
+; Initial installer setup and definitions.
+;-----------------------------------------------------------------------------
+Name "@CPACK_NSIS_PACKAGE_NAME@"
+Caption "Tomahawk Installer"
+BrandingText "Tomahawk ${VERSION}  -- ${BUILD_TIME}"
+OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
+InstallDir "$PROGRAMFILES\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+InstallDirRegKey HKCU "Software\Tomahawk" ""
+InstType Standard
+InstType Full
+InstType Minimal
+CRCCheck On
+SetCompressor @CPACK_NSIS_COMPRESSOR@
+RequestExecutionLevel user ;Now using the UAC plugin.
+ReserveFile NSIS.InstallOptions.ini
+ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
+
+@CPACK_NSIS_SECTION_SELECTED_VARS@
+
+;-----------------------------------------------------------------------------
+; Include some required header files.
+;-----------------------------------------------------------------------------
+!include LogicLib.nsh ;Used by APPDATA uninstaller.
+!include nsDialogs.nsh ;Used by APPDATA uninstaller.
+!include MUI2.nsh ;Used by APPDATA uninstaller.
+!include InstallOptions.nsh ;Required by MUI2 to support old MUI_INSTALLOPTIONS.
+!include Memento.nsh ;Remember user selections.
+!include WinVer.nsh ;Windows version detection.
+!include WordFunc.nsh  ;Used by VersionCompare macro function.
+!include UAC.nsh ;Used by the UAC elevation to install as user or admin.
+
+;-----------------------------------------------------------------------------
+; Memento selections stored in registry.
+;-----------------------------------------------------------------------------
+!define MEMENTO_REGISTRY_ROOT HKLM
+!define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk
+
+;-----------------------------------------------------------------------------
+; Modern User Interface (MUI) defintions and setup.
+;-----------------------------------------------------------------------------
+!define MUI_ABORTWARNING
+!define MUI_ICON ${NSI_PATH}\installer.ico
+!define MUI_UNICON ${NSI_PATH}\installer.ico
+!define MUI_WELCOMEFINISHPAGE_BITMAP ${NSI_PATH}\welcome.bmp
+!define MUI_WELCOMEPAGE_TITLE "@CPACK_PACKAGE_NAME@ ${VERSION} Setup$\r$\nInstaller Build Revision ${REVISION}"
+!define MUI_WELCOMEPAGE_TEXT "This wizard will guide you through the installation.$\r$\n$\r$\n$_CLICK"
+!define MUI_HEADERIMAGE
+!define MUI_HEADERIMAGE_BITMAP ${NSI_PATH}\page_header.bmp
+!define MUI_COMPONENTSPAGE_SMALLDESC
+!define MUI_FINISHPAGE_TITLE "@CPACK_PACKAGE_NAME@ Install Completed"
+!define MUI_FINISHPAGE_LINK "Click here to visit the @CPACK_PACKAGE_NAME@ website."
+!define MUI_FINISHPAGE_LINK_LOCATION "http://@TOMAHAWK_ORGANIZATION_DOMAIN@"
+!define MUI_FINISHPAGE_NOREBOOTSUPPORT
+!ifdef OPTION_FINISHPAGE_RELEASE_NOTES
+   !define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+   !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\NOTES.txt"
+   !define MUI_FINISHPAGE_SHOWREADME_TEXT "Show release notes"
+!endif
+!ifdef OPTION_FINISHPAGE_LAUNCHER
+   !define MUI_FINISHPAGE_NOAUTOCLOSE
+   !define MUI_FINISHPAGE_RUN
+   !define MUI_FINISHPAGE_RUN_FUNCTION "LaunchTomahawk"
+!endif
+
+;-----------------------------------------------------------------------------
+; Page macros.
+;-----------------------------------------------------------------------------
+!insertmacro MUI_PAGE_WELCOME
+!ifdef OPTION_LICENSE_AGREEMENT
+   !insertmacro MUI_PAGE_LICENSE "LICENSE.txt"
+!endif
+Page custom PageReinstall PageLeaveReinstall
+!insertmacro MUI_PAGE_COMPONENTS
+!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_INSTFILES
+!ifdef OPTION_FINISHPAGE
+   !insertmacro MUI_PAGE_FINISH
+!endif
+!insertmacro MUI_UNPAGE_CONFIRM
+UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
+!insertmacro MUI_UNPAGE_INSTFILES
+
+;-----------------------------------------------------------------------------
+; Other MUI macros.
+;-----------------------------------------------------------------------------
+!insertmacro MUI_LANGUAGE "English"
+
+##############################################################################
+#                                                                            #
+#   FINISH PAGE LAUNCHER FUNCTIONS                                           #
+#                                                                            #
+##############################################################################
+
+Function LaunchTomahawk
+   ${UAC.CallFunctionAsUser} LaunchTomahawkAsUser
+FunctionEnd
+
+Function LaunchTomahawkAsUser
+   Exec "$INSTDIR\tomahawk.exe"
+FunctionEnd
+
+##############################################################################
+#                                                                            #
+#   PROCESS HANDLING FUNCTIONS AND MACROS                                    #
+#                                                                            #
+##############################################################################
+
+!macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
+   Processes::FindProcess ${processName}
+   StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
+!macroend
+
+!macro ConfirmEndProcess processName
+   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+     "Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
+     IDYES process_${processName}_kill IDNO process_${processName}_ended
+   process_${processName}_kill:
+      DetailPrint "Killing ${processName} processes."
+      Processes::KillProcess ${processName}
+      Sleep 1500
+      StrCmp $R0 "1" process_${processName}_ended
+      DetailPrint "Process to kill not found!"
+   process_${processName}_ended:
+!macroend
+
+!macro CheckAndConfirmEndProcess processName
+   !insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
+   !insertmacro ConfirmEndProcess ${processName}
+   no_process_${processName}_to_end:
+!macroend
+
+Function EnsureTomahawkShutdown
+   !insertmacro CheckAndConfirmEndProcess "tomahawk.exe"
+FunctionEnd
+
+##############################################################################
+#                                                                            #
+#   RE-INSTALLER FUNCTIONS                                                   #
+#                                                                            #
+##############################################################################
+
+Function PageReinstall
+   ReadRegStr $R0 HKLM "Software\Tomahawk" ""
+   StrCmp $R0 "" 0 +2
+   Abort
+
+   ;Detect version
+   ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMajor"
+   IntCmp $R0 ${VER_MAJOR} minor_check new_version older_version
+   minor_check:
+      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionMinor"
+      IntCmp $R0 ${VER_MINOR} build_check new_version older_version
+   build_check:
+      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionBuild"
+      IntCmp $R0 ${VER_BUILD} revision_check new_version older_version
+   revision_check:
+      ReadRegDWORD $R0 HKLM "Software\Tomahawk" "VersionRevision"
+      IntCmp $R0 ${REVISION} same_version new_version older_version
+
+   new_version:
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "An older version of Tomahawk is installed on your system. It is recommended that you uninstall the current version before installing. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
+      StrCpy $R0 "1"
+      Goto reinst_start
+
+   older_version:
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "A newer version of Tomahawk is already installed! It is not recommended that you install an older version. If you really want to install this older version, it is better to uninstall the current version first. Select the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Uninstall before installing"
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Do not uninstall"
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose how you want to install Tomahawk."
+      StrCpy $R0 "1"
+      Goto reinst_start
+
+   same_version:
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 1" "Text" "Tomahawk ${VERSION} is already installed.\r\nSelect the operation you want to perform and click Next to continue."
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 2" "Text" "Add/Reinstall components"
+      !insertmacro INSTALLOPTIONS_WRITE "NSIS.InstallOptions.ini" "Field 3" "Text" "Uninstall Tomahawk"
+      !insertmacro MUI_HEADER_TEXT "Already Installed" "Choose the maintenance option to perform."
+      StrCpy $R0 "2"
+
+   reinst_start:
+      !insertmacro INSTALLOPTIONS_DISPLAY "NSIS.InstallOptions.ini"
+FunctionEnd
+
+Function PageLeaveReinstall
+   !insertmacro INSTALLOPTIONS_READ $R1 "NSIS.InstallOptions.ini" "Field 2" "State"
+   StrCmp $R0 "1" 0 +2
+   StrCmp $R1 "1" reinst_uninstall reinst_done
+   StrCmp $R0 "2" 0 +3
+   StrCmp $R1 "1" reinst_done reinst_uninstall
+   reinst_uninstall:
+      ReadRegStr $R1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString"
+      HideWindow
+      ClearErrors
+      ExecWait '$R1 _?=$INSTDIR'
+      IfErrors no_remove_uninstaller
+      IfFileExists "$INSTDIR\tomahawk.exe" no_remove_uninstaller
+      Delete $R1
+      RMDir $INSTDIR
+   no_remove_uninstaller:
+      StrCmp $R0 "2" 0 +3
+      UAC::Unload
+      Quit
+      BringToFront
+   reinst_done:
+FunctionEnd
+
+##############################################################################
+#                                                                            #
+#   INSTALLER SECTIONS                                                       #
+#                                                                            #
+##############################################################################
+Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
+   SectionIn 1 2 3 RO
+   SetDetailsPrint listonly
+
+   SetDetailsPrint textonly
+   DetailPrint "Installing Tomahawk Player essentials."
+   SetDetailsPrint listonly
+   SetOutPath "$INSTDIR"
+
+   !ifdef INSTALL_PATH
+        ;Main executable.
+        File "${INSTALL_PATH}\bin\tomahawk.exe"
+
+        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll"
+        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
+        File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll"
+   !endif
+   !ifndef INSTALL_PATH
+        ;Main executable.
+        File "${BUILD_PATH}\tomahawk.exe"
+
+        File "${BUILD_PATH}\libtomahawklib.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
+        File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
+        File "${BUILD_PATH}\libtomahawk_sip*.dll"
+   !endif
+
+   ;License & release notes.
+   File "@CPACK_RESOURCE_FILE_LICENSE@"
+   File /oname=NOTES.txt ${NSI_PATH}\RELEASE_NOTES.txt
+
+   ;QT stuff:
+   File "${QT_DLL_PATH}\QtCore4.dll"
+   File "${QT_DLL_PATH}\QtGui4.dll"
+   File "${QT_DLL_PATH}\QtNetwork4.dll"
+   File "${QT_DLL_PATH}\QtSql4.dll"
+   File "${QT_DLL_PATH}\QtXml4.dll"
+   File "${QT_DLL_PATH}\QtWebKit4.dll"
+
+   ;SQLite driver
+   SetOutPath "$INSTDIR\sqldrivers"
+   File "${SQLITE_DLL_PATH}\qsqlite4.dll"
+   SetOutPath "$INSTDIR"
+
+   ;Image plugins
+   SetOutPath "$INSTDIR\imageformats"
+   File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
+   File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
+   SetOutPath "$INSTDIR"
+
+   ;Cygwin/c++ stuff
+   ;File "${MING_BIN}\cygmad-0.dll"
+   ;File "${MING_BIN}\libgcc_s_dw2-1.dll"
+   ;File "${MING_BIN}\mingwm10.dll"
+   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
+   File "${MING_BIN}\libstdc++-6.dll"
+
+   ;Phonon stuff
+
+   ;Fix the phonon build to not use Dbus
+   File "${QT_DLL_PATH}\QtDbus4.dll"
+   File "${MING_BIN}\libdbus-1-3.dll"
+   File "${MING_BIN}\dbus-daemon.exe"
+
+   File "${MING_BIN}\libphonon.dll"
+   SetOutPath "$INSTDIR\phonon_backend"
+   File "${MING_BIN}\phonon_backend\phonon_vlc.dll"
+   SetOutPath "$INSTDIR"
+
+   ;VLC
+   ;SetOutPath "$INSTDIR\phonon_backend"
+   File "${MING_BIN}\libvlc.dll"
+   File "${MING_BIN}\libvlccore.dll"
+   SetOutPath "$INSTDIR\plugins"
+   File /r "${VLC_PLUGIN_PATH}\*.dll"
+   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libmad-0.dll" ; MP3
+   File "${MING_BIN}\libFLAC-8.dll" ; FLAC
+   File "${MING_BIN}\libogg-0.dll" ; OGG, FLAC
+   File "${MING_BIN}\libvorbis-0.dll" ; OGG
+   File "${MING_BIN}\libvorbisenc-2.dll" ; OGG
+
+
+
+   ; Other
+   File "${MING_BIN}\libqjson.dll"
+   File "${MING_BIN}\libtag.dll"
+   File "${MING_BIN}\libpng15-15.dll"
+   File "${MING_BIN}\libjpeg-8.dll"
+   File "${MING_BIN}\zlib1.dll"
+
+   File "${MING_BIN}\libechonest.dll"
+   File "${MING_BIN}\libQTweetLib.dll"
+
+   ; Jabber
+   File "${MING_BIN}\libjreen.dll"
+   File "${MING_BIN}\libqca.dll"
+   SetOutPath "$INSTDIR\crypto"
+   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
+   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libssl-8.dll"
+   File "${MING_BIN}\libcrypto-8.dll"
+
+   File "${MING_LIB}\libclucene-core.dll"
+   File "${MING_LIB}\libclucene-shared.dll"
+
+   File "${MING_BIN}\libqtsparkle.dll"
+SectionEnd
+
+SectionGroup "Shortcuts"
+
+!ifdef OPTION_SECTION_SC_START_MENU
+   ${MementoSection} "Start Menu Program Group" SEC_START_MENU
+      SectionIn 1 2
+      SetDetailsPrint textonly
+      DetailPrint "Adding shortcuts for the Tomahawk program group to the Start Menu."
+      SetDetailsPrint listonly
+      SetShellVarContext all
+      RMDir /r "$SMPROGRAMS\Tomahawk"
+      CreateDirectory "$SMPROGRAMS\Tomahawk"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
+      SetShellVarContext current
+   ${MementoSectionEnd}
+!endif
+
+!ifdef OPTION_SECTION_SC_DESKTOP
+   ${MementoSection} "Desktop Shortcut" SEC_DESKTOP
+      SectionIn 1 2
+      SetDetailsPrint textonly
+      DetailPrint "Creating Desktop Shortcuts"
+      SetDetailsPrint listonly
+      CreateShortCut "$DESKTOP\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+   ${MementoSectionEnd}
+!endif
+
+!ifdef OPTION_SECTION_SC_QUICK_LAUNCH
+   ${MementoSection} "Quick Launch Shortcut" SEC_QUICK_LAUNCH
+      SectionIn 1 2
+      SetDetailsPrint textonly
+      DetailPrint "Creating Quick Launch Shortcut"
+      SetDetailsPrint listonly
+      CreateShortCut "$QUICKLAUNCH\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
+   ${MementoSectionEnd}
+!endif
+
+SectionGroupEnd
+
+${MementoSectionDone}
+
+; Installer section descriptions
+;--------------------------------
+!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_TOMAHAWK_PLAYER} "Tomahawk player essentials."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_START_MENU} "Tomahawk program group."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_DESKTOP} "Desktop shortcut for Tomahawk."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC_QUICK_LAUNCH} "Quick Launch shortcut for Tomahawk."
+!insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+Section -post
+
+   ;Uninstaller file.
+   SetDetailsPrint textonly
+   DetailPrint "Writing Uninstaller"
+   SetDetailsPrint listonly
+   WriteUninstaller $INSTDIR\uninstall.exe
+
+   ;Registry keys required for installer version handling and uninstaller.
+   SetDetailsPrint textonly
+   DetailPrint "Writing Installer Registry Keys"
+   SetDetailsPrint listonly
+
+   ;Version numbers used to detect existing installation version for comparisson.
+   WriteRegStr HKLM "Software\Tomahawk" "" $INSTDIR
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionMinor" "${VER_MINOR}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionRevision" "${REVISION}"
+   WriteRegDWORD HKLM "Software\Tomahawk" "VersionBuild" "${VER_BUILD}"
+
+   ;Add or Remove Programs entry.
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "UninstallString" '"$INSTDIR\Uninstall.exe"'
+   WriteRegExpandStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation" "$INSTDIR"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayName" "Tomahawk"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "Publisher" "Tomahawk-player.org"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayIcon" "$INSTDIR\Uninstall.exe,0"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "DisplayVersion" "${VERSION}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMajor" "${VER_MAJOR}"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "VersionMinor" "${VER_MINOR}.${REVISION}"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "URLInfoAbout" "http://tomahawk-player.org/"
+   WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "HelpLink" "http://tomahawk-player.org/"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoModify" "1"
+   WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"
+
+   ; Register tomahawk:// protocol handler
+   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
+   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR "tomahawk\shell" "" "open"
+   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
+   SetDetailsPrint textonly
+   DetailPrint "Finsihed."
+SectionEnd
+
+##############################################################################
+#                                                                            #
+#   UNINSTALLER SECTION                                                      #
+#                                                                            #
+##############################################################################
+
+Var UnPageUserAppDataDialog
+Var UnPageUserAppDataCheckbox
+Var UnPageUserAppDataCheckbox_State
+Var UnPageUserAppDataEditBox
+
+Function un.UnPageUserAppData
+   !insertmacro MUI_HEADER_TEXT "Uninstall Tomahawk" "Remove Tomahawk's data folder from your computer."
+   nsDialogs::Create /NOUNLOAD 1018
+   Pop $UnPageUserAppDataDialog
+
+   ${If} $UnPageUserAppDataDialog == error
+      Abort
+   ${EndIf}
+
+   ${NSD_CreateLabel} 0 0 100% 12u "Do you want to delete Tomahawk's data folder?"
+   Pop $0
+
+   ${NSD_CreateText} 0 13u 100% 12u "$LOCALAPPDATA\Tomahawk"
+   Pop $UnPageUserAppDataEditBox
+   SendMessage $UnPageUserAppDataEditBox ${EM_SETREADONLY} 1 0
+
+   ${NSD_CreateLabel} 0 46u 100% 24u "Leave unchecked to keep the data folder for later use or check to delete the data folder."
+   Pop $0
+
+   ${NSD_CreateCheckbox} 0 71u 100% 8u "Yes, delete this data folder."
+   Pop $UnPageUserAppDataCheckbox
+
+   nsDialogs::Show
+FunctionEnd
+
+Function un.UnPageUserAppDataLeave
+   ${NSD_GetState} $UnPageUserAppDataCheckbox $UnPageUserAppDataCheckbox_State
+FunctionEnd
+
+Section Uninstall
+   IfFileExists "$INSTDIR\tomahawk.exe" tomahawk_installed
+      MessageBox MB_YESNO "It does not appear that Tomahawk is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES tomahawk_installed
+      Abort "Uninstall aborted by user"
+   tomahawk_installed:
+
+   ;Delete registry keys.
+   DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionBuild"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionMajor"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionMinor"
+   DeleteRegValue HKLM "Software\Tomahawk" "VersionRevision"
+   DeleteRegValue HKLM "Software\Tomahawk" ""
+   DeleteRegKey HKLM "Software\Tomahawk"
+
+   DeleteRegKey HKCR "tomahawk"
+
+   ;Start menu shortcuts.
+   !ifdef OPTION_SECTION_SC_START_MENU
+      SetShellVarContext all
+      RMDir /r "$SMPROGRAMS\Tomahawk"
+      SetShellVarContext current
+   !endif
+
+   ;Desktop shortcut.
+   !ifdef OPTION_SECTION_SC_DESKTOP
+      IfFileExists "$DESKTOP\Tomahawk.lnk" 0 +2
+         Delete "$DESKTOP\Tomahawk.lnk"
+   !endif
+
+   ;Quick Launch shortcut.
+   !ifdef OPTION_SECTION_SC_QUICK_LAUNCH
+      IfFileExists "$QUICKLAUNCH\Tomahawk.lnk" 0 +2
+         Delete "$QUICKLAUNCH\Tomahawk.lnk"
+   !endif
+
+   ;Remove all the Program Files.
+   RMDir /r $INSTDIR
+
+   ;Uninstall User Data if option is checked, otherwise skip.
+   ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
+      RMDir /r "$LOCALAPPDATA\Tomahawk"
+   ${EndIf}
+
+   SetDetailsPrint textonly
+   DetailPrint "Finsihed."
+SectionEnd
+
+##############################################################################
+#                                                                            #
+#   NSIS Installer Event Handler Functions                                   #
+#                                                                            #
+##############################################################################
+
+Function .onInit
+   !insertmacro INSTALLOPTIONS_EXTRACT "NSIS.InstallOptions.ini"
+
+   ;Remove Quick Launch option from Windows 7, as no longer applicable - usually.
+   ${IfNot} ${AtMostWinVista}
+      SectionSetText ${SEC_QUICK_LAUNCH} "Quick Launch Shortcut (N/A)"
+      SectionSetFlags ${SEC_QUICK_LAUNCH} ${SF_RO}
+      SectionSetInstTypes ${SEC_QUICK_LAUNCH} 0
+   ${EndIf}
+
+   ${MementoSectionRestore}
+
+   UAC_Elevate:
+      UAC::RunElevated
+      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
+      StrCmp 0 $0 0 UAC_Err ; Error?
+      StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
+      Quit
+
+   UAC_Err:
+      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+      Abort
+
+   UAC_ElevationAborted:
+      Abort
+
+   UAC_Success:
+      StrCmp 1 $3 +4 ;Admin?
+      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
+      MessageBox MB_ICONSTOP "This installer requires admin access, try again"
+      goto UAC_Elevate
+
+   ;Prevent multiple instances.
+   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "tomahawkInstaller") i .r1 ?e'
+   Pop $R0
+   StrCmp $R0 0 +3
+      MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
+      Abort
+
+   ;Use available InstallLocation when possible. This is useful in the uninstaller
+   ;via re-install, which would otherwise use a default location - a bug.
+   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation"
+   StrCmp $R0 "" SkipSetInstDir
+   StrCpy $INSTDIR $R0
+   SkipSetInstDir:
+
+   ;Shutdown Tomahawk in case Add/Remove re-installer option used.
+   Call EnsureTomahawkShutdown
+FunctionEnd
+
+Function .onInstSuccess
+   ${MementoSectionSave}
+   UAC::Unload ;Must call unload!
+FunctionEnd
+
+Function .onInstFailed
+   UAC::Unload ;Must call unload!
+FunctionEnd
+
+##############################################################################
+#                                                                            #
+#   NSIS Uninstaller Event Handler Functions                                 #
+#                                                                            #
+##############################################################################
+
+Function un.onInit
+   UAC_Elevate:
+      UAC::RunElevated
+      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
+      StrCmp 0 $0 0 UAC_Err ; Error?
+      StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
+      Quit
+
+   UAC_Err:
+      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+      Abort
+
+   UAC_ElevationAborted:
+      Abort
+
+   UAC_Success:
+      StrCmp 1 $3 +4 ;Admin?
+      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
+      MessageBox MB_ICONSTOP "This uninstaller requires admin access, try again"
+      goto UAC_Elevate
+
+   ;Prevent multiple instances.
+   System::Call 'kernel32::CreateMutexA(i 0, i 0, t "tomahawkUninstaller") i .r1 ?e'
+   Pop $R0
+   StrCmp $R0 0 +3
+      MessageBox MB_OK|MB_ICONEXCLAMATION "This uninstaller is already running."
+      Abort
+FunctionEnd
+
+Function un.onUnInstSuccess
+   UAC::Unload ;Must call unload!
+FunctionEnd
+
+Function un.onUnInstFailed
+   UAC::Unload ;Must call unload!
+FunctionEnd

CMakeModules/kwsysDateStamp.cmake

@@ -0,0 +1,21 @@
+# Do not edit!  Generated by kwsysDateStamp.py
+#=============================================================================
+# KWSys - Kitware System Library
+# Copyright 2000-2009 Kitware, Inc., Insight Software Consortium
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+
+# KWSys version date year component.  Format is CCYY.
+SET(KWSYS_DATE_STAMP_YEAR  2011)
+
+# KWSys version date month component.  Format is MM.
+SET(KWSYS_DATE_STAMP_MONTH 07)
+
+# KWSys version date day component.  Format is DD.
+SET(KWSYS_DATE_STAMP_DAY   06)

CPack.cmake

@@ -0,0 +1,53 @@
+INCLUDE( InstallRequiredSystemLibraries )
+
+SET( CPACK_PACKAGE_CONTACT  "Dominik Schmidt <domme@tomahawk-player.org>" )
+
+SET( CPACK_PACKAGE_FILE_NAME  tomahawk-${TOMAHAWK_VERSION} )    # Package file name without extension. Also a directory of installer  cmake-2.5.0-Linux-i686
+
+# CPACK_GENERATOR   CPack generator to be used  STGZ;TGZ;TZ
+# CPACK_INCLUDE_TOPLEVEL_DIRECTORY    Controls whether CPack adds a top-level directory, usually of the form ProjectName-Version-OS, to the top of package tree.  0 to disable, 1 to enable
+# CPACK_INSTALL_CMAKE_PROJECTS    List of four values: Build directory, Project Name, Project Component, Directory in the package     /home/andy/vtk/CMake-bin;CMake;ALL;/
+SET( CPACK_PACKAGE_DESCRIPTION_FILE  "${CMAKE_SOURCE_DIR}/README" ) # File used as a description of a project     /path/to/project/ReadMe.txt
+SET( CPACK_PACKAGE_DESCRIPTION_SUMMARY  ${TOMAHAWK_DESCRIPTION_SUMMARY} ) #  Description summary of a project
+# CPACK_PACKAGE_EXECUTABLES   List of pairs of executables and labels. Used by the NSIS generator to create Start Menu shortcuts.     ccmake;CMake
+SET( CPACK_PACKAGE_INSTALL_DIRECTORY  ${TOMAHAWK_APPLICATION_NAME} )     # Installation directory on the target system -> C:\Program Files\fellody
+SET( CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${TOMAHAWK_APPLICATION_NAME} )  # Registry key used when installing this project  CMake 2.5.0
+SET( CPACK_PACKAGE_NAME  ${TOMAHAWK_APPLICATION_NAME} ) # Package name, defaults to the project name
+SET( CPACK_PACKAGE_VENDOR  ${TOMAHAWK_ORGANIZATION_NAME} )   # Package vendor name
+SET( CPACK_PACKAGE_VERSION_MAJOR  ${TOMAHAWK_VERSION_MAJOR} )
+SET( CPACK_PACKAGE_VERSION_MINOR  ${TOMAHAWK_VERSION_MINOR} )
+SET( CPACK_PACKAGE_VERSION_PATCH  ${TOMAHAWK_VERSION_PATCH} )
+
+# CPACK_SOURCE_GENERATOR  List of generators used for the source package  TGZ;TZ
+
+SET( CPACK_SOURCE_GENERATOR TGZ )
+SET( CPACK_SOURCE_IGNORE_FILES "/\\\\.git/" ".*~$" ".kate-swp$" "/build_dir/" "/clang/" "/gcc/" "/build/" "/win/" ) # Pattern of files in the source tree that won't be packaged
+SET( CPACK_SOURCE_PACKAGE_FILE_NAME tomahawk-${TOMAHAWK_VERSION} ) # Name of the source package
+# CPACK_SOURCE_STRIP_FILES    List of files in the source tree that will be stripped. Starting with CMake 2.6.0 CPACK_SOURCE_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).
+# CPACK_STRIP_FILES   List of files to be stripped. Starting with CMake 2.6.0 CPACK_STRIP_FILES will be a boolean variable which enables stripping of all files (a list of files evaluates to TRUE in CMake, so this change is compatible).   bin/ccmake;bin/cmake;bin/cpack;bin/ctest
+# CPACK_SYSTEM_NAME   System name, defaults to the value of ${CMAKE_SYSTEM_NAME}.     Linux-i686
+
+# Advanced settings
+# CPACK_CMAKE_GENERATOR   What CMake generator should be used if the project is CMake project. Defaults to the value of CMAKE_GENERATOR.  Unix Makefiles
+SET( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt" ) # License file for the project, used by the STGZ, NSIS, and PackageMaker generators.  /home/andy/vtk/CMake/Copyright.txt
+# CPACK_RESOURCE_FILE_README  ReadMe file for the project, used by PackageMaker generator.    /home/andy/vtk/CMake/Templates/CPack.GenericDescription.txt
+# CPACK_RESOURCE_FILE_WELCOME     Welcome file for the project, used by PackageMaker generator.   /home/andy/vtk/CMake/Templates/CPack.GenericWelcome.txt
+SET( CPACK_PACKAGE_VERSION  ${TOMAHAWK_VERSION} )
+
+SET( CPACK_TOPLEVEL_TAG "narf" ) # Directory for the installed files.  - needed to provide anything to avoid an error# CPACK_INSTALL_COMMANDS  Extra commands to install components.
+# CPACK_INSTALL_DIRECTORIES   Extra directories to install.
+# CPACK_MONOLITHIC_INSTALL    When set disables the component-based installer.
+# CPACK_PACKAGING_INSTALL_PREFIX  Sets the default root that the generated package installs into, '/usr' is the default for the debian and redhat generators  /usr/local
+
+##
+# INSTALL DEPS
+##
+
+
+
+# Set the options file that needs to be included inside CMakeCPackOptions.cmake
+#SET(QT_DIALOG_CPACK_OPTIONS_FILE ${CMake_BINARY_DIR}/Source/QtDialog/QtDialogCPack.cmake)
+configure_file("${CMAKE_SOURCE_DIR}/CPackOptions.cmake.in"
+    "${CMAKE_BINARY_DIR}/CPackOptions.cmake" @ONLY)
+set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_BINARY_DIR}/CPackOptions.cmake") # File included at cpack time, once per generator after setting CPACK_GENERATOR to the actual generator being used; allows per-generator setting of CPACK_* variables at cpack time.  ${PROJECT_BINARY_DIR}/CPackOptions.cmake
+include(CPack)

CPackOptions.cmake.in

@@ -0,0 +1,73 @@
+# This file is configured at cmake time, and loaded at cpack time.
+# To pass variables to cpack from cmake, they must be configured
+# in this file.
+
+if(CPACK_GENERATOR MATCHES "NSIS")
+  #SET(CPACK_NSIS_INSTALL_ROOT "@CPACK_NSIS_INSTALL_ROOT@")
+
+  # set the install/unistall icon used for the installer itself
+  # There is a bug in NSI that does not handle full unix paths properly.
+  #SET(CPACK_NSIS_MUI_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
+  #SET(CPACK_NSIS_MUI_UNIICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeLogo.ico")
+  # set the package header icon for MUI
+  #SET(CPACK_PACKAGE_ICON "@CMake_SOURCE_DIR@/Utilities/Release\\CMakeInstall.bmp")
+  # tell cpack to create links to the doc files
+  #SET(CPACK_NSIS_MENU_LINKS
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-gui.html" "cmake-gui Help"
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake.html" "CMake Help"
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-properties.html"
+  #  "CMake Properties and Variables Help"
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/ctest.html" "CTest Help"
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-modules.html" "CMake Modules Help"
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cmake-commands.html" "CMake Commands Help"
+  #  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/cpack.html" "CPack Help"
+  #  "http://www.cmake.org" "CMake Web Site"
+  #  )
+  # Use the icon from cmake-gui for add-remove programs
+  #SET(CPACK_NSIS_INSTALLED_ICON_NAME "bin\\cmake-gui.exe")
+  #
+  #SET(CPACK_NSIS_PACKAGE_NAME "@CPACK_NSIS_PACKAGE_NAME@")
+  #SET(CPACK_NSIS_DISPLAY_NAME "@CPACK_NSIS_PACKAGE_NAME@, a cross-platform, open-source build system")
+  #SET(CPACK_NSIS_HELP_LINK "http://www.cmake.org")
+  #SET(CPACK_NSIS_URL_INFO_ABOUT "http://www.kitware.com")
+  #SET(CPACK_NSIS_CONTACT @CPACK_PACKAGE_CONTACT@)
+  #SET(CPACK_NSIS_MODIFY_PATH ON)
+
+
+
+##### all options
+#CPACK_NSIS_MUI_ICON     The icon file (.ico) for the generated install program. Both this and CPACK_NSIS_MUI_UNIICON need to set for this to have any effect.   installer.ico
+#CPACK_NSIS_MUI_UNIICON  The icon file (.ico) for the generated uninstall program. Both this and CPACK_NSIS_MUI_ICON need to set for this to have any effect.    uninstaller.ico
+SET( CPACK_PACKAGE_ICON  @CMAKE_SOURCE_DIR@/admin/win/nsi/installer.ico ) #  A branding image that will be displayed on the top bar inside the installer.    installer.bmp
+#CPACK_NSIS_EXTRA_INSTALL_COMMANDS   Extra NSIS commands that will be added to the install Section.  ExecWait '\\\"$INSTDIR\\\\vcredist_x86.exe\\\" /q:a'
+#CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS     Extra NSIS commands that will be added to the uninstall Section.
+SET( CPACK_NSIS_COMPRESSOR   "/SOLID lzma" ) # The arguments that will be passed to the NSIS SetCompressor command.    /SOLID lzma
+#CPACK_NSIS_MODIFY_PATH  If this is set to "ON", then an extra page will appear in the installer that will allow the user to choose whether the program directory should be added to the system PATH variable.   ON
+#CPACK_NSIS_DISPLAY_NAME     Undocumented.   "${CPACK_PACKAGE_INSTALL_DIRECTORY} My Famous Project"
+#CPACK_NSIS_INSTALLED_ICON_NAME  Set the icon used for the Windows "Add or Remove Programs" tool.    "bin\\\\MyExecutable.exe"
+#CPACK_NSIS_HELP_LINK    Adds link to registry. URI.     "http:\\\\\\\\www.my-project-home-page.org"
+#CPACK_NSIS_URL_INFO_ABOUT   Adds link to registry and the vendor in add/remove programs' "Click here for support information" in program entry links here.  "http:\\\\\\\\www.my-personal-home-page.com"
+#CPACK_NSIS_CONTACT  Adds link to add/remove programs' "Click here for support information" in program entry.    "me@my-personal-home-page.com"
+#CPACK_NSIS_CREATE_ICONS_EXTRA   Additional NSIS commands for creating start menu shortcuts.     set(CPACK_NSIS_CREATE_ICONS "CreateShortCut '\$SMPROGRAMS\\\\$STARTMENU_FOLDER\\\\${PROJECT_NAME}.lnk' '\$INSTDIR\\\\${PROJECT_NAME}.exe'")
+#CPACK_NSIS_DELETE_ICONS_EXTRA   Undocumented. Possibly: Additional NSIS commands to uninstall start menu shortcuts.
+#CPACK_NSIS_MENU_LINKS   Used to override the Start Menu links.  "doc/cmake-@CMake_VERSION_MAJOR@.@CMake_VERSION_MINOR@/CMakeSetup.html" "CMakeSetup Help"
+#CPACK_NSIS_MUI_FINISHPAGE_RUN   If used, will make it possible for user to choose (on an additional page, displayed at the end of the installation) to run intalled program. Should point to program name to run, seemingly without any sub-directories of the installation directory in case program installed in such sub-directories (but please check generated NSIS script if you can't make it work).     "MyExecutable.exe"
+
+endif(CPACK_GENERATOR MATCHES "NSIS")
+
+## include the cpack options for qt dialog if they exisit
+## they might not if qt was not enabled for the build
+#INCLUDE("@QT_DIALOG_CPACK_OPTIONS_FILE@" OPTIONAL)
+
+
+#if("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
+#  if(CMAKE_PACKAGE_QTGUI)
+#    set(CPACK_PACKAGE_DEFAULT_LOCATION "/Applications")
+#  else(CMAKE_PACKAGE_QTGUI)
+#    set(CPACK_PACKAGE_DEFAULT_LOCATION "/usr")
+#  endif(CMAKE_PACKAGE_QTGUI)
+#endif("${CPACK_GENERATOR}" STREQUAL "PackageMaker")
+
+
+SET( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ )
+SET( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ )

ChangeLog

@@ -1,3 +1,65 @@
+Version 0.1.0:
+    * Fixed stations so they resolve against all available sources instead of
+      only local and friend's collections.
+    * Add a Song seed for stations and automatic playlists, and allow dragging of
+      any tracks to the New Stations entry to create a pre-seeded station.
+    * Added auto-completion for artists while filling in a station or automatic
+      playlist.
+    * SOCKS5 proxy support. Noproxy hosts are also supported but no wildcard
+      support (yet).
+    * Support loading of - and exporting to - .xspf playlists
+    * Added Tomahawk:// protocol support and share links for many things including
+      tracks, playlists, and stations.
+    * Autoload automatically detected resolvers on startup.
+    * Fix issue where track resolving spinner never stopped if tracks were
+      removed from playlist while resolving.
+    * Twitter & Jabber profile pictures are shown.
+    * Fix issues with stations where multiple tracks could be added at once.
+    * Allow multiple accounts of the same type.
+    * Add new Google account type that is a thin wrapper around a Jabber plugin.
+    * Overhaul the settings dialog interface.
+    * Resolvers can now be enabled and disabled, and some can be configured
+      directly in Tomahawk, for example the new Spotify resolver.
+    * Split playlists and stations in sources sidebar. Show Recently Played
+      as a node under the Super Collection.
+    * Fix massive speed bottleneck on startup in the case of many recently
+      played playlists.
+    * Removed filter and song view from Super Collection, coming back in the next
+      release.
+    * Browse and play collections in our snappy tree-mode, which also shows
+      images for artists and albums.
+    * Fixed crash that could occur when playing a track from a browser.
+    * Fixed a crash caused by sources going on or offline.
+    * Huge optimizations in the resolving pipeline.
+    * Improved the handling of automatic status messages for Google Talk
+    * Switch to Phonon sound system, allowing us to support a wide variety
+      of audio formats.
+    * UI tweaks and cleanup.
+    * (OS X) Open configuration dialogs as sliding sheets.
+    * (OS X) Increase our available file watches to the maximum that the system
+      reports.
+    * (OS X) Added 'Window' menu with zoom/minimize actions
+
+Version 0.0.3:
+    * Show spinner while resolving playlists.
+    * Go back to previous page visible when deleting a playlist.
+    * Fixed issue where automatic playlists and station summaries were not
+      updated in the playlist header.
+    * Fixed an issue which caused duplicate items when rescanning.
+    * Revert change introduced in 0.0.2 causing Twitter protocol to not try
+      to reconnect to a peer if it couldn't connect the first time the plugin
+      was connected. This caused confusing (and for most unwanted) behavior.
+    * Fix crashes in Twitter authentication.
+    * Properly honor the chosen port number if a static host and port are
+      marked as preferred.
+    * Don't automatically try to resolve all incoming playback logs. This
+      speeds up importing sources a lot.
+    * Faster painting of playlists with lots of unresolved tracks.
+    * Prefer local results when results' score is equal.
+    * (Windows) The tomahawk:// protocol handler works on Windows now.
+    * (Windows) Fixed launching Tomahawk from Windows installer with admin privileges.
+    * (Windows) Prevent launching a second instance on Windows.
+
 Version 0.0.2:
     * Don't reconnect to Jabber if the settings dialog is closed successfully
       but the Jabber settings haven't changed.
@@ -12,7 +74,6 @@ Version 0.0.2:
       the Tomahawk XMPP presence.
     * Incompatible change: Twitter SIP protocol has changed slightly. 0.0.1
       clients will not be able to talk to newer clients.
-    * Hopefully fixed crashes during Twitter authentication.
     * Don't let long playlist or summary names force a large Tomahawk window.
     * Tomahawk now asks you to authorize new contacts.
 

README

@@ -1,82 +1,27 @@
-Quickstart on Ubuntu
---------------------
-
-    $ sudo apt-get install build-essential cmake libtag1c2a libtag1-dev liblastfm-dev libqt4-dev \
-                           libqt4-sql-sqlite libvorbis-dev libmad0-dev libflac++-dev libasound2-dev \
-                           libboost-dev zlib1g-dev libgnutls-dev pkg-config
-
-
-Gloox 1.0 (XMPP library)
-------------------------
- On Ubuntu 10.10 (and higher):
-    $ sudo apt-get install libgloox-dev
-
- Otherwise see: http://camaya.net/glooxdownload
- You need to build gloox 1.0 from source, Ubuntu 10.04 only packages version 0.9.
-
- Download and unpack tarball:
-    $ ./configure --without-openssl --with-gnutls --without-libidn --with-zlib --without-examples --without-tests
-    $ CXXFLAGS=-fPIC make
-    $ sudo make install
-
-QJson (Qt JSON library)
------------------------
- On Ubuntu 10.04 (and higher):
-    $ sudo apt-get install libqjson-dev
-
- Otherwise see: http://sourceforge.net/projects/qjson/files/ (developed using version 0.7.1)
-
- Download and unpack tarball:
-    $ ./configure && make
-    $ sudo make install
-
-libEchonest 1.1.4
----------------
- See: http://projects.kde.org/projects/playground/libs/libechonest/
-
- Download and unpack tarball:
-    $ mkdir build && cd build
-    $ cmake ..
-    $ make
-    $ sudo make install
-
-CLucene 0.9.23
----------------
- See: http://clucene.sourceforge.net/download.shtml
-
- Clone from git and build CLucene:
-    $ git clone git://clucene.git.sourceforge.net/gitroot/clucene/clucene
-    $ cd clucene && mkdir build && cd build
-    $ cmake ..
-    $ make
-    $ sudo make install
-
-
-Quickstart on OS X
+Compiling Tomahawk
 ------------------
 
- Install homebrew
-    $ ruby -e "$(curl -fsSL https://gist.github.com/raw/323731/install_homebrew.rb)"
-    $ brew install cmake qt qjson gloox libmad libvorbis flac taglib boost liblastfm
-
- Install libEchnoest & CLucene as per the above instructions.
-
- If liblastfm gives problems, do the below:
-    $ brew edit liblastfm
- Change the url to https://github.com/davidsansome/liblastfm/tarball/0.3.1
-    $ brew install liblastfm
- Copy the md5 hash it returns.
-    $ brew edit liblastfm
- Replace the md5 hash with the new one you copied.
-    $ brew install liblastfm
-
-
-Now compile Tomahawk
---------------------
     $ mkdir build && cd build
     $ cmake ..
     $ make
+
+ Start the application on Linux:
     $ ./tomahawk
+ Start the application on OS X:
+    $ open tomahawk.app
+
+
+Detailed building instructions for Ubuntu
+-----------------------------------------
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_Ubuntu_Binary_on_Maverick_(10.10)
+
+Detailed building instructions for OS X
+---------------------------------------
+ See: http://wiki.tomahawk-player.org/mediawiki/index.php/Building_OS_X_Application_Bundle_on_Snow_Leopard_(10.6)
+
+Doxygen Documentation
+---------------------
+ See: http://dev.tomahawk-player.org/api/classes.html
 
 
 Dependencies
@@ -85,40 +30,15 @@ Dependencies
   CMake 2.8.0 http://www.cmake.org/
   Qt 4.7.0 http://qt.nokia.com/
   QJson 0.7.1 http://qjson.sourceforge.net/
-  Gloox 1.0 (0.9.x will fail) http://camaya.net/gloox/
   SQLite 3.6.22 http://www.sqlite.org/
   TagLib 1.6.2 http://developer.kde.org/~wheeler/taglib.html
   Boost 1.3x http://www.boost.org/
   CLucene 0.9.23 (0.9.21 will fail) http://clucene.sourceforge.net/download.shtml
-  libmad 0.15.1b http://www.underbit.com/products/mad/
-  libvorbis 1.2.3 http://xiph.org/vorbis/
-  libogg 1.1.4 http://xiph.org/ogg/
-  libflac++ 1.2.0 http://flac.sourceforge.net/
-  liblastfm 0.3.3 http://github.com/mxcl/liblastfm/
-  libechonest 1.1.4 http://projects.kde.org/projects/playground/libs/libechonest/
+  libechonest 1.1.8 http://projects.kde.org/projects/playground/libs/libechonest/
 
  Third party libraries that we ship with our source:
 
-  RtAudio 4.0.7 http://www.music.mcgill.ca/~gary/rtaudio/
   MiniUPnP http://miniupnp.free.fr/
-
-
-To build the app:
------------------
-    $ mkdir build && cd build
-    $ cmake ..
-    $ make
-
-To run the app:
----------------
- Only run the next two commands if you installed any of the dependencies from source on Linux.
-    $ export LD_LIBRARY_PATH=/usr/local/lib:$LD_LIBRARY_PATH
-    $ sudo ldconfig -v
-
- Start the application on Linux:
-    $ ./tomahawk
-
- Start the application on OS X:
-    $ open tomahawk.app
+  liblastfm 0.4.0 http://github.com/jonocole/liblastfm/
 
 Enjoy!

admin/mac/Info.plist

@@ -13,9 +13,9 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleVersion</key>
-	<string>0.0.2.0</string>
+	<string>TOMAHAWK_VERSION</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.0.2</string>
+	<string>TOMAHAWK_VERSION</string>
 	<key>CFBundleSignature</key>
 	<string>tomahawk</string>
 	<key>CFBundleIconFile</key>

admin/mac/add-Qt-to-bundle.sh

@@ -46,10 +46,18 @@ shift
 mkdir -p Contents/MacOS
 mkdir -p Contents/MacOS/sqldrivers
 mkdir -p Contents/MacOS/imageformats
+mkdir -p Contents/MacOS/phonon_backend
+mkdir -p Contents/MacOS/crypto
 
 cp -R $QT_PLUGINS_DIR/sqldrivers/libqsqlite.dylib Contents/MacOS/sqldrivers/
 cp -R $QT_PLUGINS_DIR/imageformats/libqgif.dylib Contents/MacOS/imageformats/
 cp -R $QT_PLUGINS_DIR/imageformats/libqjpeg.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqico.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/imageformats/libqmng.dylib Contents/MacOS/imageformats/
+#cp -R $QT_PLUGINS_DIR/imageformats/libqsvg.dylib Contents/MacOS/imageformats/
+#cp -R $QT_PLUGINS_DIR/imageformats/libqtiff.dylib Contents/MacOS/imageformats/
+cp -R $QT_PLUGINS_DIR/crypto/libqca-ossl.dylib Contents/MacOS/crypto/
+cp -R $QT_PLUGINS_DIR/phonon_backend/phonon_vlc.so Contents/MacOS/phonon_backend/
 
 #cleanup
 find Contents/Frameworks -name Headers -o -name \*.prl -o -name \*_debug | xargs rm -rf

admin/mac/add-spotify.sh

@@ -0,0 +1,16 @@
+#!/bin/sh
+# author: lfranchi@kde.org
+# usage:  Run from inside the bundle root directory, eg. Tomahawk.app
+#         The first parameter should be the spotify resolver binary to copy.
+# eg:     add-spotify.sh /path/to/spotify_tomahawkresolver
+################################################################################
+
+mkdir -p Contents/Frameworks
+cp -R /Library/Frameworks/libspotify.framework Contents/Frameworks
+
+install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtCore.framework/Versions/4/QtCore  @executable_path/../Frameworks/QtCore.framework/Versions/4/QtCore $1
+install_name_tool -change /usr/local/Cellar/qt/4.7.3/lib/QtNetwork.framework/Versions/4/QtNetwork  @executable_path/../Frameworks/QtNetwork.framework/Versions/4/QtNetwork $1
+install_name_tool -change libqjson.0.dylib  @executable_path/libqjson.0.7.1.dylib $1
+install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
+mkdir -p Contents/MacOS
+cp $1 Contents/MacOS/

admin/mac/build-release-osx.sh

@@ -36,7 +36,7 @@ echo "Goes here: $QTDIR"
 export QMAKESPEC='macx-g++'
 export QTDIR
 export VERSION
-export QTVERSION='4.7.2'
+export QTVERSION='4.7.3'
 ################################################################################
 
 
@@ -50,20 +50,35 @@ VERSION=$1
     cd tomahawk.app
     $ROOT/../admin/mac/add-Qt-to-bundle.sh \
                    'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit phonon'
-
-    header "Running install_name_tool"
-    $ROOT/../admin/mac/deposx.sh
+#                   'QtCore QtGui QtXml QtNetwork QtSql QtXmlPatterns QtWebKit QtDbus phonon'
 
     header "Renaming files"
     mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
     mv Contents/MacOS/tomahawk Contents/MacOS/Tomahawk
 #    cp $ROOT/../admin/mac/Info.plist Contents/Info.plist
 
+    header "Copying VLC plugins into bundle"
+    mkdir -p Contents/plugins
+    cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/ Contents/plugins
+    rm -rf Contents/plugins/video_* Contents/plugins/gui Contents/plugins/*/libold* Contents/plugins/*/libvcd* Contents/plugins/*/libdvd* \
+           Contents/plugins/*/liblibass* Contents/plugins/*/libx264* Contents/plugins/*/libschroe* Contents/plugins/*/liblibmpeg2* \
+           Contents/plugins/*/libstream_out_* Contents/plugins/*/libmjpeg_plugin* Contents/plugins/*/libh264_plugin* Contents/plugins/*/libzvbi_plugin* Contents/plugins/*/lib*sub*
+
+    header "Running install_name_tool"
+    $ROOT/../admin/mac/deposx.sh
+
     header "Copying Sparkle pubkey & framework, and qt.conf"
     cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
     cp $ROOT/../admin/mac/qt.conf Contents/Resources
 
+    header "Adding spotify resolver to bundle if spotify_tomahawkresolver found in $ROOT"
+    if [ -e $ROOT/spotify_tomahawkresolver ]
+       then
+        header "Found, so adding spotify resolver."ac
+        $ROOT/../admin/mac/add-spotify.sh $ROOT/spotify_tomahawkresolver
+    fi
+
     header "Creating DMG"
     cd ..
     mv tomahawk.app Tomahawk.app

admin/mac/deposx.sh

@@ -23,6 +23,8 @@ cd Contents
 
 QTLIBS=`ls Frameworks | cut -d. -f1`
 LIBS=`cd MacOS && ls -fR1 | grep dylib`
+PLUGINFOLDERS=`ls plugins | cut -d. -f1`
+
 ################################################################################
 
 
@@ -48,7 +50,11 @@ function deposx_change
 
         install_name_tool -change /usr/local/Cellar/qt/$QTVERSION/lib/$y.framework/Versions/4/$y \
                           @executable_path/../Frameworks/$y.framework/Versions/4/$y \
-                          "$1"                          
+                          "$1"
+
+        install_name_tool -change /usr/X11/lib/libpng12.0.dylib \
+                          @executable_path/libpng12.0.dylib \
+                          "$1"
     done
     
     for y in $LIBS
@@ -61,30 +67,39 @@ function deposx_change
 
 function deplib_change
 {
-    install_name_tool -change /usr/local/Cellar/liblastfm/0.3.3/lib/liblastfm.0.dylib @executable_path/liblastfm.0.dylib $1
     install_name_tool -change /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
     install_name_tool -change /usr/local/lib/libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
-    install_name_tool -change /usr/local/lib/libclucene-core.0.9.23.dylib @executable_path/libclucene-core.0.9.23.dylib $1
-    install_name_tool -change /usr/local/lib/libclucene-shared.0.9.23.dylib @executable_path/libclucene-shared.0.9.23.dylib $1
-    install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1
-    install_name_tool -change /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib @executable_path/libtag.1.dylib $1
-    install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1
-    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib @executable_path/libvorbis.0.dylib $1
-    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib @executable_path/libvorbisfile.3.dylib $1
-    install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1
-    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1
-    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1
-    install_name_tool -change $ORIGROOT/src/libtomahawk/libtomahawklib.dylib @executable_path/libtomahawklib.dylib $1
+    install_name_tool -change /usr/local/lib/libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1
+    install_name_tool -change /usr/local/lib/libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1
+    install_name_tool -change /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib @executable_path/libtag.1.7.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib @executable_path/libgloox.8.dylib $1
+#    install_name_tool -change /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib @executable_path/libogg.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib @executable_path/libvorbis.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib @executable_path/libvorbisfile.3.dylib $1
+#    install_name_tool -change /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib @executable_path/libmad.0.dylib $1
+#    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib @executable_path/libFLAC++.6.dylib $1
+#    install_name_tool -change /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib @executable_path/libFLAC.8.dylib $1
+    install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib  @executable_path/libphonon.4.dylib $1
+    install_name_tool -change /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.5.0.dylib  @executable_path/libphonon.4.dylib $1
+
+    install_name_tool -change $ORIGROOT/libtomahawklib.dylib @executable_path/libtomahawklib.dylib $1
     install_name_tool -change $ORIGROOT/libtomahawk_sipjabber.dylib @executable_path/libtomahawk_sipjabber.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_sipgoogle.dylib @executable_path/libtomahawk_sipgoogle.dylib $1
     install_name_tool -change $ORIGROOT/libtomahawk_siptwitter.dylib @executable_path/libtomahawk_siptwitter.dylib $1
     install_name_tool -change $ORIGROOT/libtomahawk_sipzeroconf.dylib @executable_path/libtomahawk_sipzeroconf.dylib $1
-    install_name_tool -change $ORIGROOT/thirdparty/jdns/libtomahawk_jdns.dylib @executable_path/libtomahawk_jdns.dylib $1
-    install_name_tool -change $ORIGROOT/thirdparty/qtweetlib/libtomahawk_qtweetlib.dylib @executable_path/libtomahawk_qtweetlib.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_qtweetlib.dylib @executable_path/libtomahawk_qtweetlib.dylib $1
+    install_name_tool -change $ORIGROOT/libtomahawk_portfwd.dylib @executable_path/libtomahawk_portfwd.dylib $1
+    install_name_tool -change $ORIGROOT/libjreen.dylib  @executable_path/libjreen.dylib $1
+    install_name_tool -change /usr/local/Cellar/jreen/HEAD/lib/libjreen.dylib  @executable_path/libjreen.dylib $1
+    install_name_tool -change /usr/local/Cellar/qca/2.0.2/lib/qca.framework/Versions/2/qca  @executable_path/../Frameworks/qca.framework/Versions/2/qca $1
+    install_name_tool -change /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib  @executable_path/libintl.8.dylib $1
+    install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib   @executable_path/libvlc.5.dylib $1
+    install_name_tool -change /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib  @executable_path/libvlccore.4.dylib $1
 
-    install_name_tool -change libqjson.0.7.1.dylib @executable_path/libqjson.0.7.1.dylib $1
+    install_name_tool -change libqjson.0.dylib @executable_path/libqjson.0.7.1.dylib $1
     install_name_tool -change libechonest.1.1.dylib @executable_path/libechonest.1.1.dylib $1
-    install_name_tool -change libclucene-core.0.9.23.dylib @executable_path/libclucene-core.0.9.23.dylib $1
-    install_name_tool -change libclucene-shared.0.9.23.dylib @executable_path/libclucene-shared.0.9.23.dylib $1
+    install_name_tool -change libclucene-core.1.dylib @executable_path/libclucene-core.1.dylib $1
+    install_name_tool -change libclucene-shared.1.dylib @executable_path/libclucene-shared.1.dylib $1
 }
 
 ################################################################################
@@ -100,25 +115,36 @@ do
 done
 
 import_lib /usr/local/Cellar/qjson/0.7.1/lib/libqjson.0.7.1.dylib
-import_lib /usr/local/Cellar/liblastfm/0.3.3/lib/liblastfm.0.dylib
-import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib
-import_lib /usr/local/Cellar/taglib/1.6.3/lib/libtag.1.dylib
-import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib
-import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib
-import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib
-import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib
-import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib
-import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib
+import_lib /usr/local/Cellar/taglib/1.7/lib/libtag.1.7.0.dylib
+#import_lib /usr/local/Cellar/gloox/1.0/lib/libgloox.8.dylib
+#import_lib /usr/local/Cellar/libogg/1.2.0/lib/libogg.0.dylib
+#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbis.0.dylib
+#import_lib /usr/local/Cellar/libvorbis/1.3.1/lib/libvorbisfile.3.dylib
+#import_lib /usr/local/Cellar/mad/0.15.1b/lib/libmad.0.dylib
+#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC++.6.dylib
+#import_lib /usr/local/Cellar/flac/1.2.1/lib/libFLAC.8.dylib
 import_lib /usr/local/lib/libechonest.1.1.dylib
-import_lib /usr/local/lib/libclucene-core.0.9.23.dylib
-import_lib /usr/local/lib/libclucene-shared.0.9.23.dylib
+import_lib /usr/local/lib/libclucene-core.1.dylib
+import_lib /usr/local/lib/libclucene-shared.1.dylib
+import_lib /usr/local/Cellar/kde-phonon/4.5.0/lib/libphonon.4.dylib
+import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlc.5.dylib
+import_lib /usr/local/Cellar/vlc-git/HEAD/lib/libvlccore.4.dylib
+import_lib /usr/local/Cellar/gettext/0.18.1.1/lib/libintl.8.dylib
+import_lib /usr/X11/lib/libpng12.0.dylib
 
-import_lib ../../libtomahawk_sipjabber.dylib
-import_lib ../../libtomahawk_siptwitter.dylib
-import_lib ../../libtomahawk_sipzeroconf.dylib
-import_lib ../../src/libtomahawk/libtomahawklib.dylib
-import_lib ../../thirdparty/jdns/libtomahawk_jdns.dylib
-import_lib ../../thirdparty/qtweetlib/libtomahawk_qtweetlib.dylib
+import_lib $ORIGROOT/libjreen.dylib
+import_lib $ORIGROOT/libtomahawklib.dylib
+import_lib $ORIGROOT/libtomahawk_sipjabber.dylib
+import_lib $ORIGROOT/libtomahawk_sipgoogle.dylib
+import_lib $ORIGROOT/libtomahawk_siptwitter.dylib
+import_lib $ORIGROOT/libtomahawk_sipzeroconf.dylib
+import_lib $ORIGROOT/libtomahawk_qtweetlib.dylib
+import_lib $ORIGROOT/libtomahawk_portfwd.dylib
+
+cp -R  /usr/local/Cellar/qca/2.0.2/lib/qca.framework Frameworks/
+chmod 644 Frameworks/qca.framework/Versions/2/qca
+deplib_change Frameworks/qca.framework/Versions/2/qca
+deposx_change Frameworks/qca.framework/Versions/2/qca
 
 # now Qt
 for x in $QTLIBS
@@ -128,4 +154,16 @@ do
     deposx_change Frameworks/$x.framework/Versions/4/$x
     install_name_tool -id @executable_path/../Frameworks/$x.framework/Versions/4/$x \
                       Frameworks/$x.framework/Versions/4/$x
+    deplib_change "Frameworks/$x.framework/Versions/4/$x"
+done
+
+# now VLC plugins
+for x in plugins/$PLUGINFOLDERS
+do
+    for plugin in `ls plugins/$x | cut -f1`
+    do
+        echo "Fixing VLC plugin: $plugin"
+        chmod 644 plugins/$x/$plugin
+        deplib_change plugins/$x/$plugin
+    done
 done

admin/mac/qt.conf

@@ -1,2 +1,2 @@
 [Paths]
-Plugins = PlugIns
+Plugins = plugins

admin/mac/sparkle-beta.rss

@@ -16,10 +16,10 @@
          <item>
             <title>Version 0.0.2 (Tomahawk Player Beta - It Lives?)</title>
 						<sparkle:releaseNotesLink>
-						https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
+						https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
 						</sparkle:releaseNotesLink>
             <pubDate>Mon, 28 Mar 2011 06:13:01 +0100</pubDate>
-            <enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19835237" type="application/octet-stream" sparkle:dsaSignature="MCwCFGb6yhKUO3+lH3eNaURvwtctLVMUAhQM8mp8yEwcU3ZoaJMTqb387dYccA==" />
+            <enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19831287" type="application/octet-stream" sparkle:dsaSignature="MC0CFC0Hwq9x9BWMF/8sA+c5KfzKoBzFAhUAk9r0IJlxQf9qEJk4IL6bbTWTiuI=" />
          </item>
    </channel>
 </rss>

admin/mac/sparkle.rss

@@ -16,10 +16,10 @@
          <item>
             <title>Version 0.0.2 (Tomahawk Player - It Lives!)</title>
 						<sparkle:releaseNotesLink>
-						https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
+						https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
 						</sparkle:releaseNotesLink>
             <pubDate>Mon, 28 Mar 2011 06:13:01 +0100</pubDate>
-            <enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19835237" type="application/octet-stream" sparkle:dsaSignature="MCwCFGb6yhKUO3+lH3eNaURvwtctLVMUAhQM8mp8yEwcU3ZoaJMTqb387dYccA==" />
+            <enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19831287" type="application/octet-stream" sparkle:dsaSignature="MC0CFC0Hwq9x9BWMF/8sA+c5KfzKoBzFAhUAk9r0IJlxQf9qEJk4IL6bbTWTiuI=" />
          </item>
    </channel>
 </rss>

admin/unix/tomahawk.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Tomahawk
+GenericName=Music Player
+TryExec=tomahawk
+Exec=tomahawk
+Comment=Tomahawk - Social Music Player
+Icon=tomahawk
+Terminal=false
+Categories=Qt;AudioVideo;Audio;Player;

admin/unix/tomahawk.protocol

@@ -1,5 +1,5 @@
 [Protocol]
-exec=/home/leo/kde/tomahawk/build/tomahawk "%u"
+exec=/path/to/binary "%u"
 protocol=tomahawk
 input=none
 output=none

admin/win/Toolchain-mingw32-openSUSE.cmake

@@ -2,8 +2,8 @@
 SET(CMAKE_SYSTEM_NAME Windows)
 
 # specify the cross compiler
-SET(CMAKE_C_COMPILER i686-w64-mingw32-gcc)
-SET(CMAKE_CXX_COMPILER i686-w64-mingw32-g++)
+SET(CMAKE_C_COMPILER ccache i686-w64-mingw32-gcc)
+SET(CMAKE_CXX_COMPILER ccache i686-w64-mingw32-g++)
 
 # where is the target environment containing libraries
 SET(CMAKE_FIND_ROOT_PATH  /usr/i686-w64-mingw32/sys-root/mingw)

admin/win/nsi/nsis_processes/license.rtf

@@ -0,0 +1,35 @@
+{\rtf1\ansi\ansicpg1252\uc1\deff0\stshfdbch0\stshfloch0\stshfhich0\stshfbi0\deflang1033\deflangfe1033{\fonttbl{\f0\froman\fcharset0\fprq2{\*\panose 02020603050405020304}Times New Roman;}{\f39\fswiss\fcharset0\fprq2{\*\panose 020b0604030504040204}Verdana;}
+{\f172\froman\fcharset238\fprq2 Times New Roman CE;}{\f173\froman\fcharset204\fprq2 Times New Roman Cyr;}{\f175\froman\fcharset161\fprq2 Times New Roman Greek;}{\f176\froman\fcharset162\fprq2 Times New Roman Tur;}
+{\f177\froman\fcharset177\fprq2 Times New Roman (Hebrew);}{\f178\froman\fcharset178\fprq2 Times New Roman (Arabic);}{\f179\froman\fcharset186\fprq2 Times New Roman Baltic;}{\f180\froman\fcharset163\fprq2 Times New Roman (Vietnamese);}
+{\f562\fswiss\fcharset238\fprq2 Verdana CE;}{\f563\fswiss\fcharset204\fprq2 Verdana Cyr;}{\f565\fswiss\fcharset161\fprq2 Verdana Greek;}{\f566\fswiss\fcharset162\fprq2 Verdana Tur;}{\f569\fswiss\fcharset186\fprq2 Verdana Baltic;}
+{\f570\fswiss\fcharset163\fprq2 Verdana (Vietnamese);}}{\colortbl;\red0\green0\blue0;\red0\green0\blue255;\red0\green255\blue255;\red0\green255\blue0;\red255\green0\blue255;\red255\green0\blue0;\red255\green255\blue0;\red255\green255\blue255;
+\red0\green0\blue128;\red0\green128\blue128;\red0\green128\blue0;\red128\green0\blue128;\red128\green0\blue0;\red128\green128\blue0;\red128\green128\blue128;\red192\green192\blue192;}{\stylesheet{
+\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 \snext0 Normal;}{\*\cs10 \additive \ssemihidden Default Paragraph Font;}{\*
+\ts11\tsrowd\trftsWidthB3\trpaddl108\trpaddr108\trpaddfl3\trpaddft3\trpaddfb3\trpaddfr3\trcbpat1\trcfpat1\tscellwidthfts0\tsvertalt\tsbrdrt\tsbrdrl\tsbrdrb\tsbrdrr\tsbrdrdgl\tsbrdrdgr\tsbrdrh\tsbrdrv 
+\ql \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0 \fs20\lang1024\langfe1024\cgrid\langnp1024\langfenp1024 \snext11 \ssemihidden Normal Table;}{\*\cs15 \additive \ul\cf2 \sbasedon10 \styrsid7485074 Hyperlink;}}
+{\*\latentstyles\lsdstimax156\lsdlockeddef0}{\*\rsidtbl \rsid6712196\rsid7485074\rsid11352300\rsid15940516}{\*\generator Microsoft Word 11.0.5604;}{\info{\title Processes v1}{\author Hardwired}{\operator Hardwired}{\creatim\yr2004\mo12\dy12\hr23\min42}
+{\revtim\yr2004\mo12\dy12\hr23\min51}{\version2}{\edmins9}{\nofpages1}{\nofwords80}{\nofchars458}{\nofcharsws537}{\vern24689}}\widowctrl\ftnbj\aenddoc\noxlattoyen\expshrtn\noultrlspc\dntblnsbdb\nospaceforul\formshade\horzdoc\dgmargin\dghspace180
+\dgvspace180\dghorigin1800\dgvorigin1440\dghshow1\dgvshow1
+\jexpand\viewkind1\viewscale100\pgbrdrhead\pgbrdrfoot\splytwnine\ftnlytwnine\htmautsp\nolnhtadjtbl\useltbaln\alntblind\lytcalctblwd\lyttblrtgr\lnbrkrule\nobrkwrptbl\snaptogridincell\allowfieldendsel\wrppunct
+\asianbrkrule\rsidroot7485074\newtblstyruls\nogrowautofit \fet0\sectd \linex0\endnhere\sectlinegrid360\sectdefaultcl\sftnbj {\*\pnseclvl1\pnucrm\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl2\pnucltr\pnstart1\pnindent720\pnhang {\pntxta .}}
+{\*\pnseclvl3\pndec\pnstart1\pnindent720\pnhang {\pntxta .}}{\*\pnseclvl4\pnlcltr\pnstart1\pnindent720\pnhang {\pntxta )}}{\*\pnseclvl5\pndec\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl6\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}
+{\pntxta )}}{\*\pnseclvl7\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl8\pnlcltr\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}{\*\pnseclvl9\pnlcrm\pnstart1\pnindent720\pnhang {\pntxtb (}{\pntxta )}}\pard\plain 
+\qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid7485074 \fs24\lang1033\langfe1033\cgrid\langnp1033\langfenp1033 {\b\f39\insrsid7485074\charrsid7485074 Processes v1.0}{\f39\insrsid7485074\charrsid7485074 .0.1
+\par }{\f39\fs20\insrsid7485074 
+\par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid15940516 {\f39\fs20\insrsid15940516 This software binaries and source-code are free for any kind of use, including commercial use. }{
+\f39\fs20\insrsid7485074\charrsid7485074 There is no restriction and no guaranty for using}{\f39\fs20\insrsid7485074\charrsid7485074  t}{\f39\fs20\insrsid7485074\charrsid7485074 his software}{\f39\fs20\insrsid7485074\charrsid7485074  and/or it
+s source-code. }{\f39\fs20\insrsid15940516 
+\par I}{\f39\fs20\insrsid7485074\charrsid7485074 f you use the plug}{\f39\fs20\insrsid7485074\charrsid7485074 -}{\f39\fs20\insrsid7485074\charrsid7485074 in }{\f39\fs20\insrsid7485074\charrsid7485074 and/}{\f39\fs20\insrsid7485074\charrsid7485074 or it}{
+\f39\fs20\insrsid7485074\charrsid7485074 s}{\f39\fs20\insrsid7485074\charrsid7485074  source-code, I would }{\f39\fs20\insrsid7485074\charrsid7485074 appreciate }{\f39\fs20\insrsid7485074\charrsid7485074 if my name is mentioned.}{
+\f39\fs20\insrsid7485074\charrsid7485074 
+\par }\pard \qj \li0\ri0\widctlpar\aspalpha\aspnum\faauto\adjustright\rin0\lin0\itap0\pararsid7485074 {\f39\fs20\insrsid7485074\charrsid7485074 
+\par }{\b\f39\fs20\insrsid7485074\charrsid7485074 Andrei Ciubotaru [Hardwired]
+\par }{\f39\fs20\insrsid7485074\charrsid7485074 Lead Developer ICode&Ideas SRL (}{\field\flddirty{\*\fldinst {\f39\fs20\insrsid7485074\charrsid7485074  HYPERLINK "http://www.icode.ro/" }{\f39\fs20\insrsid7485074\charrsid7485074 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000170000001500000068007400740070003a002f002f007700770077002e00690063006f00640065002e0072006f002f000000e0c9ea79f9bace118c8200aa004ba90b2a00000068007400740070003a002f002f007700770077002e00690063006f00640065002e007200
+6f002f000000}}}{\fldrslt {\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 http://www.icode.ro/}}}{\f39\fs20\insrsid7485074\charrsid7485074 )
+\par }{\field{\*\fldinst {\f39\fs20\insrsid7485074  HYPERLINK "hardwiredteks@gmail.com" }{\f39\fs20\insrsid15940516\charrsid7485074 {\*\datafield 
+00d0c9ea79f9bace118c8200aa004ba90b02000000010000000303000000000000c00000000000004600001800000068617264776972656474656b7340676d61696c2e636f6d00ffffadde000000000000000000000000000000000000000000000000}}}{\fldrslt {
+\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 hardwiredteks@gmail.com}}}{\f39\fs20\insrsid7485074\charrsid7485074 , }{\field{\*\fldinst {\f39\fs20\insrsid7485074  HYPERLINK "hardwired@icode.ro" }{\f39\fs20\insrsid15940516\charrsid7485074 
+{\*\datafield 00d0c9ea79f9bace118c8200aa004ba90b02000000010000000303000000000000c0000000000000460000130000006861726477697265644069636f64652e726f00ffffadde000000000000000000000000000000000000000000000000}}}{\fldrslt {
+\cs15\f39\fs20\ul\cf2\insrsid7485074\charrsid7485074 hardwired@icode.ro}}}{\f39\fs20\insrsid7485074\charrsid7485074 
+\par }}

admin/win/nsi/nsis_processes/readme.txt

@@ -0,0 +1,122 @@
+----------------------------------------------------------------
+----------------------------------------------------------------
+Processes (Processes.dll)
+Version:	1.0.1.0
+Release:	24.february.2005
+Description:	Nullsoft Installer (NSIS) plug-in for managing?! 
+		Windows processes.
+
+Copyright:	<09> 2004-2005 Hardwired. No rights reserved.
+		There is no restriction and no guaranty for using
+		this software.
+
+Author:		Andrei Ciubotaru [Hardwired]
+		Lead Developer ICode&Ideas SRL (http://www.icode.ro/)
+		hardwiredteks@gmail.com, hardwired@icode.ro
+
+----------------------------------------------------------------
+----------------------------------------------------------------
+INTRODUCTION
+
+	The Need For Plug-in - I need it for the one of my installers.
+	
+	Briefly: Use it when you need to find\kill a process when
+installing\uninstalling some application. Also, use it when you 
+need to test the presence of a device driver.
+
+
+SUPPORT
+	
+	Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
+
+
+DESCRIPTION
+
+	Processes::FindProcess <process_name>	;without ".exe"
+	
+		Searches the currently running processes for the given
+		process name.
+		
+		return:	1	- the process was found
+			0	- the process was not found
+	
+	Processes::KillProcess <process_name>	; without ".exe"
+	
+		Searches the currently running processes for the given
+		process name. If the process is found then the it gets
+		killed.
+		
+		return:	1	- the process was found and killed
+			0	- the process was not found or the process
+						cannot be killed (insuficient rights)
+	
+	Processes::FindDevice <device_base_name>
+	
+		Searches the installed devices drivers for the given
+		device base name.
+		(important: I said BASE NAME not FILENAME)
+		
+		return:	1	- the device driver was found
+			0	- the device driver was not found
+				
+
+USAGE
+
+	First of all, does not matter where you use it. Ofcourse, the
+routines must be called inside of a Section/Function scope.
+
+	Processes::FindProcess "process_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" make_my_day noooooo
+	
+	make_my_day:
+		...
+	
+	noooooo:
+		...
+		
+	
+	Processes::KillProcess "process_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" dead_meat why_wont_you_die
+	
+	dead_meat:
+		...
+	
+	why_wont_you_die:
+		...
+		
+
+	Processes::FindDevice "device_base_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" blabla more_blabla
+	
+	blabla:
+		...
+	
+	more_blabla:
+		...
+		
+	
+THANKS
+
+	Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
+but my requirements made it imposible.
+
+	Nullsoft for creating this very powerfull installer. One big,
+free and full-featured (hmmm... and guiless for the moment) mean
+install machine!:)
+
+	ME for being such a great coder...
+						... HAHAHAHAHAHAHA!
+										
+ONE MORE THING
+
+	If you use the plugin or it's source-code, I would apreciate
+if my name is mentioned.
+
+----------------------------------------------------------------
+----------------------------------------------------------------

admin/win/nsi/nsis_processes/src/StdAfx.cpp

@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+//	KillProcDLL.pch will be the pre-compiled header
+//	stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

admin/win/nsi/nsis_processes/src/StdAfx.h

@@ -0,0 +1,34 @@
+// stdafx.h : include file for standard system include files,
+//  or project specific include files that are used frequently, but
+//      are changed infrequently
+//
+
+#if !defined(AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_)
+#define AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_
+
+#if _MSC_VER > 1000
+#pragma once
+#endif // _MSC_VER > 1000
+
+#define WIN32_LEAN_AND_MEAN		// Exclude rarely-used stuff from Windows headers
+
+#include <windows.h>
+
+#include <string> // String management...
+
+//From exam28.cpp
+#include <tlhelp32.h>
+//#include <iostream.h>
+
+#ifdef BORLANDC
+  #include <string.h>
+  #include <ctype.h>
+#endif
+
+//To make it a NSIS Plug-In
+#include "exdll.h"
+
+//{{AFX_INSERT_LOCATION}}
+// Microsoft Visual C++ will insert additional declarations immediately before the previous line.
+
+#endif // !defined(AFX_STDAFX_H__780690DC_E128_403D_BC07_780D1B2CC101__INCLUDED_)

admin/win/nsi/nsis_processes/src/exdll.c

@@ -0,0 +1,37 @@
+#include <windows.h>
+#include "exdll.h"
+
+HINSTANCE g_hInstance;
+
+HWND g_hwndParent;
+
+void __declspec(dllexport) myFunction(HWND hwndParent, int string_size, 
+                                      char *variables, stack_t **stacktop)
+{
+  g_hwndParent=hwndParent;
+
+  EXDLL_INIT();
+
+
+  // note if you want parameters from the stack, pop them off in order.
+  // i.e. if you are called via exdll::myFunction file.dat poop.dat
+  // calling popstring() the first time would give you file.dat,
+  // and the second time would give you poop.dat. 
+  // you should empty the stack of your parameters, and ONLY your
+  // parameters.
+
+  // do your stuff here
+  {
+    char buf[1024];
+    wsprintf(buf,"$0=%s\n",getuservariable(INST_0));
+    MessageBox(g_hwndParent,buf,0,MB_OK);
+  }
+}
+
+
+
+BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
+{
+  g_hInstance=hInst;
+	return TRUE;
+}

admin/win/nsi/nsis_processes/src/exdll.h

@@ -0,0 +1,136 @@
+#ifndef _EXDLL_H_
+#define _EXDLL_H_
+
+
+
+
+
+//
+// only include this file from one place in your DLL.
+// (it is all static, if you use it in two places it will fail)
+//
+#define EXDLL_INIT()           {  \
+        g_stringsize	= string_size; \
+        g_stacktop		= stacktop;      \
+        g_variables		= variables; }
+
+
+
+
+//
+// For page showing plug-ins
+//
+#define WM_NOTIFY_OUTER_NEXT (WM_USER+0x8)
+#define WM_NOTIFY_CUSTOM_READY (WM_USER+0xd)
+#define NOTIFY_BYE_BYE 'x'
+
+typedef struct _stack_t 
+{
+  struct _stack_t	*next;
+  char				text[1]; // this should be the length of string_size
+} stack_t;
+
+
+static unsigned int		g_stringsize;
+static stack_t			**g_stacktop;
+static char				*g_variables;
+
+enum
+{
+INST_0,         // $0
+INST_1,         // $1
+INST_2,         // $2
+INST_3,         // $3
+INST_4,         // $4
+INST_5,         // $5
+INST_6,         // $6
+INST_7,         // $7
+INST_8,         // $8
+INST_9,         // $9
+INST_R0,        // $R0
+INST_R1,        // $R1
+INST_R2,        // $R2
+INST_R3,        // $R3
+INST_R4,        // $R4
+INST_R5,        // $R5
+INST_R6,        // $R6
+INST_R7,        // $R7
+INST_R8,        // $R8
+INST_R9,        // $R9
+INST_CMDLINE,   // $CMDLINE
+INST_INSTDIR,   // $INSTDIR
+INST_OUTDIR,    // $OUTDIR
+INST_EXEDIR,    // $EXEDIR
+INST_LANG,      // $LANGUAGE
+__INST_LAST
+};
+
+
+
+
+
+//
+// utility functions (not required but often useful)
+//
+static int popstring( char *str )
+{
+  stack_t	*th;
+
+
+  if( !g_stacktop || 
+	  !*g_stacktop )
+	  return 1;
+
+  th			= (*g_stacktop);
+  lstrcpy( str, th->text );
+  *g_stacktop	= th->next;
+  GlobalFree( (HGLOBAL)th );
+
+  return 0;
+}
+
+
+
+
+static void pushstring( char *str )
+{
+  stack_t	*th;
+
+
+  if( !g_stacktop )
+	  return;
+
+  th			= (stack_t*)GlobalAlloc( GPTR, sizeof(stack_t) + g_stringsize );
+  lstrcpyn( th->text, str, g_stringsize );
+  th->next		= *g_stacktop;
+  *g_stacktop	= th;
+}
+
+
+
+
+
+static char *getuservariable( int varnum )
+{
+  if( varnum < 0 || 
+	  varnum >= __INST_LAST )
+	  return NULL;
+
+  return (g_variables + varnum*g_stringsize);
+}
+
+
+
+
+
+static void setuservariable( int varnum, char *var )
+{
+	if( var != NULL && 
+		varnum >= 0 && 
+		varnum < __INST_LAST ) 
+		lstrcpy( g_variables + varnum*g_stringsize, var );
+}
+
+
+
+#endif//_EXDLL_H_

admin/win/nsi/nsis_processes/src/processes.cpp

@@ -0,0 +1,411 @@
+#include "stdafx.h"
+#include "processes.h"
+#include "string.h"
+
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// global variables
+lpfEnumProcesses			EnumProcesses;
+lpfEnumProcessModules		EnumProcessModules;
+lpfGetModuleBaseName		GetModuleBaseName;
+lpfEnumDeviceDrivers		EnumDeviceDrivers;
+lpfGetDeviceDriverBaseName	GetDeviceDriverBaseName;
+
+HINSTANCE					g_hInstance;
+HWND						g_hwndParent;
+HINSTANCE					g_hInstLib;
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// main DLL entry
+BOOL WINAPI		_DllMainCRTStartup( HANDLE	hInst, 
+									ULONG	ul_reason_for_call,
+									LPVOID	lpReserved )
+{
+    g_hInstance		= (struct HINSTANCE__ *)hInst;
+
+    return TRUE;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// loads the psapi routines
+bool	LoadPSAPIRoutines( void )
+{
+	if( NULL == (g_hInstLib = LoadLibraryA( "PSAPI.DLL" )) )
+		return false;
+
+	EnumProcesses			= (lpfEnumProcesses)			GetProcAddress( g_hInstLib, "EnumProcesses" );
+	EnumProcessModules		= (lpfEnumProcessModules)		GetProcAddress( g_hInstLib, "EnumProcessModules" );
+	GetModuleBaseName		= (lpfGetModuleBaseName)		GetProcAddress( g_hInstLib, "GetModuleBaseNameA" );
+	EnumDeviceDrivers		= (lpfEnumDeviceDrivers)		GetProcAddress( g_hInstLib, "EnumDeviceDrivers" );
+	GetDeviceDriverBaseName	= (lpfGetDeviceDriverBaseName)	GetProcAddress( g_hInstLib, "GetDeviceDriverBaseNameA" );
+
+	if( ( NULL == EnumProcesses ) ||
+		( NULL == EnumProcessModules ) ||
+		( NULL == EnumDeviceDrivers ) ||
+		( NULL == GetModuleBaseName ) ||
+		( NULL == GetDeviceDriverBaseName ) )
+	{
+		FreeLibrary( g_hInstLib );
+
+		return false;
+	}
+
+	return true;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// free the psapi routines
+bool	FreePSAPIRoutines( void )
+{
+	EnumProcesses		= NULL;
+	EnumProcessModules	= NULL;
+	GetModuleBaseName	= NULL;
+	EnumDeviceDrivers	= NULL;
+
+	if( FALSE == FreeLibrary( g_hInstLib ) )
+		return false;
+
+	return true;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// find a process by name
+// return value:	true	- process was found
+//					false	- process not found
+bool	FindProc( char *szProcess )
+{
+	char		szProcessName[ 1024 ];
+	char		szCurrentProcessName[ 1024 ];
+	DWORD		dPID[ 1024 ];
+	DWORD		dPIDSize( 1024 );
+	DWORD		dSize( 1024 );
+	HANDLE		hProcess;
+	HMODULE		phModule[ 1024 ];
+
+  
+	//
+	// make the name lower case
+	//
+	memset( szProcessName, 0, 1024*sizeof(char) );
+	sprintf( szProcessName, "%s", szProcess );
+	strlwr( szProcessName );
+
+	//
+    // load PSAPI routines
+	//
+	if( false == LoadPSAPIRoutines() )
+		return false;
+
+	//
+	// enumerate processes names
+	//
+    if( FALSE == EnumProcesses( dPID, dSize, &dPIDSize ) )
+	{
+		FreePSAPIRoutines();
+
+		return false;
+	}
+
+	//
+	// walk trough and compare see if the process is running
+	//
+	for( int k( dPIDSize / sizeof( DWORD ) ); k >= 0; k-- )
+	{
+		memset( szCurrentProcessName, 0, 1024*sizeof(char) );
+
+		if( NULL != ( hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, dPID[ k ] ) ) )
+		{
+			if( TRUE == EnumProcessModules( hProcess, phModule, sizeof(HMODULE)*1024, &dPIDSize ) )
+				if( GetModuleBaseName( hProcess, phModule[ 0 ], szCurrentProcessName, 1024 ) > 0 )
+				{
+					strlwr( szCurrentProcessName );
+
+					if( NULL != strstr( szCurrentProcessName, szProcessName ) )
+					{
+						FreePSAPIRoutines();
+						CloseHandle( hProcess );
+
+						return true;
+					}
+				}
+
+			CloseHandle( hProcess );
+		}
+	}
+	
+	//
+	// free PSAPI routines
+	//
+	FreePSAPIRoutines();
+
+	return false;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// kills a process by name
+// return value:	true	- process was found
+//					false	- process not found
+bool	KillProc( char *szProcess )
+{
+	char		szProcessName[ 1024 ];
+	char		szCurrentProcessName[ 1024 ];
+	DWORD		dPID[ 1024 ];
+	DWORD		dPIDSize( 1024 );
+	DWORD		dSize( 1024 );
+	HANDLE		hProcess;
+	HMODULE		phModule[ 1024 ];
+
+  
+	//
+	// make the name lower case
+	//
+	memset( szProcessName, 0, 1024*sizeof(char) );
+	sprintf( szProcessName, "%s", szProcess );
+	strlwr( szProcessName );
+
+	//
+    // load PSAPI routines
+	//
+	if( false == LoadPSAPIRoutines() )
+		return false;
+
+	//
+	// enumerate processes names
+	//
+    if( FALSE == EnumProcesses( dPID, dSize, &dPIDSize ) )
+	{
+		FreePSAPIRoutines();
+
+		return false;
+	}
+
+	//
+	// walk trough and compare see if the process is running
+	//
+	for( int k( dPIDSize / sizeof( DWORD ) ); k >= 0; k-- )
+	{
+		memset( szCurrentProcessName, 0, 1024*sizeof(char) );
+
+		if( NULL != ( hProcess = OpenProcess( PROCESS_ALL_ACCESS, FALSE, dPID[ k ] ) ) )
+		{
+			if( TRUE == EnumProcessModules( hProcess, phModule, sizeof(HMODULE)*1024, &dPIDSize ) )
+				if( GetModuleBaseName( hProcess, phModule[ 0 ], szCurrentProcessName, 1024 ) > 0 )
+				{
+					strlwr( szCurrentProcessName );
+
+					if( NULL != strstr( szCurrentProcessName, szProcessName ) )
+					{
+						FreePSAPIRoutines();
+
+						//
+						// kill process
+						//
+						if( false == TerminateProcess( hProcess, 0 ) )
+						{
+							CloseHandle( hProcess );
+
+							return true;
+						}
+
+						//
+						// refresh systray
+						//
+						UpdateWindow( FindWindow( NULL, "Shell_TrayWnd" ) );
+
+						//
+						// refresh desktop window
+						//
+						UpdateWindow( GetDesktopWindow() );
+
+						CloseHandle( hProcess );
+
+						return true;
+					}
+				}
+
+			CloseHandle( hProcess );
+		}
+	}
+	
+	//
+	// free PSAPI routines
+	//
+	FreePSAPIRoutines();
+
+	return false;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+bool	FindDev( char *szDriverName )
+{
+	char		szDeviceName[ 1024 ];
+	char		szCurrentDeviceName[ 1024 ];
+	LPVOID		lpDevices[ 1024 ];
+	DWORD		dDevicesSize( 1024 );
+	DWORD		dSize( 1024 );
+	TCHAR		tszCurrentDeviceName[ 1024 ];
+	DWORD		dNameSize( 1024 );
+
+  
+	//
+	// make the name lower case
+	//
+	memset( szDeviceName, 0, 1024*sizeof(char) );
+	sprintf( szDeviceName, "%s", strlwr( szDriverName ) );
+
+	//
+    // load PSAPI routines
+	//
+	if( false == LoadPSAPIRoutines() )
+		return false;
+
+	//
+	// enumerate devices
+	//
+    if( FALSE == EnumDeviceDrivers( lpDevices, dSize, &dDevicesSize ) )
+	{
+		FreePSAPIRoutines();
+
+		return false;
+	}
+
+	//
+	// walk trough and compare see if the device driver exists
+	//
+	for( int k( dDevicesSize / sizeof( LPVOID ) ); k >= 0; k-- )
+	{
+		memset( szCurrentDeviceName, 0, 1024*sizeof(char) );
+		memset( tszCurrentDeviceName, 0, 1024*sizeof(TCHAR) );
+
+		if( 0 != GetDeviceDriverBaseName( lpDevices[ k ], tszCurrentDeviceName, dNameSize ) )
+		{
+			sprintf( szCurrentDeviceName, "%S", tszCurrentDeviceName );
+
+			if( 0 == strcmp( strlwr( szCurrentDeviceName ), szDeviceName ) )
+			{
+				FreePSAPIRoutines();
+
+				return true;
+			}
+		}
+	}
+	
+	//
+	// free PSAPI routines
+	//
+	FreePSAPIRoutines();
+
+	return false;
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+extern "C" __declspec(dllexport) void	FindProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop )
+{
+	char		szParameter[ 1024 ];
+
+
+	g_hwndParent	= hwndParent;
+
+	EXDLL_INIT();
+	{
+		popstring( szParameter );
+
+		if( true == FindProc( szParameter ) )
+			wsprintf( szParameter, "1" );
+		else
+			wsprintf( szParameter, "0" );
+
+		setuservariable( INST_R0, szParameter );
+	}
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+extern "C" __declspec(dllexport) void	KillProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop )
+{
+	char		szParameter[ 1024 ];
+
+
+	g_hwndParent	= hwndParent;
+
+	EXDLL_INIT();
+	{
+		popstring( szParameter );
+
+		if( true == KillProc( szParameter ) )
+			wsprintf( szParameter, "1" );
+		else
+			wsprintf( szParameter, "0" );
+
+		setuservariable( INST_R0, szParameter );
+	}
+}
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+extern "C" __declspec(dllexport) void	FindDevice( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop )
+{
+	char		szParameter[ 1024 ];
+
+
+	g_hwndParent	= hwndParent;
+
+	EXDLL_INIT();
+	{
+		popstring( szParameter );
+
+		if( true == FindDev( szParameter ) )
+			wsprintf( szParameter, "1" );
+		else
+			wsprintf( szParameter, "0" );
+
+		setuservariable( INST_R0, szParameter );
+	}
+}

admin/win/nsi/nsis_processes/src/processes.h

@@ -0,0 +1,49 @@
+#pragma once
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// PSAPI function pointers
+typedef BOOL	(WINAPI *lpfEnumProcesses)			( DWORD *, DWORD, DWORD * );
+typedef BOOL	(WINAPI *lpfEnumProcessModules)		( HANDLE, HMODULE *, DWORD, LPDWORD );
+typedef DWORD	(WINAPI *lpfGetModuleBaseName)		( HANDLE, HMODULE, LPTSTR, DWORD );
+typedef BOOL	(WINAPI *lpfEnumDeviceDrivers)		( LPVOID *, DWORD, LPDWORD );
+typedef BOOL	(WINAPI *lpfGetDeviceDriverBaseName)( LPVOID, LPTSTR, DWORD );
+
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// Internal use routines
+bool	LoadPSAPIRoutines( void );
+bool	FreePSAPIRoutines( void );
+
+bool	FindProc( char *szProcess );
+bool	KillProc( char *szProcess );
+
+bool	FindDev( char *szDriverName );
+
+
+
+
+
+//-------------------------------------------------------------------------------------------
+// Exported routines
+extern "C" __declspec(dllexport) void	FindProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop );
+
+extern "C" __declspec(dllexport) void	KillProcess( HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop );
+
+extern "C" __declspec(dllexport) void	FindDevice(  HWND		hwndParent, 
+													 int		string_size,
+													 char		*variables, 
+													 stack_t	**stacktop );

admin/win/nsi/nsis_processes/src/processes.rc

@@ -0,0 +1,103 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION 1,0,0,1
+ PRODUCTVERSION 1,0,0,1
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments", "NSIS Plug-in for Windows process management. Only WinNT, Win2K, WinXP and Win2003 Server supported."
+            VALUE "CompanyName", "Andrei Ciubotaru [Hardwired]"
+            VALUE "FileDescription", "Windows Processes Management"
+            VALUE "FileVersion", "1, 0, 0, 1"
+            VALUE "InternalName", "Processes"
+            VALUE "LegalCopyright", "Copyright (c) 2004 Hardwired. No rights reserved."
+            VALUE "OriginalFilename", "Processes.dll"
+            VALUE "ProductName", "Processes"
+            VALUE "ProductVersion", "1, 0, 0, 1"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

admin/win/nsi/nsis_processes/src/processes.sln

@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 8.00
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "processes", "processes.vcproj", "{3438467F-A719-46DC-93E5-137A8B691727}"
+	ProjectSection(ProjectDependencies) = postProject
+	EndProjectSection
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		Debug = Debug
+		Release = Release
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{3438467F-A719-46DC-93E5-137A8B691727}.Debug.ActiveCfg = Debug|Win32
+		{3438467F-A719-46DC-93E5-137A8B691727}.Debug.Build.0 = Debug|Win32
+		{3438467F-A719-46DC-93E5-137A8B691727}.Release.ActiveCfg = Release|Win32
+		{3438467F-A719-46DC-93E5-137A8B691727}.Release.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal

admin/win/nsi/nsis_processes/src/processes.txt

@@ -0,0 +1,122 @@
+----------------------------------------------------------------
+----------------------------------------------------------------
+Processes (Processes.dll)
+Version:	1.0.0.1
+Release:	12.december.2004
+Description:Nullsoft Installer (NSIS) plug-in for managing?! 
+			Windows processes.
+
+Copyright:	<09> 2004 Hardwired. No rights reserved.
+			There is no restriction and no guaranty for using
+			this software.
+
+Author:		Andrei Ciubotaru [Hardwired]
+			Lead Developer ICode&Ideas SRL (http://www.icode.ro)
+			hardwiredteks@gmail.com, hardwired@icode.ro
+
+----------------------------------------------------------------
+----------------------------------------------------------------
+INTRODUCTION
+
+	The Need For Plug-in - I need it for the one of my installers.
+	
+	Briefly: Use it when you need to find\kill a process when
+installing\uninstalling some application. Also, use it when you 
+need to test the presence of a device driver.
+
+
+SUPPORT
+	
+	Supported platforms are: WinNT,Win2K,WinXP and Win2003 Server.
+
+
+DESCRIPTION
+
+	Processes::FindProcess <process_name.exe>
+	
+		Searches the currently running processes for the given
+		process name.
+		
+		return:	1	- the process was found
+				0	- the process was not found
+	
+	Processes::KillProcess <process_name.exe>
+	
+		Searches the currently running processes for the given
+		process name. If the process is found then the it gets
+		killed.
+		
+		return:	1	- the process was found and killed
+				0	- the process was not found or the process
+						cannot be killed (insuficient rights)
+	
+	Processes::FindDevice <device_base_name>
+	
+		Searches the installed devices drivers for the given
+		device base name.
+		(important: I said BASE NAME not FILENAME)
+		
+		return:	1	- the device driver was found
+				0	- the device driver was not found
+				
+
+USAGE
+
+	First of all, does not matter where you use it. Ofcourse, the
+routines must be called inside of a Section/Function scope.
+
+	Processes::FindProcess "process_name.exe"
+	Pop $R0
+ 
+	StrCmp $R0 "1" make_my_day noooooo
+	
+	make_my_day:
+		...
+	
+	noooooo:
+		...
+		
+	
+	Processes::KillProcess "process_name.exe"
+	Pop $R0
+ 
+	StrCmp $R0 "1" dead_meat why_wont_you_die
+	
+	dead_meat:
+		...
+	
+	why_wont_you_die:
+		...
+		
+
+	Processes::FindDevice "device_base_name"
+	Pop $R0
+ 
+	StrCmp $R0 "1" blabla more_blabla
+	
+	blabla:
+		...
+	
+	more_blabla:
+		...
+		
+	
+THANKS
+
+	Sunil Kamath for inspiring me. I wanted to use its FindProcDLL
+but my requirements made it imposible.
+
+	Nullsoft for creating this very powerfull installer. One big,
+free and full-featured (hmmm... and guiless for the moment) mean
+install machine!:)
+
+	ME for being such a great coder...
+											... HAHAHAHAHAHAHA!
+											
+ONE MORE THING
+
+	If you use the plugin or it's source-code, I would apreciate
+if my name is mentioned.
+
+----------------------------------------------------------------
+----------------------------------------------------------------

admin/win/nsi/nsis_processes/src/processes.vcproj

@@ -0,0 +1,222 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="7.10"
+	Name="processes"
+	SccProjectName="processes"
+	SccLocalPath=".">
+	<Platforms>
+		<Platform
+			Name="Win32"/>
+	</Platforms>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory=".\Debug"
+			IntermediateDirectory=".\Debug"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;FINDPROCDLL_EXPORTS"
+				BasicRuntimeChecks="3"
+				RuntimeLibrary="1"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile=".\Debug/processes.pch"
+				AssemblerListingLocation=".\Debug/"
+				ObjectFile=".\Debug/"
+				ProgramDataBaseFileName=".\Debug/"
+				WarningLevel="3"
+				SuppressStartupBanner="TRUE"
+				DebugInformationFormat="4"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				OutputFile=".\Debug/processes.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				GenerateDebugInformation="TRUE"
+				ProgramDatabaseFile=".\Debug/processes.pdb"
+				ImportLibrary=".\Debug/processes.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="_DEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Debug/processes.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="_DEBUG"
+				Culture="1034"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="..\bin"
+			IntermediateDirectory="..\bin\processes"
+			ConfigurationType="2"
+			UseOfMFC="0"
+			ATLMinimizesCRunTimeLibraryUsage="FALSE"
+			CharacterSet="2"
+			WholeProgramOptimization="TRUE">
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="3"
+				GlobalOptimizations="TRUE"
+				InlineFunctionExpansion="1"
+				FavorSizeOrSpeed="1"
+				OptimizeForWindowsApplication="TRUE"
+				PreprocessorDefinitions="NDEBUG;_WINDOWS;_USRDLL;FINDPROCDLL_EXPORTS"
+				StringPooling="TRUE"
+				RuntimeLibrary="0"
+				StructMemberAlignment="1"
+				EnableFunctionLevelLinking="TRUE"
+				UsePrecompiledHeader="3"
+				PrecompiledHeaderThrough="stdafx.h"
+				PrecompiledHeaderFile="..\bin\processes/processes.pch"
+				AssemblerListingLocation="..\bin\processes/"
+				ObjectFile="..\bin\processes/"
+				ProgramDataBaseFileName="..\bin\processes/"
+				WarningLevel="4"
+				SuppressStartupBanner="TRUE"/>
+			<Tool
+				Name="VCCustomBuildTool"/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="libc.lib"
+				OutputFile="..\bin/Processes.dll"
+				LinkIncremental="1"
+				SuppressStartupBanner="TRUE"
+				IgnoreAllDefaultLibraries="FALSE"
+				ProgramDatabaseFile="..\bin/processes.pdb"
+				OptimizeForWindows98="1"
+				ImportLibrary="..\bin/processes.lib"
+				TargetMachine="1"/>
+			<Tool
+				Name="VCMIDLTool"
+				PreprocessorDefinitions="NDEBUG"
+				MkTypLibCompatible="TRUE"
+				SuppressStartupBanner="TRUE"
+				TargetEnvironment="1"
+				TypeLibraryName=".\Release/processes.tlb"
+				HeaderFileName=""/>
+			<Tool
+				Name="VCPostBuildEventTool"/>
+			<Tool
+				Name="VCPreBuildEventTool"/>
+			<Tool
+				Name="VCPreLinkEventTool"/>
+			<Tool
+				Name="VCResourceCompilerTool"
+				PreprocessorDefinitions="NDEBUG"
+				Culture="1033"/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"/>
+			<Tool
+				Name="VCWebDeploymentTool"/>
+			<Tool
+				Name="VCManagedWrapperGeneratorTool"/>
+			<Tool
+				Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+		</Configuration>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			<File
+				RelativePath="processes.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						PreprocessorDefinitions="NDEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\processes.rc">
+			</File>
+			<File
+				RelativePath="StdAfx.cpp">
+				<FileConfiguration
+					Name="Debug|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="0"
+						PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
+						BasicRuntimeChecks="3"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32">
+					<Tool
+						Name="VCCLCompilerTool"
+						Optimization="1"
+						PreprocessorDefinitions="NDEBUG;_WINDOWS;_MBCS;_USRDLL;FINDPROCDLL_EXPORTS;$(NoInherit)"
+						UsePrecompiledHeader="1"/>
+				</FileConfiguration>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl">
+			<File
+				RelativePath="exdll.h">
+			</File>
+			<File
+				RelativePath=".\processes.h">
+			</File>
+			<File
+				RelativePath=".\resource.h">
+			</File>
+			<File
+				RelativePath="StdAfx.h">
+			</File>
+		</Filter>
+		<Filter
+			Name="Resource Files"
+			Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe">
+		</Filter>
+		<File
+			RelativePath="processes.txt">
+		</File>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>

admin/win/nsi/nsis_processes/src/resource.h

@@ -0,0 +1,15 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by processes.rc
+//
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

admin/win/nsi/revision.txt

@@ -1 +1 @@
-96
+127

admin/win/nsi/tomahawk.nsi

@@ -4,7 +4,7 @@
 ; Some installer script options (comment-out options not required)
 ;-----------------------------------------------------------------------------
 ;!define OPTION_LICENSE_AGREEMENT
-;!define OPTION_UAC_PLUGIN_ENHANCED
+!define OPTION_UAC_PLUGIN_ENHANCED
 !define OPTION_SECTION_SC_START_MENU
 !define OPTION_SECTION_SC_DESKTOP
 !define OPTION_SECTION_SC_QUICK_LAUNCH
@@ -15,15 +15,17 @@
 ;-----------------------------------------------------------------------------
 ; Some paths.
 ;-----------------------------------------------------------------------------
-!define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
+!ifndef MING_PATH
+    !define MING_PATH "/usr/i686-w64-mingw32/sys-root/mingw"
+!endif
 !define MING_BIN "${MING_PATH}/bin"
-!define MING_DLL_PATH "${MING_BIN}"
 !define MING_LIB "${MING_PATH}/lib"
 !define ROOT_PATH "..\..\.." ; assuming the script is in ROOT/admin/win/nsi
 !define BUILD_PATH "${ROOT_PATH}\build"
 !define QT_DLL_PATH "${MING_BIN}"
 !define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
 !define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
+!define VLC_PLUGIN_PATH "${MING_LIB}\vlc\plugins"
 
 ;-----------------------------------------------------------------------------
 ; Increment installer revision number as part of this script.
@@ -33,9 +35,11 @@
 !delfile revision.txt
 !appendfile revision.txt ${REVISION}
 
-!define VER_MAJOR "0"
-!define VER_MINOR "0"
-!define VER_BUILD "2"
+!ifndef VER_MAJOR && VER_MINOR && VER_BUILD
+    !define VER_MAJOR "0"
+    !define VER_MINOR "2"
+    !define VER_BUILD "0prealpha"
+!endif
 
 !define VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_BUILD}"
 
@@ -50,7 +54,7 @@
 Name "Tomahawk"
 Caption "Tomahawk Installer"
 BrandingText "Tomahawk ${VERSION}  -- ${BUILD_TIME}"
-OutFile "tomahawk-${VERSION}.exe"
+OutFile "${ROOT_PATH}\build\tomahawk-${VERSION}.exe"
 InstallDir "$PROGRAMFILES\Tomahawk"
 InstallDirRegKey HKCU "Software\Tomahawk" ""
 InstType Standard
@@ -58,17 +62,10 @@ InstType Full
 InstType Minimal
 CRCCheck On
 SetCompressor /SOLID lzma
+RequestExecutionLevel user ;Now using the UAC plugin.
 ReserveFile tomahawk.ini
 ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 
-;The UAC plugin provides an elevated user.
-;Otherwise request admin level here.
-!ifdef OPTION_UAC_PLUGIN_ENHANCED
-   RequestExecutionLevel user
-!else
-   RequestExecutionLevel admin
-!endif
-
 ;-----------------------------------------------------------------------------
 ; Include some required header files.
 ;-----------------------------------------------------------------------------
@@ -79,16 +76,14 @@ ReserveFile "${NSISDIR}\Plugins\InstallOptions.dll"
 !include Memento.nsh ;Remember user selections.
 !include WinVer.nsh ;Windows version detection.
 !include WordFunc.nsh  ;Used by VersionCompare macro function.
-!ifdef OPTION_UAC_PLUGIN_ENHANCED
-   !include UAC.nsh ;Used by the UAC elevation to install as user or admin.
-!endif
+!include UAC.nsh ;Used by the UAC elevation to install as user or admin.
 
 ;-----------------------------------------------------------------------------
 ; Memento selections stored in registry.
 ;-----------------------------------------------------------------------------
 !define MEMENTO_REGISTRY_ROOT HKLM
 !define MEMENTO_REGISTRY_KEY Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk
-                
+
 ;-----------------------------------------------------------------------------
 ; Modern User Interface (MUI) defintions and setup.
 ;-----------------------------------------------------------------------------
@@ -146,18 +141,46 @@ UninstPage custom un.UnPageUserAppData un.UnPageUserAppDataLeave
 ##############################################################################
 
 Function LaunchTomahawk
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      ${UAC.CallFunctionAsUser} LaunchTomahawkAsUser
-   !else
-      Exec "$INSTDIR\tomahawk.exe"
-   !endif
+   ${UAC.CallFunctionAsUser} LaunchTomahawkAsUser
 FunctionEnd
 
-!ifdef OPTION_UAC_PLUGIN_ENHANCED
 Function LaunchTomahawkAsUser
    Exec "$INSTDIR\tomahawk.exe"
 FunctionEnd
-!endif
+
+##############################################################################
+#                                                                            #
+#   PROCESS HANDLING FUNCTIONS AND MACROS                                    #
+#                                                                            #
+##############################################################################
+
+!macro CheckForProcess processName gotoWhenFound gotoWhenNotFound
+   Processes::FindProcess ${processName}
+   StrCmp $R0 "0" ${gotoWhenNotFound} ${gotoWhenFound}
+!macroend
+
+!macro ConfirmEndProcess processName
+   MessageBox MB_YESNO|MB_ICONEXCLAMATION \
+     "Found ${processName} process(s) which need to be stopped.$\nDo you want the installer to stop these for you?" \
+     IDYES process_${processName}_kill IDNO process_${processName}_ended
+   process_${processName}_kill:
+      DetailPrint "Killing ${processName} processes."
+      Processes::KillProcess ${processName}
+      Sleep 1500
+      StrCmp $R0 "1" process_${processName}_ended
+      DetailPrint "Process to kill not found!"
+   process_${processName}_ended:
+!macroend
+
+!macro CheckAndConfirmEndProcess processName
+   !insertmacro CheckForProcess ${processName} 0 no_process_${processName}_to_end
+   !insertmacro ConfirmEndProcess ${processName}
+   no_process_${processName}_to_end:
+!macroend
+
+Function EnsureTomahawkShutdown
+   !insertmacro CheckAndConfirmEndProcess "tomahawk.exe"
+FunctionEnd
 
 ##############################################################################
 #                                                                            #
@@ -226,12 +249,10 @@ Function PageLeaveReinstall
       Delete $R1
       RMDir $INSTDIR
    no_remove_uninstaller:
-      StrCmp $R0 "2" +2 0
+      StrCmp $R0 "2" 0 +3
+      UAC::Unload
+      Quit
       BringToFront
-      !ifdef OPTION_UAC_PLUGIN_ENHANCED
-         UAC::Unload
-         Quit
-      !endif
    reinst_done:
 FunctionEnd
 
@@ -244,7 +265,7 @@ FunctionEnd
 Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    SectionIn 1 2 3 RO
    SetDetailsPrint listonly
-   
+
    SetDetailsPrint textonly
    DetailPrint "Installing Tomahawk Player essentials."
    SetDetailsPrint listonly
@@ -254,34 +275,29 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
         ;Main executable.
         File "${INSTALL_PATH}\bin\tomahawk.exe"
 
-        File "${INSTALL_PATH}\lib\librtaudio.dll"
-        File "${INSTALL_PATH}\lib\libqxtweb-standalone.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_jdns.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_qtweetlib.dll"
-        File "${INSTALL_PATH}\lib\libtomahawklib.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_sipjabber.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_siptwitter.dll"
-        File "${INSTALL_PATH}\lib\libtomahawk_sipzeroconf.dll"
+        File "${INSTALL_PATH}\bin\libqxtweb-standalone.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_portfwd.dll"
+        File "${INSTALL_PATH}\bin\libtomahawk_lastfm2.dll"
+        File "${INSTALL_PATH}\bin\libtomahawklib.dll"
+        File "${INSTALL_PATH}\lib\libtomahawk_sip*.dll"
    !endif
    !ifndef INSTALL_PATH
         ;Main executable.
         File "${BUILD_PATH}\tomahawk.exe"
 
-        File "${BUILD_PATH}\thirdparty\rtaudio\librtaudio.dll"
-        File "${BUILD_PATH}\thirdparty\qxt\qxtweb-standalone\libqxtweb-standalone.dll"
-        File "${BUILD_PATH}\thirdparty\jdns\libtomahawk_jdns.dll"
-        File "${BUILD_PATH}\thirdparty\qtweetlib\libtomahawk_qtweetlib.dll"
-        File "${BUILD_PATH}\src\libtomahawk\libtomahawklib.dll"
-        File "${BUILD_PATH}\libtomahawk_sipjabber.dll"
-        File "${BUILD_PATH}\libtomahawk_siptwitter.dll"
-        File "${BUILD_PATH}\libtomahawk_sipzeroconf.dll"
+        File "${BUILD_PATH}\libtomahawklib.dll"
+        File "${BUILD_PATH}\libqxtweb-standalone.dll"
+        File "${BUILD_PATH}\libtomahawk_portfwd.dll"
+        File "${BUILD_PATH}\libtomahawk_lastfm2.dll"
+        File "${BUILD_PATH}\libtomahawk_sip*.dll"
    !endif
 
-   ;License & release notes.
+   ;License & release notes & icon (for Growl).
    File "${ROOT_PATH}\LICENSE.txt"
    File /oname=NOTES.txt RELEASE_NOTES.txt
-    
-   ;QT stuff:  
+   File "${ROOT_PATH}\data\icons\tomahawk-icon-128x128.png"
+
+   ;QT stuff:
    File "${QT_DLL_PATH}\QtCore4.dll"
    File "${QT_DLL_PATH}\QtGui4.dll"
    File "${QT_DLL_PATH}\QtNetwork4.dll"
@@ -299,32 +315,59 @@ Section "Tomahawk Player" SEC_TOMAHAWK_PLAYER
    File "${IMAGEFORMATS_DLL_PATH}\qgif4.dll"
    File "${IMAGEFORMATS_DLL_PATH}\qjpeg4.dll"
    SetOutPath "$INSTDIR"
-    
-   ;Cygwin/c++ stuff
-   ;File "${MING_DLL_PATH}\cygmad-0.dll"
-   ;File "${MING_DLL_PATH}\libgcc_s_dw2-1.dll"
-   ;File "${MING_DLL_PATH}\mingwm10.dll"
-   File "${MING_DLL_PATH}\libgcc_s_sjlj-1.dll"
-   File "${MING_DLL_PATH}\libstdc++-6.dll"
-   
-   ;Audio stuff
-   File "${MING_DLL_PATH}\libmad-0.dll"
-   File "${MING_DLL_PATH}\libogg-0.dll"
-   File "${MING_DLL_PATH}\libvorbisfile-3.dll"
-   File "${MING_DLL_PATH}\libvorbis-0.dll"
-   File "${MING_DLL_PATH}\libFLAC-8.dll"
-   File "${MING_DLL_PATH}\libFLAC++-6.dll"
-    
-   ;Other
-   File "${MING_DLL_PATH}\libqjson.dll"
-   File "${MING_DLL_PATH}\libtag.dll"
-   File "${MING_DLL_PATH}\libgloox-8.dll"
-   File "${MING_DLL_PATH}\libpng15-15.dll"
-   File "${MING_DLL_PATH}\libjpeg-8.dll"
-   File "${MING_DLL_PATH}\zlib1.dll"
 
-   File "${MING_DLL_PATH}\libechonest.dll"
-   File "${MING_DLL_PATH}\liblastfm.dll"
+   ;Cygwin/c++ stuff
+   ;File "${MING_BIN}\cygmad-0.dll"
+   ;File "${MING_BIN}\libgcc_s_dw2-1.dll"
+   ;File "${MING_BIN}\mingwm10.dll"
+   File "${MING_BIN}\libgcc_s_sjlj-1.dll"
+   File "${MING_BIN}\libstdc++-6.dll"
+
+   ;Phonon stuff
+
+   ;Fix the phonon build to not use Dbus
+   File "${QT_DLL_PATH}\QtDbus4.dll"
+   File "${MING_BIN}\libdbus-1-3.dll"
+   File "${MING_BIN}\dbus-daemon.exe"
+
+   File "${MING_BIN}\libphonon.dll"
+   SetOutPath "$INSTDIR\phonon_backend"
+   File "${MING_BIN}\phonon_backend\phonon_vlc.dll"
+   SetOutPath "$INSTDIR"
+
+   ;VLC
+   ;SetOutPath "$INSTDIR\phonon_backend"
+   File "${MING_BIN}\libvlc.dll"
+   File "${MING_BIN}\libvlccore.dll"
+   SetOutPath "$INSTDIR\plugins"
+   File /r "${VLC_PLUGIN_PATH}\*.dll"
+   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libmad-0.dll" ; MP3
+   File "${MING_BIN}\libFLAC-8.dll" ; FLAC
+   File "${MING_BIN}\libogg-0.dll" ; OGG, FLAC
+   File "${MING_BIN}\libvorbis-0.dll" ; OGG
+   File "${MING_BIN}\libvorbisenc-2.dll" ; OGG
+
+
+
+   ; Other
+   File "${MING_BIN}\libqjson.dll"
+   File "${MING_BIN}\libtag.dll"
+   File "${MING_BIN}\libpng15-15.dll"
+   File "${MING_BIN}\libjpeg-8.dll"
+   File "${MING_BIN}\zlib1.dll"
+
+   File "${MING_BIN}\libechonest.dll"
+   File "${MING_BIN}\libQTweetLib.dll"
+
+   ; Jabber
+   File "${MING_BIN}\libjreen.dll"
+   File "${MING_BIN}\libqca.dll"
+   SetOutPath "$INSTDIR\crypto"
+   File "${MING_LIB}\qt4\plugins\crypto\libqca-ossl.dll"
+   SetOutPath "$INSTDIR"
+   File "${MING_BIN}\libssl-8.dll"
+   File "${MING_BIN}\libcrypto-8.dll"
 
    File "${MING_LIB}\libclucene-core.dll"
    File "${MING_LIB}\libclucene-shared.dll"
@@ -346,7 +389,7 @@ SectionGroup "Shortcuts"
       CreateShortCut "$SMPROGRAMS\Tomahawk\LICENSE.lnk" "$INSTDIR\LICENSE.txt"
       CreateShortCut "$SMPROGRAMS\Tomahawk\Tomahawk.lnk" "$INSTDIR\tomahawk.exe"
       CreateShortCut "$SMPROGRAMS\Tomahawk\Release notes.lnk" "$INSTDIR\NOTES.txt"
-      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
+      CreateShortCut "$SMPROGRAMS\Tomahawk\Uninstall.lnk" "$INSTDIR\uninstall.exe"
       SetShellVarContext current
    ${MementoSectionEnd}
 !endif
@@ -390,7 +433,7 @@ Section -post
    SetDetailsPrint textonly
    DetailPrint "Writing Uninstaller"
    SetDetailsPrint listonly
-   WriteUninstaller $INSTDIR\Uninstall.exe
+   WriteUninstaller $INSTDIR\uninstall.exe
 
    ;Registry keys required for installer version handling and uninstaller.
    SetDetailsPrint textonly
@@ -418,6 +461,12 @@ Section -post
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoModify" "1"
    WriteRegDWORD HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "NoRepair" "1"
 
+   ; Register tomahawk:// protocol handler
+   WriteRegStr HKCR "tomahawk" "" "URL: Tomahawk Protocol"
+   WriteRegStr HKCR "tomahawk\DefaultIcon" "" $INSTDIR\tomahawk.exe,1
+   WriteRegStr HKCR "tomahawk\shell" "" "open"
+   WriteRegStr HKCR "tomahawk\shell\open\command" "" '"$INSTDIR\tomahawk.exe" "%1"'
+
    SetDetailsPrint textonly
    DetailPrint "Finsihed."
 SectionEnd
@@ -477,6 +526,8 @@ Section Uninstall
    DeleteRegValue HKLM "Software\Tomahawk" ""
    DeleteRegKey HKLM "Software\Tomahawk"
 
+   DeleteRegKey HKCR "tomahawk"
+
    ;Start menu shortcuts.
    !ifdef OPTION_SECTION_SC_START_MENU
       SetShellVarContext all
@@ -498,7 +549,7 @@ Section Uninstall
 
    ;Remove all the Program Files.
    RMDir /r $INSTDIR
-  
+
    ;Uninstall User Data if option is checked, otherwise skip.
    ${If} $UnPageUserAppDataCheckbox_State == ${BST_CHECKED}
       RMDir /r "$LOCALAPPDATA\Tomahawk"
@@ -514,7 +565,7 @@ SectionEnd
 #                                                                            #
 ##############################################################################
 
-Function .onInit   
+Function .onInit
    !insertmacro INSTALLOPTIONS_EXTRACT "tomahawk.ini"
 
    ;Remove Quick Launch option from Windows 7, as no longer applicable - usually.
@@ -526,27 +577,25 @@ Function .onInit
 
    ${MementoSectionRestore}
 
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      UAC_Elevate:
-         UAC::RunElevated 
-         StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
-         StrCmp 0 $0 0 UAC_Err ; Error?
-         StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
-         Quit
-       
-      UAC_Err:
-         MessageBox MB_ICONSTOP "Unable to elevate, error $0"
-         Abort
-       
-      UAC_ElevationAborted:
-         Abort
-       
-      UAC_Success:
-         StrCmp 1 $3 +4 ;Admin?
-         StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-         MessageBox MB_ICONSTOP "This installer requires admin access, try again"
-         goto UAC_Elevate
-   !endif
+   UAC_Elevate:
+      UAC::RunElevated
+      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
+      StrCmp 0 $0 0 UAC_Err ; Error?
+      StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
+      Quit
+
+   UAC_Err:
+      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+      Abort
+
+   UAC_ElevationAborted:
+      Abort
+
+   UAC_Success:
+      StrCmp 1 $3 +4 ;Admin?
+      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
+      MessageBox MB_ICONSTOP "This installer requires admin access, try again"
+      goto UAC_Elevate
 
    ;Prevent multiple instances.
    System::Call 'kernel32::CreateMutexA(i 0, i 0, t "tomahawkInstaller") i .r1 ?e'
@@ -554,19 +603,25 @@ Function .onInit
    StrCmp $R0 0 +3
       MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running."
       Abort
+
+   ;Use available InstallLocation when possible. This is useful in the uninstaller
+   ;via re-install, which would otherwise use a default location - a bug.
+   ReadRegStr $R0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Tomahawk" "InstallLocation"
+   StrCmp $R0 "" SkipSetInstDir
+   StrCpy $INSTDIR $R0
+   SkipSetInstDir:
+
+   ;Shutdown Tomahawk in case Add/Remove re-installer option used.
+   Call EnsureTomahawkShutdown
 FunctionEnd
 
 Function .onInstSuccess
    ${MementoSectionSave}
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      UAC::Unload ;Must call unload!
-   !endif
+   UAC::Unload ;Must call unload!
 FunctionEnd
 
 Function .onInstFailed
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      UAC::Unload ;Must call unload!
-   !endif
+   UAC::Unload ;Must call unload!
 FunctionEnd
 
 ##############################################################################
@@ -576,27 +631,25 @@ FunctionEnd
 ##############################################################################
 
 Function un.onInit
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      UAC_Elevate:
-         UAC::RunElevated 
-         StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
-         StrCmp 0 $0 0 UAC_Err ; Error?
-         StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
-         Quit
+   UAC_Elevate:
+      UAC::RunElevated
+      StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
+      StrCmp 0 $0 0 UAC_Err ; Error?
+      StrCmp 1 $1 0 UAC_Success ;Are we the real deal or just the wrapper?
+      Quit
 
-      UAC_Err:
-         MessageBox MB_ICONSTOP "Unable to elevate, error $0"
-         Abort
-       
-      UAC_ElevationAborted:
-         Abort
-       
-      UAC_Success:
-         StrCmp 1 $3 +4 ;Admin?
-         StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
-         MessageBox MB_ICONSTOP "This uninstaller requires admin access, try again"
-         goto UAC_Elevate 
-   !endif
+   UAC_Err:
+      MessageBox MB_ICONSTOP "Unable to elevate, error $0"
+      Abort
+
+   UAC_ElevationAborted:
+      Abort
+
+   UAC_Success:
+      StrCmp 1 $3 +4 ;Admin?
+      StrCmp 3 $1 0 UAC_ElevationAborted ;Try again?
+      MessageBox MB_ICONSTOP "This uninstaller requires admin access, try again"
+      goto UAC_Elevate
 
    ;Prevent multiple instances.
    System::Call 'kernel32::CreateMutexA(i 0, i 0, t "tomahawkUninstaller") i .r1 ?e'
@@ -607,13 +660,9 @@ Function un.onInit
 FunctionEnd
 
 Function un.onUnInstSuccess
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      UAC::Unload ;Must call unload!
-   !endif
+   UAC::Unload ;Must call unload!
 FunctionEnd
 
 Function un.onUnInstFailed
-   !ifdef OPTION_UAC_PLUGIN_ENHANCED
-      UAC::Unload ;Must call unload!
-   !endif
+   UAC::Unload ;Must call unload!
 FunctionEnd

admin/win/sparklewin-beta.rss

@@ -8,10 +8,18 @@
         <item>
             <title>Version 0.0.1 (Tomahawk Player Beta - It Lives?)</title>
             <sparkle:releaseNotesLink>
-                https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
+                https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog
             </sparkle:releaseNotesLink>
             <pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
             <enclosure url="http://download.tomahawk-player.org/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" />
         </item>
+        <item>
+            <title>Version 0.0.2 (Tomahawk Player Beta - It Lives?)</title>
+            <sparkle:releaseNotesLink>
+                https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
+            </sparkle:releaseNotesLink>
+            <pubDate>Mon, 28 Mar 2011 05:00:02 +0100</pubDate>
+            <enclosure url="http://download.tomahawk-player.org/tomahawk-0.0.2.exe" sparkle:version="0.0.2" />
+        </item>
     </channel>
 </rss>

admin/win/sparklewin.rss

@@ -11,7 +11,15 @@
                 https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog
             </sparkle:releaseNotesLink>
             <pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
-            <enclosure url="http://download.tomahawk-player.org/tomahawk-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>
+            <title>Version 0.0.2 (Tomahawk Player - It Lives!)</title>
+            <sparkle:releaseNotesLink>
+                https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
+            </sparkle:releaseNotesLink>
+            <pubDate>Mon, 28 Mar 2011 05:00:02 +0100</pubDate>
+            <enclosure url="http://download.tomahawk-player.org/tomahawk-0.0.2.exe" sparkle:version="0.0.2" />
         </item>
     </channel>
 </rss>

admin/win/update-vlc.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+echo "Remove old vlc dir..."
+#rm -vf vlc-*.7z
+rm -rf vlc/
+
+echo "Download specified binary..."
+#wget -c "http://downloads.sourceforge.net/project/vlc/1.1.9/win32/vlc-1.1.9-win32.7z?r=http%3A%2F%2Fwww.videolan.org%2Fvlc%2Fdownload-windows.html&ts=1306272584&use_mirror=leaseweb"
+wget -c "http://nightlies.videolan.org/build/win32/trunk-20110524-1321/vlc-1.2.0-git-20110524-1321-win32.7z"
+
+echo "Extract binary..."
+7z x vlc-*.7z
+mv -v vlc-*/ vlc/
+
+echo "Strip unneeded plugins from vlc/plugins..."
+cd vlc/plugins/
+rm -rvf video_*/ gui/ */libold* */libvcd* */libdvd* */liblibass* */libx264* */libschroe* */liblibmpeg2* \
+     */libstream_out_* */libmjpeg_plugin* */libh264_plugin* */libzvbi_plugin* */lib*sub*
+
+echo "Downloaded and stripped VLC"
+