Unity

Merge lp:~jpakkane/unity/build-fixes2 into lp:unity

  1. build-fixes2
  2. Merge into trunk
Proposed by Jussi Pakkanen
Status: Merged
Approved by: Marco Trevisan (Treviño)
Approved revision: no longer in the source branch.
Merged at revision: 2934
Proposed branch: lp:~jpakkane/unity/build-fixes2
Merge into: lp:unity
Diff against target: 571 lines (+35/-46)
32 files modified
UnityCore/CMakeLists.txt (+1/-2)
dash/CMakeLists.txt (+1/-4)
dash/FilterAllButton.cpp (+1/-0)
dash/FilterGenreWidget.cpp (+1/-0)
dash/FilterMultiRangeWidget.cpp (+1/-0)
dash/FilterRatingsWidget.cpp (+1/-0)
dash/LensView.cpp (+1/-0)
dash/PlacesGroup.cpp (+1/-0)
dash/previews/ApplicationPreview.cpp (+2/-1)
dash/previews/CMakeLists.txt (+1/-7)
dash/previews/PreviewRatingsWidget.cpp (+1/-0)
dash/previews/SocialPreview.cpp (+2/-0)
hud/CMakeLists.txt (+1/-4)
hud/HudView.cpp (+1/-0)
launcher/BFBLauncherIcon.cpp (+1/-0)
launcher/CMakeLists.txt (+1/-5)
launcher/DesktopLauncherIcon.cpp (+1/-0)
launcher/DeviceNotificationDisplayImp.cpp (+1/-0)
launcher/ExpoLauncherIcon.cpp (+1/-0)
launcher/LauncherController.cpp (+1/-0)
launcher/SoftwareCenterLauncherIcon.cpp (+1/-0)
launcher/TrashLauncherIcon.cpp (+1/-0)
launcher/VolumeLauncherIcon.cpp (+1/-0)
panel/CMakeLists.txt (+1/-4)
panel/PanelMenuView.cpp (+1/-0)
services/CMakeLists.txt (+1/-2)
shortcuts/CMakeLists.txt (+1/-4)
shortcuts/ShortcutHintPrivate.cpp (+1/-0)
shortcuts/StandaloneShortcuts.cpp (+1/-0)
unity-shared/CMakeLists.txt (+1/-3)
unity-shared/TextInput.h (+2/-1)
unity-standalone/CMakeLists.txt (+1/-9)
To merge this branch: bzr merge lp:~jpakkane/unity/build-fixes2
Reviewer Review Type Date Requested Status
Marco Trevisan (Treviño) Approve
Stephen M. Webb (community) Needs Fixing
PS Jenkins bot (community) continuous-integration Needs Fixing
Review via email: mp+130329@code.launchpad.net

Commit message

More build fixes.

Description of the change

Second set of build fixes. This has three separate fixes.

1. GETTEXT_PACKAGE is defined in two different places: config.h and as a command line argument that is given to every single compiler invocation. Only use the first one and even then only when it is actually used.

2. Some include directories were (multiply) defined with add_definitions(-Isomething). Get rid of them all.

3. Removed current source directory from include paths. It was added twice for each directory and both were unnecessary, since the source directory is in the search path by default.

To post a comment you must log in.
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

There was a fourth one as well. There were a lot of constructs like this:

target_link_library(foo bar)
add_dependency(foo bar)

The latter is unnecessary, target_link_library sets up the dependency automatically. Removed the extra definitions.

Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

A review please? This still applies cleanly and is a dependency for speeding up the build with precompiled headers.

Revision history for this message
Stephen M. Webb (bregma) wrote :

Sweet.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/163/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=amd64/163/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-mbs-autolanding/./build=pbuilder,distribution=quantal,flavor=i386/163/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Stephen M. Webb (bregma) wrote :

Merged trunk does not build due to an order-of-includes problem. The following patch fixes it.

=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h 2012-11-22 12:53:25 +0000
+++ unity-shared/TextInput.h 2012-11-26 16:37:04 +0000
@@ -20,6 +20,8 @@
 #ifndef TEXTINPUT_H
 #define TEXTINPUT_H

+#include "config.h"
+
 #include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>

@@ -34,7 +36,6 @@
 #include <UnityCore/GLibSource.h>
 #include <UnityCore/Variant.h>

