Unity Action API

Merge lp:~kaijanmaki/unity-action-api/fix_nohud_build into lp:~unity-team/unity-action-api/nohud

  1. fix_nohud_build
  2. Merge into nohud
Proposed by Antti Kaijanmäki
Status: Merged
Approved by: Antti Kaijanmäki
Approved revision: 30
Merged at revision: 22
Proposed branch: lp:~kaijanmaki/unity-action-api/fix_nohud_build
Merge into: lp:~unity-team/unity-action-api/nohud
Diff against target: 90 lines (+20/-2)
5 files modified
CMakeLists.txt (+7/-2)
debian/control (+1/-0)
src/CMakeLists.txt (+5/-0)
src/unity-action-manager.cpp (+4/-0)
test/cpp/tst_actionmanager.cpp (+3/-0)
To merge this branch: bzr merge lp:~kaijanmaki/unity-action-api/fix_nohud_build
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+173736@code.launchpad.net

Commit message

* If we don't have libhud, we need to manually add the gio headers and libraries.
* add libglib2.0-dev to build-deps
* other random boring backporting related changes

To post a comment you must log in.
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
23. By Antti Kaijanmäki

If we don't have libhud, we need to manually add the gio headers and libraries.

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

FAILED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/2/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-raring-amd64-ci/2/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-raring-armhf-ci/2
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-raring-armhf-ci/2/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/2/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:22
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/3/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/1/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/3/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-armhf-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/4/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:23
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/3/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/5/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
24. By Antti Kaijanmäki

lower the minimum required cmake

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

FAILED: Continuous integration, rev:24
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/6/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/6/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
25. By Antti Kaijanmäki

g_type_init() for older glib and require cmake 2.8.9 after all.

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

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/7/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/5/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/7/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:25
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/8/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
26. By Antti Kaijanmäki

Don't compile with -std=c++11

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

FAILED: Continuous integration, rev:26
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/7/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/9/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
27. By Antti Kaijanmäki

try with --std=c++0x instead

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

FAILED: Continuous integration, rev:27
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/8/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/10/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
28. By Antti Kaijanmäki

be permissive.

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

FAILED: Continuous integration, rev:28
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/11/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
29. By Antti Kaijanmäki

buggy cmake,qt5..

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

FAILED: Continuous integration, rev:29
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/12/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/12/rebuild

review: Needs Fixing (continuous-integration)
lp:~kaijanmaki/unity-action-api/fix_nohud_build updated
30. By Antti Kaijanmäki

...

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

PASSED: Continuous integration, rev:30
http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-action-api-nohud-precise-amd64-ci/11

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-team-unity-action-api-nohud-ci/13/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2013-07-09 12:52:13 +0000
3+++ CMakeLists.txt 2013-07-09 20:39:24 +0000
4@@ -19,9 +19,13 @@
5 pkg_search_module(HUD hud-2)
6 if(${HUD_FOUND})
7 add_definitions( -DHAVE_HUD=1 )
8+else()
9+pkg_check_modules(GLIB2 REQUIRED glib-2.0)
10+pkg_check_modules(GOBJECT2 REQUIRED gobject-2.0)
11+pkg_check_modules(GIO2 REQUIRED gio-2.0)
12 endif()
13
14-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fno-permissive -pedantic -Wall -Wextra")
15+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++0x -fpermissive -pedantic -Wall -Wextra")
16 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
17
18 if ("${CMAKE_BUILD_TYPE}" STREQUAL "release" OR "${CMAKE_BUILD_TYPE}" STREQUAL "relwithdebinfo")
19@@ -61,12 +65,13 @@
20 add_custom_target(cppcheck COMMAND cppcheck --enable=all -q --error-exitcode=2
21 ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests)
22 find_package(Qt5Quick REQUIRED)
23+include_directories(${Qt5Quick_INCLUDE_DIRS})
24
25 include_directories(include)
26 add_subdirectory(src)
27 add_subdirectory(qml)
28 add_subdirectory(documentation)
29-add_subdirectory(examples)
30+#add_subdirectory(examples)
31
32 find_program(qmltestrunner_exe qmltestrunner)
33
34
35=== modified file 'debian/control'
36--- debian/control 2013-07-09 12:52:13 +0000
37+++ debian/control 2013-07-09 20:39:24 +0000
38@@ -15,6 +15,7 @@
39 qtdeclarative5-dev-tools,
40 qtdeclarative5-qtquick2-plugin,
41 qtdeclarative5-test-plugin,
42+ libglib2.0-dev,
43 dbus-test-runner
44 Standards-Version: 3.9.2
45 Homepage: https://launchpad.net/unity-action-api
46
47=== modified file 'src/CMakeLists.txt'
48--- src/CMakeLists.txt 2013-07-09 12:52:13 +0000
49+++ src/CMakeLists.txt 2013-07-09 20:39:24 +0000
50@@ -35,6 +35,11 @@
51 if(${HUD_FOUND})
52 include_directories(${HUD_INCLUDE_DIRS})
53 target_link_libraries (unity-action-qt ${HUD_LIBRARIES})
54+else()
55+ include_directories(${GLIB2_INCLUDE_DIRS})
56+ include_directories(${GOBJECT2_INCLUDE_DIRS})
57+ include_directories(${GIO2_INCLUDE_DIRS})
58+ target_link_libraries (unity-action-qt ${GLIB2_LIBRARIES} ${GOBJECT2_LIBRARIES} ${GIO2_LIBRARIES})
59 endif()
60
61 qt5_use_modules(unity-action-qt Core)
62
63=== modified file 'src/unity-action-manager.cpp'
64--- src/unity-action-manager.cpp 2013-07-09 12:52:13 +0000
65+++ src/unity-action-manager.cpp 2013-07-09 20:39:24 +0000
66@@ -294,6 +294,10 @@
67 : QObject(parent),
68 d(new Private(this))
69 {
70+#ifndef GLIB_VERSION_2_36
71+ g_type_init ();
72+#endif
73+
74 d->activeLocalContext = 0;
75 /*! \todo document me */
76 #ifdef HAVE_HUD
77
78=== modified file 'test/cpp/tst_actionmanager.cpp'
79--- test/cpp/tst_actionmanager.cpp 2013-07-01 23:12:06 +0000
80+++ test/cpp/tst_actionmanager.cpp 2013-07-09 20:39:24 +0000
81@@ -35,6 +35,9 @@
82 TestActionManager::initTestCase()
83 {
84 manager = new ActionManager(this);
85+#ifndef GLIB_VERSION_2_36
86+ g_type_init ();
87+#endif
88 dbusc = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
89 action_group = g_dbus_action_group_get(dbusc,
90 g_dbus_connection_get_unique_name(dbusc),

Subscribers

People subscribed via source and target branches

to all changes: