Unity API

Merge lp:~michihenning/unity-api/remove-moldy-oldies into lp:unity-api

  1. remove-moldy-oldies
  2. Merge into trunk
Proposed by Michi Henning
Status: Merged
Approved by: Michał Sawicz
Approved revision: 36
Merged at revision: 38
Proposed branch: lp:~michihenning/unity-api/remove-moldy-oldies
Merge into: lp:unity-api
Diff against target: 33 lines (+0/-8)
3 files modified
include/unity/CMakeLists.txt (+0/-1)
include/unity/scopes/CMakeLists.txt (+0/-6)
test/headers/CMakeLists.txt (+0/-1)
To merge this branch: bzr merge lp:~michihenning/unity-api/remove-moldy-oldies
Reviewer Review Type Date Requested Status
Michał Sawicz Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+163825@code.launchpad.net

Commit message

Removed include/unity/scopes subdirectory that shouldn't have been there. (If anywhere, that dir will eventually go into unity/api and unity/shell.)

Description of the change

Removed include/unity/scopes subdirectory that shouldn't have been there. (If anywhere, that dir will eventually go into unity/api and unity/shell.)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:35
http://jenkins.qa.ubuntu.com/job/unity-api-ci/16/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/16/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-api-raring-i386-ci/16/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/16/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) wrote :

You need to remove unity/scopes from tests/headers/CMakeLists.txt

review: Needs Fixing
lp:~michihenning/unity-api/remove-moldy-oldies updated
36. By Michi Henning

Removed left-behind line for now non-existent include directory.

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

PASSED: Continuous integration, rev:36
http://jenkins.qa.ubuntu.com/job/unity-api-ci/23/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/23
        deb: http://jenkins.qa.ubuntu.com/job/unity-api-raring-armhf-ci/23/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-api-raring-i386-ci/23

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-api-ci/23/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michał Sawicz (saviq) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/CMakeLists.txt'
2--- include/unity/CMakeLists.txt 2013-05-13 11:39:49 +0000
3+++ include/unity/CMakeLists.txt 2013-05-15 21:09:27 +0000
4@@ -1,5 +1,4 @@
5 add_subdirectory(api)
6-add_subdirectory(scopes)
7 add_subdirectory(util)
8
9 file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
10
11=== removed directory 'include/unity/scopes'
12=== removed file 'include/unity/scopes/CMakeLists.txt'
13--- include/unity/scopes/CMakeLists.txt 2013-05-13 11:39:49 +0000
14+++ include/unity/scopes/CMakeLists.txt 1970-01-01 00:00:00 +0000
15@@ -1,6 +0,0 @@
16-file(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
17-file(GLOB internal_headers "${CMAKE_CURRENT_SOURCE_DIR}/internal/*.h")
18-
19-install(FILES ${headers} DESTINATION include/unity/scopes)
20-
21-set(UNITY_API_LIB_HDRS ${UNITY_API_LIB_HDRS} ${headers} ${internal_headers} PARENT_SCOPE)
22
23=== removed directory 'include/unity/scopes/internal'
24=== modified file 'test/headers/CMakeLists.txt'
25--- test/headers/CMakeLists.txt 2013-05-13 11:39:49 +0000
26+++ test/headers/CMakeLists.txt 2013-05-15 21:09:27 +0000
27@@ -7,7 +7,6 @@
28 set(subdirs
29 unity
30 unity/api
31- unity/scopes
32 unity/util
33 )
34

Subscribers

People subscribed via source and target branches

to all changes: