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

[Marcus Tomlinson]

A few small fixes here and there

[lp:~marcustomlinson/unity-scope-fake/small-fixes]

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)]

Good stuff, thanks!

review: Approve

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2016-06-15 08:26:24 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-05-19 16:19:45 +0000
+++ CMakeLists.txt	2016-06-15 08:26:24 +0000
@@ -1,4 +1,4 @@
-project(filterstest CXX)
+project(unity-scope-fake CXX)
 cmake_minimum_required(VERSION 2.8.10)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}")
 

=== modified file 'src/main.cpp'
--- src/main.cpp	2016-05-18 15:36:52 +0000
+++ src/main.cpp	2016-06-15 08:26:24 +0000
@@ -25,7 +25,8 @@
 int main(int argc, char **argv)
 {
     if (argc != 3) {
-        std::cerr << "Invalid arguments. Expected runtime config file and scope id" << std::endl;
+        auto prog_name = basename(argv[0]);
+        std::cerr << "usage: " << prog_name << " <runtime.ini> <scope.ini>" << std::endl;
         return 1;
     }
 

=== modified file 'src/randomtextgen.h'
--- src/randomtextgen.h	2016-05-24 09:39:52 +0000
+++ src/randomtextgen.h	2016-06-15 08:26:24 +0000
@@ -27,7 +27,7 @@
     class RandomTextGenerator
     {
         public:
-            RandomTextGenerator(const std::string &input_file_path);
+            explicit RandomTextGenerator(const std::string &input_file_path);
             std::string get(int num_words);
 
         private:

=== modified file 'test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in'
--- test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in	2016-05-20 07:21:28 +0000
+++ test_scopes/fake_ubrick_scope/fake_ubrick_scope.ini.in	2016-06-15 08:26:24 +0000
@@ -4,7 +4,6 @@
 Description=Fake uBrick
 Icon=./icon.jpg
 Author=Canonical Ltd.
-IsAggregator=true
 
 [Appearance]
 PageHeader.ForegroundColor=#FFFFFF

=== removed file 'test_scopes/make_images.sh'
--- test_scopes/make_images.sh	2016-05-12 11:34:58 +0000
+++ test_scopes/make_images.sh	1970-01-01 00:00:00 +0000
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-MAX=$1
-
-for CNT in $(seq 1 $MAX)
-do
-    echo "Creating image $CNT"
-    convert -background white -fill black -font Ubuntu -size 80x80 -pointsize 14 -gravity center label:$CNT "fakescope-$CNT.png"
-done