diff --git a/CMakeLists.txt b/CMakeLists.txt index 2adfba3a5..4007ce216 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ ENDIF( ${CMAKE_VERSION} VERSION_GREATER 2.8.3 ) SET( TOMAHAWK_ORGANIZATION_NAME "Tomahawk" ) SET( TOMAHAWK_ORGANIZATION_DOMAIN "tomahawk-player.org" ) SET( TOMAHAWK_APPLICATION_NAME "Tomahawk" ) -SET( TOMAHAWK_VERSION "0.0.3" ) +SET( TOMAHAWK_VERSION "0.1.0" ) # set paths diff --git a/admin/mac/add-spotify.sh b/admin/mac/add-spotify.sh index 5f440f051..651ce1a60 100755 --- a/admin/mac/add-spotify.sh +++ b/admin/mac/add-spotify.sh @@ -2,7 +2,7 @@ # 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/tomahawk_spotify +# eg: add-spotify.sh /path/to/spotify_tomahawkresolver ################################################################################ mkdir -p Contents/Frameworks diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh index e065ce697..5773ad2c7 100755 --- a/admin/mac/build-release-osx.sh +++ b/admin/mac/build-release-osx.sh @@ -58,7 +58,10 @@ VERSION=$1 header "Copying VLC plugins into bundle" mkdir -p Contents/PlugIns - cp -R /usr/local/Cellar/vlc-git/HEAD/lib/vlc/plugins/* 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 @@ -68,11 +71,11 @@ VERSION=$1 cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks cp $ROOT/../admin/mac/qt.conf Contents/Resources - header "Adding spotify resolver to bundle if tomahawk_spotify found in $ROOT" - if [ -e $ROOT/tomahawk_spotify ] + header "Adding spotify resolver to bundle if spotify_tomahawkresolver found in $ROOT" + if [ -e $ROOT/spotify_tomahawkresolver ] then - header "Found, so adding spotify resolver." - $ROOT/../admin/mac/add-spotify.sh $ROOT/tomahawk_spotify + header "Found, so adding spotify resolver."ac + $ROOT/../admin/mac/add-spotify.sh $ROOT/spotify_tomahawkresolver fi header "Creating DMG"