~stolowski/unity-scope-mediascanner/set-child-feeds

Committer: CI bot
Author(s): James Henstridge
Date: 2014-10-13 12:00:45 UTC
mfrom: (177.2.16 click-support)
Revision ID: ps-jenkins@lists.canonical.com-20141013120045-d7bd9poj72au5672

Reorganise package and update build rules to support building scopes as click packages. Also update icons to the latest versions from design. Fixes: 1380586
Approved by: Pawel Stolowski, PS Jenkins bot

files added:
cmake

cmake/ClickBuild.cmake

cmake/ClickScope.cmake

cmake/Intltool.cmake

src/musicaggregator

src/musicaggregator/CMakeLists.txt

src/musicaggregator/apparmor.json

src/musicaggregator/icon.png

src/musicaggregator/manifest.json.in

src/mymusic

src/mymusic/CMakeLists.txt

src/mymusic/apparmor.json

src/mymusic/manifest.json.in

src/myvideos

src/myvideos/CMakeLists.txt

src/myvideos/apparmor.json

src/myvideos/icon.png

src/myvideos/manifest.json.in

src/utils

src/utils/CMakeLists.txt

src/utils/i18n.cpp

src/videoaggregator

src/videoaggregator/CMakeLists.txt

src/videoaggregator/apparmor.json

src/videoaggregator/manifest.json.in

src/videoaggregator/paper-white-bg-v2.png

files removed:
data

data/CMakeLists.txt

data/music.png

data/video.png

src/CMakeLists.txt

files renamed:
data/musicaggregator-settings.ini.in.in => src/musicaggregator/musicaggregator-settings.ini.in

data/musicaggregator.ini.in.in => src/musicaggregator/musicaggregator.ini.in

src/musicaggregatorquery.cpp => src/musicaggregator/musicaggregatorquery.cpp

src/musicaggregatorquery.h => src/musicaggregator/musicaggregatorquery.h

src/musicaggregatorscope.cpp => src/musicaggregator/musicaggregatorscope.cpp

src/musicaggregatorscope.h => src/musicaggregator/musicaggregatorscope.h

src/onlinemusicresultforwarder.cpp => src/musicaggregator/onlinemusicresultforwarder.cpp

src/onlinemusicresultforwarder.h => src/musicaggregator/onlinemusicresultforwarder.h

data/paper-white-bg-v2.png => src/musicaggregator/paper-white-bg-v2.png

data/musicaggregator-screenshot.jpg => src/musicaggregator/screenshot.jpg

data/music-scope.png => src/mymusic/icon.png

data/mediascanner-music.ini.in.in => src/mymusic/mediascanner-music.ini.in

src/music-scope.cpp => src/mymusic/music-scope.cpp

src/music-scope.h => src/mymusic/music-scope.h

data/mediascanner-music-screenshot.jpg => src/mymusic/screenshot.jpg

data/mediascanner-video.ini.in.in => src/myvideos/mediascanner-video.ini.in

data/mediascanner-video-screenshot.jpg => src/myvideos/screenshot.jpg

src/video-scope.cpp => src/myvideos/video-scope.cpp

src/video-scope.h => src/myvideos/video-scope.h

src/bufferedresultforwarder.cpp => src/utils/bufferedresultforwarder.cpp

src/bufferedresultforwarder.h => src/utils/bufferedresultforwarder.h

src/i18n.h => src/utils/i18n.h

src/notify-strategy.cpp => src/utils/notify-strategy.cpp

src/notify-strategy.h => src/utils/notify-strategy.h

src/resultforwarder.cpp => src/utils/resultforwarder.cpp

src/resultforwarder.h => src/utils/resultforwarder.h

data/video-scope.png => src/videoaggregator/icon.png

data/videoaggregator-screenshot.jpg => src/videoaggregator/screenshot.jpg

data/videoaggregator-settings.ini.in.in => src/videoaggregator/videoaggregator-settings.ini.in

data/videoaggregator.ini.in.in => src/videoaggregator/videoaggregator.ini.in

src/videoaggregatorquery.cpp => src/videoaggregator/videoaggregatorquery.cpp

src/videoaggregatorquery.h => src/videoaggregator/videoaggregatorquery.h

src/videoaggregatorscope.cpp => src/videoaggregator/videoaggregatorscope.cpp

src/videoaggregatorscope.h => src/videoaggregator/videoaggregatorscope.h

files modified:
CMakeLists.txt

config.h.in

po/CMakeLists.txt

tests/CMakeLists.txt

tests/test-music-scope.cpp

tests/test-result-forwarder.cpp

tests/test-video-scope.cpp

Show diffs side-by-side

added added

removed removed

CMakeLists.txt

project(unity-scope-mediascanner C CXX)

cmake_minimum_required(VERSION 2.8.9)

set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")

set(VERSION 0.3)

find_package(PkgConfig REQUIRED)

find_package(Threads REQUIRED)

find_program(XGETTEXT_BIN xgettext)

find_program(MSGFMT_BIN msgfmt)

find_program(INTLTOOL_EXTRACT_BIN intltool-extract)

find_program(INTLTOOL_MERGE_BIN intltool-merge)

if(NOT MSGFMT_BIN)

message(FATAL_ERROR "Gettext binaries not found.")

endif()

if(NOT INTLTOOL_MERGE_BIN)

message(FATAL_ERROR "Intltool binaries not found.")

endif()

set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wmissing-prototypes -pedantic -std=c99")

set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wmissing-declarations -pedantic -std=c++11")

set(SOURCE_BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/src")

include(GNUInstallDirs)

include(ClickBuild)

include(ClickScope)

include(Intltool)

set(GETTEXT_PACKAGE unity-scope-mediascanner)

include_directories(${CMAKE_CURRENT_BINARY_DIR})

add_subdirectory("po")

add_subdirectory("src")

add_subdirectory("data")

add_subdirectory("src/utils")

add_subdirectory("src/musicaggregator")

add_subdirectory("src/videoaggregator")

add_subdirectory("src/mymusic")

add_subdirectory("src/myvideos")

enable_testing()

add_subdirectory("tests")

add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -V --output-on-failure)

if(NOT CMAKE_CROSSCOMPILING)

enable_testing()

add_subdirectory("tests")

add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND} -V --output-on-failure)

endif()

Older »