Merge lp:~marcustomlinson/unity-scope-fake/small-fixes into lp:unity-scope-fake

Proposed by Marcus Tomlinson on 2016-06-15
Status: Merged
Approved by: Paweł Stołowski on 2016-06-15
Approved revision: 62
Merged at revision: 59
Proposed branch: lp:~marcustomlinson/unity-scope-fake/small-fixes
Merge into: lp:unity-scope-fake
Diff against target: 70 lines (+6/-13)
6 files modified
.bzr-builddeb/default.conf (+2/-0)
CMakeLists.txt (+1/-1)
src/main.cpp (+2/-1)
src/randomtextgen.h (+1/-1)
test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in (+0/-1)
test_scopes/make_images.sh (+0/-9)
To merge this branch: bzr merge lp:~marcustomlinson/unity-scope-fake/small-fixes
Reviewer Review Type Date Requested Status
Paweł Stołowski 2016-06-15 Approve on 2016-06-15
Review via email: mp+297428@code.launchpad.net

Commit message

A few small fixes here and there

To post a comment you must log in.
60. By Marcus Tomlinson on 2016-06-15

.bzr-builddeb

61. By Marcus Tomlinson on 2016-06-15

uBrick is not an aggregator

62. By Marcus Tomlinson on 2016-06-15

deleted test_scopes/make_images.sh

Paweł Stołowski (stolowski) wrote :

Good stuff, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory '.bzr-builddeb'
2=== added file '.bzr-builddeb/default.conf'
3--- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
4+++ .bzr-builddeb/default.conf 2016-06-15 08:26:24 +0000
5@@ -0,0 +1,2 @@
6+[BUILDDEB]
7+split = True
8
9=== modified file 'CMakeLists.txt'
10--- CMakeLists.txt 2016-05-19 16:19:45 +0000
11+++ CMakeLists.txt 2016-06-15 08:26:24 +0000
12@@ -1,4 +1,4 @@
13-project(filterstest CXX)
14+project(unity-scope-fake CXX)
15 cmake_minimum_required(VERSION 2.8.10)
16 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
17
18
19=== modified file 'src/main.cpp'
20--- src/main.cpp 2016-05-18 15:36:52 +0000
21+++ src/main.cpp 2016-06-15 08:26:24 +0000
22@@ -25,7 +25,8 @@
23 int main(int argc, char **argv)
24 {
25 if (argc != 3) {
26- std::cerr << "Invalid arguments. Expected runtime config file and scope id" << std::endl;
27+ auto prog_name = basename(argv[0]);
28+ std::cerr << "usage: " << prog_name << " <runtime.ini> <scope.ini>" << std::endl;
29 return 1;
30 }
31
32
33=== modified file 'src/randomtextgen.h'
34--- src/randomtextgen.h 2016-05-24 09:39:52 +0000
35+++ src/randomtextgen.h 2016-06-15 08:26:24 +0000
36@@ -27,7 +27,7 @@
37 class RandomTextGenerator
38 {
39 public:
40- RandomTextGenerator(const std::string &input_file_path);
41+ explicit RandomTextGenerator(const std::string &input_file_path);
42 std::string get(int num_words);
43
44 private:
45
46=== modified file 'test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in'
47--- test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in 2016-05-20 07:21:28 +0000
48+++ test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in 2016-06-15 08:26:24 +0000
49@@ -4,7 +4,6 @@
50 Description=Fake uBrick
51 Icon=./icon.jpg
52 Author=Canonical Ltd.
53-IsAggregator=true
54
55 [Appearance]
56 PageHeader.ForegroundColor=#FFFFFF
57
58=== removed file 'test_scopes/make_images.sh'
59--- test_scopes/make_images.sh 2016-05-12 11:34:58 +0000
60+++ test_scopes/make_images.sh 1970-01-01 00:00:00 +0000
61@@ -1,9 +0,0 @@
62-#!/bin/sh
63-
64-MAX=$1
65-
66-for CNT in $(seq 1 $MAX)
67-do
68- echo "Creating image $CNT"
69- convert -background white -fill black -font Ubuntu -size 80x80 -pointsize 14 -gravity center label:$CNT "fakescope-$CNT.png"
70-done

Subscribers

People subscribed via source and target branches