-#include "config.h"
 #include "CairoTexture.h"
 #include "unity-shared/IconTexture.h"
 #include "unity-shared/IMTextEntry.h"

review: Needs Fixing
Revision history for this message
Jussi Pakkanen (jpakkane) wrote :

Fixed.

Revision history for this message
Marco Trevisan (Treviño) (3v1n0) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'UnityCore/CMakeLists.txt'
--- UnityCore/CMakeLists.txt 2012-11-14 14:54:06 +0000
+++ UnityCore/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -104,12 +104,11 @@
104# CFLAGS and LIBS104# CFLAGS and LIBS
105#105#
106set (CFLAGS106set (CFLAGS
107 "-I${CMAKE_BINARY_DIR}"
108 "-DGETTEXT_PACKAGE=\"unity\""
109 "-DLENSES_DIR=\"${_lensesdir}\""107 "-DLENSES_DIR=\"${_lensesdir}\""
110 )108 )
111add_definitions (${CFLAGS})109add_definitions (${CFLAGS})
112include_directories(${CORE_DEPS_INCLUDE_DIRS})110include_directories(${CORE_DEPS_INCLUDE_DIRS})
111include_directories(${CMAKE_BINARY_DIR})
113112
114set (LIBS ${CORE_DEPS_LIBRARIES})113set (LIBS ${CORE_DEPS_LIBRARIES})
115114
116115
=== modified file 'dash/CMakeLists.txt'
--- dash/CMakeLists.txt 2012-10-17 08:46:48 +0000
+++ dash/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -22,7 +20,7 @@
22set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})20set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
23link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})21link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2422
25include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})23include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2624
27add_subdirectory(previews)25add_subdirectory(previews)
2826
@@ -64,5 +62,4 @@
64# Standalone variant62# Standalone variant
65#63#
66add_executable (dash StandaloneDash.cpp)64add_executable (dash StandaloneDash.cpp)
67add_dependencies (dash dash-lib)
68target_link_libraries (dash dash-lib unity-shared)65target_link_libraries (dash dash-lib unity-shared)
6966
=== modified file 'dash/FilterAllButton.cpp'
--- dash/FilterAllButton.cpp 2012-11-19 18:54:19 +0000
+++ dash/FilterAllButton.cpp 2012-11-27 07:30:28 +0000
@@ -22,6 +22,7 @@
2222
2323
24#include <glib.h>24#include <glib.h>
25#include "config.h"
25#include <glib/gi18n-lib.h>26#include <glib/gi18n-lib.h>
2627
27#include "FilterAllButton.h"28#include "FilterAllButton.h"
2829
=== modified file 'dash/FilterGenreWidget.cpp'
--- dash/FilterGenreWidget.cpp 2012-05-06 23:48:38 +0000
+++ dash/FilterGenreWidget.cpp 2012-11-27 07:30:28 +0000
@@ -21,6 +21,7 @@
21 */21 */
2222
23#include <glib.h>23#include <glib.h>
24#include "config.h"
24#include <glib/gi18n-lib.h>25#include <glib/gi18n-lib.h>
25#include <UnityCore/GLibWrapper.h>26#include <UnityCore/GLibWrapper.h>
2627
2728
=== modified file 'dash/FilterMultiRangeWidget.cpp'
--- dash/FilterMultiRangeWidget.cpp 2012-05-06 23:48:38 +0000
+++ dash/FilterMultiRangeWidget.cpp 2012-11-27 07:30:28 +0000
@@ -28,6 +28,7 @@
28#include "FilterBasicButton.h"28#include "FilterBasicButton.h"
2929
30#include <glib.h>30#include <glib.h>
31#include "config.h"
31#include <glib/gi18n-lib.h>32#include <glib/gi18n-lib.h>
3233
33namespace unity34namespace unity
3435
=== modified file 'dash/FilterRatingsWidget.cpp'
--- dash/FilterRatingsWidget.cpp 2012-05-06 23:48:38 +0000
+++ dash/FilterRatingsWidget.cpp 2012-11-27 07:30:28 +0000
@@ -22,6 +22,7 @@
2222
23#include <Nux/Nux.h>23#include <Nux/Nux.h>
24#include <glib.h>24#include <glib.h>
25#include "config.h"
25#include <glib/gi18n-lib.h>26#include <glib/gi18n-lib.h>
2627
27#include "unity-shared/DashStyle.h"28#include "unity-shared/DashStyle.h"
2829
=== modified file 'dash/LensView.cpp'
--- dash/LensView.cpp 2012-11-23 23:49:46 +0000
+++ dash/LensView.cpp 2012-11-27 07:30:28 +0000
@@ -35,6 +35,7 @@
35#include "unity-shared/PlacesVScrollBar.h"35#include "unity-shared/PlacesVScrollBar.h"
36#include "unity-shared/PlacesOverlayVScrollBar.h"36#include "unity-shared/PlacesOverlayVScrollBar.h"
3737
38#include "config.h"
38#include <glib/gi18n-lib.h>39#include <glib/gi18n-lib.h>
3940
40namespace unity41namespace unity
4142
=== modified file 'dash/PlacesGroup.cpp'
--- dash/PlacesGroup.cpp 2012-11-19 18:54:19 +0000
+++ dash/PlacesGroup.cpp 2012-11-27 07:30:28 +0000
@@ -25,6 +25,7 @@
2525
26#include "PlacesGroup.h"26#include "PlacesGroup.h"
27#include <glib.h>27#include <glib.h>
28#include "config.h"
28#include <glib/gi18n-lib.h>29#include <glib/gi18n-lib.h>
2930
30#include <UnityCore/Variant.h>31#include <UnityCore/Variant.h>
3132
=== modified file 'dash/previews/ApplicationPreview.cpp'
--- dash/previews/ApplicationPreview.cpp 2012-11-13 21:42:58 +0000
+++ dash/previews/ApplicationPreview.cpp 2012-11-27 07:30:28 +0000
@@ -32,6 +32,8 @@
32#include <Nux/VLayout.h>32#include <Nux/VLayout.h>
33#include <Nux/GridHLayout.h>33#include <Nux/GridHLayout.h>
34#include <Nux/Button.h>34#include <Nux/Button.h>
35
36#include "config.h"
35#include <glib/gi18n-lib.h>37#include <glib/gi18n-lib.h>
36 38
37#include "ApplicationPreview.h"39#include "ApplicationPreview.h"
@@ -39,7 +41,6 @@
39#include "PreviewInfoHintWidget.h"41#include "PreviewInfoHintWidget.h"
40#include "PreviewRatingsWidget.h"42#include "PreviewRatingsWidget.h"
4143
42
43namespace unity44namespace unity
44{45{
45namespace dash46namespace dash
4647
=== modified file 'dash/previews/CMakeLists.txt'
--- dash/previews/CMakeLists.txt 2012-11-06 18:19:09 +0000
+++ dash/previews/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -21,7 +19,7 @@
21set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})19set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
22link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})20link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2321
24include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})22include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2523
26#24#
27# Headers & Sources25# Headers & Sources
@@ -52,26 +50,22 @@
52# Application Standalone variant50# Application Standalone variant
53#51#
54add_executable (app_previews StandaloneApplicationPreview.cpp)52add_executable (app_previews StandaloneApplicationPreview.cpp)
55add_dependencies (app_previews previews-lib)
56target_link_libraries (app_previews previews-lib unity-shared)53target_link_libraries (app_previews previews-lib unity-shared)
5754
58# 55#
59# Music Standalone variant56# Music Standalone variant
60#57#
61add_executable (music_previews StandaloneMusicPreview.cpp)58add_executable (music_previews StandaloneMusicPreview.cpp)
62add_dependencies (music_previews previews-lib)
63target_link_libraries (music_previews previews-lib unity-shared)59target_link_libraries (music_previews previews-lib unity-shared)
6460
65# 61#
66# Social Standalone variant62# Social Standalone variant
67#63#
68add_executable (social_previews StandaloneSocialPreview.cpp)64add_executable (social_previews StandaloneSocialPreview.cpp)
69add_dependencies (social_previews previews-lib)
70target_link_libraries (social_previews previews-lib unity-shared)65target_link_libraries (social_previews previews-lib unity-shared)
7166
72# 67#
73# Music Standalone variant68# Music Standalone variant
74#69#
75add_executable (movie_previews StandaloneMoviePreview.cpp)70add_executable (movie_previews StandaloneMoviePreview.cpp)
76add_dependencies (movie_previews previews-lib)
77target_link_libraries (movie_previews previews-lib unity-shared)71target_link_libraries (movie_previews previews-lib unity-shared)
7872
=== modified file 'dash/previews/PreviewRatingsWidget.cpp'
--- dash/previews/PreviewRatingsWidget.cpp 2012-08-28 08:30:00 +0000
+++ dash/previews/PreviewRatingsWidget.cpp 2012-11-27 07:30:28 +0000
@@ -23,6 +23,7 @@
23#include <Nux/Nux.h>23#include <Nux/Nux.h>
24#include <Nux/VLayout.h>24#include <Nux/VLayout.h>
25#include <glib.h>25#include <glib.h>
26#include "config.h"
26#include <glib/gi18n-lib.h>27#include <glib/gi18n-lib.h>
2728
28#include "unity-shared/RatingsButton.h"29#include "unity-shared/RatingsButton.h"
2930
=== modified file 'dash/previews/SocialPreview.cpp'
--- dash/previews/SocialPreview.cpp 2012-11-13 21:42:58 +0000
+++ dash/previews/SocialPreview.cpp 2012-11-27 07:30:28 +0000
@@ -32,6 +32,8 @@
32#include <Nux/VLayout.h>32#include <Nux/VLayout.h>
33#include <Nux/GridHLayout.h>33#include <Nux/GridHLayout.h>
34#include <Nux/Button.h>34#include <Nux/Button.h>
35
36#include "config.h"
35#include <glib/gi18n-lib.h>37#include <glib/gi18n-lib.h>
36 38
37#include "SocialPreview.h"39#include "SocialPreview.h"
3840
=== modified file 'hud/CMakeLists.txt'
--- hud/CMakeLists.txt 2012-10-17 08:46:48 +0000
+++ hud/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -22,7 +20,7 @@
22set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})20set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
23link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})21link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2422
25include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})23include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2624
27#25#
28# Headers & Sources26# Headers & Sources
@@ -44,5 +42,4 @@
44# Standalone variant42# Standalone variant
45#43#
46add_executable (hud StandaloneHud.cpp)44add_executable (hud StandaloneHud.cpp)
47add_dependencies (hud hud-lib)
48target_link_libraries (hud hud-lib unity-shared)45target_link_libraries (hud hud-lib unity-shared)
4946
=== modified file 'hud/HudView.cpp'
--- hud/HudView.cpp 2012-11-08 09:12:24 +0000
+++ hud/HudView.cpp 2012-11-27 07:30:28 +0000
@@ -20,6 +20,7 @@
2020
21#include <math.h>21#include <math.h>
2222
23#include "config.h"
23#include <glib/gi18n-lib.h>24#include <glib/gi18n-lib.h>
24#include <NuxCore/Logger.h>25#include <NuxCore/Logger.h>
25#include <UnityCore/GLibWrapper.h>26#include <UnityCore/GLibWrapper.h>
2627
=== modified file 'launcher/BFBLauncherIcon.cpp'
--- launcher/BFBLauncherIcon.cpp 2012-09-20 14:58:49 +0000
+++ launcher/BFBLauncherIcon.cpp 2012-11-27 07:30:28 +0000
@@ -18,6 +18,7 @@
18 * Andrea Azzarone <azzaronea@gmail.com>18 * Andrea Azzarone <azzaronea@gmail.com>
19 */19 */
2020
21#include "config.h"
21#include <glib/gi18n-lib.h>22#include <glib/gi18n-lib.h>
22#include "unity-shared/UBusMessages.h"23#include "unity-shared/UBusMessages.h"
2324
2425
=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt 2012-11-15 22:53:24 +0000
+++ launcher/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -6,8 +6,6 @@
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-fPIC"8 "-fPIC"
9 "-DGETTEXT_PACKAGE=\"unity\""
10 "-I${CMAKE_CURRENT_BINARY_DIR}"
11 )9 )
1210
13if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")11if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -23,7 +21,7 @@
23set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})21set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
24link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})22link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2523
26include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})24include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2725
28#26#
29# Headers & Sources27# Headers & Sources
@@ -103,11 +101,9 @@
103# Standalone variant101# Standalone variant
104#102#
105add_executable (launcher StandaloneLauncher.cpp)103add_executable (launcher StandaloneLauncher.cpp)
106add_dependencies (launcher launcher-lib)
107target_link_libraries (launcher launcher-lib unity-shared unity-shared-standalone)104target_link_libraries (launcher launcher-lib unity-shared unity-shared-standalone)
108105
109if (ENABLE_X_SUPPORT)106if (ENABLE_X_SUPPORT)
110 add_executable (switcher StandaloneSwitcher.cpp)107 add_executable (switcher StandaloneSwitcher.cpp)
111 add_dependencies (switcher switcher-lib launcher-lib)
112 target_link_libraries (switcher switcher-lib launcher-lib unity-shared unity-shared-standalone)108 target_link_libraries (switcher switcher-lib launcher-lib unity-shared unity-shared-standalone)
113endif ()109endif ()
114110
=== modified file 'launcher/DesktopLauncherIcon.cpp'
--- launcher/DesktopLauncherIcon.cpp 2012-10-11 01:44:15 +0000
+++ launcher/DesktopLauncherIcon.cpp 2012-11-27 07:30:28 +0000
@@ -20,6 +20,7 @@
20#include "DesktopLauncherIcon.h"20#include "DesktopLauncherIcon.h"
21#include "unity-shared/WindowManager.h"21#include "unity-shared/WindowManager.h"
22#include "FavoriteStore.h"22#include "FavoriteStore.h"
23#include "config.h"
2324
24#include <glib/gi18n-lib.h>25#include <glib/gi18n-lib.h>
2526
2627
=== modified file 'launcher/DeviceNotificationDisplayImp.cpp'
--- launcher/DeviceNotificationDisplayImp.cpp 2012-09-12 15:07:07 +0000
+++ launcher/DeviceNotificationDisplayImp.cpp 2012-11-27 07:30:28 +0000
@@ -18,6 +18,7 @@
18 */18 */
1919
20#include <gdk/gdk.h>20#include <gdk/gdk.h>
21#include "config.h"
21#include <glib/gi18n-lib.h>22#include <glib/gi18n-lib.h>
22#include <libnotify/notify.h>23#include <libnotify/notify.h>
23#include <sigc++/sigc++.h>24#include <sigc++/sigc++.h>
2425
=== modified file 'launcher/ExpoLauncherIcon.cpp'
--- launcher/ExpoLauncherIcon.cpp 2012-11-06 18:19:09 +0000
+++ launcher/ExpoLauncherIcon.cpp 2012-11-27 07:30:28 +0000
@@ -20,6 +20,7 @@
20#include "ExpoLauncherIcon.h"20#include "ExpoLauncherIcon.h"
21#include "FavoriteStore.h"21#include "FavoriteStore.h"
2222
23#include "config.h"
23#include <glib/gi18n-lib.h>24#include <glib/gi18n-lib.h>
2425
25namespace unity26namespace unity
2627
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp 2012-11-27 01:04:19 +0000
+++ launcher/LauncherController.cpp 2012-11-27 07:30:28 +0000
@@ -19,6 +19,7 @@
19 * Marco Trevisan <marco.trevisan@canonical.com>19 * Marco Trevisan <marco.trevisan@canonical.com>
20 */20 */
2121
22#include "config.h"
22#include <glib/gi18n-lib.h>23#include <glib/gi18n-lib.h>
23#include <libbamf/libbamf.h>24#include <libbamf/libbamf.h>
2425
2526
=== modified file 'launcher/SoftwareCenterLauncherIcon.cpp'
--- launcher/SoftwareCenterLauncherIcon.cpp 2012-10-31 16:33:00 +0000
+++ launcher/SoftwareCenterLauncherIcon.cpp 2012-11-27 07:30:28 +0000
@@ -19,6 +19,7 @@
19 */19 */
2020
21#include <NuxCore/Logger.h>21#include <NuxCore/Logger.h>
22#include "config.h"
22#include <glib/gi18n-lib.h>23#include <glib/gi18n-lib.h>
23#include "SoftwareCenterLauncherIcon.h"24#include "SoftwareCenterLauncherIcon.h"
24#include "Launcher.h"25#include "Launcher.h"
2526
=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp 2012-11-13 22:39:49 +0000
+++ launcher/TrashLauncherIcon.cpp 2012-11-27 07:30:28 +0000
@@ -20,6 +20,7 @@
2020
21#include "TrashLauncherIcon.h"21#include "TrashLauncherIcon.h"
2222
23#include "config.h"
23#include <glib/gi18n-lib.h>24#include <glib/gi18n-lib.h>
24#include <Nux/WindowCompositor.h>25#include <Nux/WindowCompositor.h>
25#include <NuxCore/Logger.h>26#include <NuxCore/Logger.h>
2627
=== modified file 'launcher/VolumeLauncherIcon.cpp'
--- launcher/VolumeLauncherIcon.cpp 2012-11-27 01:04:19 +0000
+++ launcher/VolumeLauncherIcon.cpp 2012-11-27 07:30:28 +0000
@@ -19,6 +19,7 @@
19 */19 */
2020
2121
22#include "config.h"
22#include <glib/gi18n-lib.h>23#include <glib/gi18n-lib.h>
23#include <NuxCore/Logger.h>24#include <NuxCore/Logger.h>
24#include <UnityCore/GLibSignal.h>25#include <UnityCore/GLibSignal.h>
2526
=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt 2012-10-18 10:44:07 +0000
+++ panel/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -22,7 +20,7 @@
22set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})20set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
23link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})21link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2422
25include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})23include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2624
27#25#
28# Headers & Sources26# Headers & Sources
@@ -45,5 +43,4 @@
45# Standalone variant43# Standalone variant
46#44#
47add_executable (panel StandalonePanel.cpp)45add_executable (panel StandalonePanel.cpp)
48add_dependencies (panel panel-lib)
49target_link_libraries (panel panel-lib unity-shared unity-shared-standalone)46target_link_libraries (panel panel-lib unity-shared unity-shared-standalone)
5047
=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp 2012-11-16 15:58:49 +0000
+++ panel/PanelMenuView.cpp 2012-11-27 07:30:28 +0000
@@ -31,6 +31,7 @@
3131
32#include <UnityCore/Variant.h>32#include <UnityCore/Variant.h>
3333
34#include "config.h"
34#include <glib/gi18n-lib.h>35#include <glib/gi18n-lib.h>
3536
36namespace unity37namespace unity
3738
=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt 2012-11-06 18:19:09 +0000
+++ services/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -35,13 +35,12 @@
35set(CFLAGS35set(CFLAGS
36 "${SERVICE_DEPS_CFLAGS}"36 "${SERVICE_DEPS_CFLAGS}"
37 ${SERVICE_DEPS_CFLAGS_OTHER}37 ${SERVICE_DEPS_CFLAGS_OTHER}
38 "-I${CMAKE_CURRENT_BINARY_DIR}"
39 "-DGETTEXT_PACKAGE=\"unity\""
40 "-DINDICATORDIR=\"${_indicatordir}\""38 "-DINDICATORDIR=\"${_indicatordir}\""
41 "-DINDICATORICONDIR=\"${_iconsdir}\""39 "-DINDICATORICONDIR=\"${_iconsdir}\""
42 "-Werror -Wall"40 "-Werror -Wall"
43 )41 )
44add_definitions(${CFLAGS})42add_definitions(${CFLAGS})
43include_directories(${CMAKE_CURRENT_BINARY_DIR})
4544
46set(LIBS ${SERVICE_DEPS_LIBRARIES})45set(LIBS ${SERVICE_DEPS_LIBRARIES})
47link_libraries(${LIBS})46link_libraries(${LIBS})
4847
=== modified file 'shortcuts/CMakeLists.txt'
--- shortcuts/CMakeLists.txt 2012-10-17 08:46:48 +0000
+++ shortcuts/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -22,7 +20,7 @@
22set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})20set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
23link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})21link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2422
25include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})23include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2624
27#25#
28# Headers & Sources26# Headers & Sources
@@ -48,5 +46,4 @@
48# Standalone variant46# Standalone variant
49#47#
50add_executable (shortcuts StandaloneShortcuts.cpp)48add_executable (shortcuts StandaloneShortcuts.cpp)
51add_dependencies (shortcuts shortcuts-lib)
52target_link_libraries (shortcuts shortcuts-lib unity-shared)49target_link_libraries (shortcuts shortcuts-lib unity-shared)
5350
=== modified file 'shortcuts/ShortcutHintPrivate.cpp'
--- shortcuts/ShortcutHintPrivate.cpp 2012-05-07 22:28:17 +0000
+++ shortcuts/ShortcutHintPrivate.cpp 2012-11-27 07:30:28 +0000
@@ -16,6 +16,7 @@
16 * Authored by: Andrea Azzarone <azzaronea@gmail.com>16 * Authored by: Andrea Azzarone <azzaronea@gmail.com>
17 */17 */
1818
19#include "config.h"
19#include <glib/gi18n-lib.h>20#include <glib/gi18n-lib.h>
20#include <gtk/gtk.h>21#include <gtk/gtk.h>
2122
2223
=== modified file 'shortcuts/StandaloneShortcuts.cpp'
--- shortcuts/StandaloneShortcuts.cpp 2012-09-11 10:38:31 +0000
+++ shortcuts/StandaloneShortcuts.cpp 2012-11-27 07:30:28 +0000
@@ -17,6 +17,7 @@
17 * Authored by: Andrea Azzarone <azzaronea@gmail.com>17 * Authored by: Andrea Azzarone <azzaronea@gmail.com>
18 */18 */
1919
20#include "config.h"
20#include <glib/gi18n-lib.h>21#include <glib/gi18n-lib.h>
21#include <gtk/gtk.h>22#include <gtk/gtk.h>
22#include <Nux/Nux.h>23#include <Nux/Nux.h>
2324
=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt 2012-11-20 21:08:54 +0000
+++ unity-shared/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -20,7 +18,7 @@
20set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})18set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
21link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})19link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2220
23include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})21include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2422
25#23#
26# Headers & Sources24# Headers & Sources
2725
=== modified file 'unity-shared/TextInput.h'
--- unity-shared/TextInput.h 2012-11-22 12:53:25 +0000
+++ unity-shared/TextInput.h 2012-11-27 07:30:28 +0000
@@ -20,6 +20,8 @@
20#ifndef TEXTINPUT_H20#ifndef TEXTINPUT_H
21#define TEXTINPUT_H21#define TEXTINPUT_H
2222
23#include "config.h"
24
23#include <glib/gi18n-lib.h>25#include <glib/gi18n-lib.h>
24#include <gtk/gtk.h>26#include <gtk/gtk.h>
2527
@@ -34,7 +36,6 @@
34#include <UnityCore/GLibSource.h>36#include <UnityCore/GLibSource.h>
35#include <UnityCore/Variant.h>37#include <UnityCore/Variant.h>
3638
37#include "config.h"
38#include "CairoTexture.h"39#include "CairoTexture.h"
39#include "unity-shared/IconTexture.h"40#include "unity-shared/IconTexture.h"
40#include "unity-shared/IMTextEntry.h"41#include "unity-shared/IMTextEntry.h"
4142
=== modified file 'unity-standalone/CMakeLists.txt'
--- unity-standalone/CMakeLists.txt 2012-10-17 08:46:48 +0000
+++ unity-standalone/CMakeLists.txt 2012-11-27 07:30:28 +0000
@@ -5,8 +5,6 @@
5set (CFLAGS5set (CFLAGS
6 ${CACHED_UNITY_DEPS_CFLAGS}6 ${CACHED_UNITY_DEPS_CFLAGS}
7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}7 ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
8 "-DGETTEXT_PACKAGE=\"unity\""
9 "-I${CMAKE_CURRENT_BINARY_DIR}"
10 )8 )
119
12if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")10if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l")
@@ -22,7 +20,7 @@
22set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})20set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
23link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})21link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
2422
25include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})23include_directories (.. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR})
2624
27#25#
28# Headers & Sources26# Headers & Sources
@@ -32,12 +30,6 @@
32 )30 )
3331
34add_executable (unity-standalone StandaloneUnity.cpp)32add_executable (unity-standalone StandaloneUnity.cpp)
35add_dependencies (unity-standalone
36 dash-lib
37 launcher-lib
38 panel-lib
39 unity-shared
40 unity-shared-standalone)
41target_link_libraries (unity-standalone 33target_link_libraries (unity-standalone
42 dash-lib34 dash-lib
43 launcher-lib35 launcher-lib