Merge lp:~dobey/unity-scope-click/oot-build into lp:unity-scope-click

[dobey]

Fix test_get_dotdesktop to use fake data, and remove the fake script.
Move the contents of gcov.m4 to acinclude.m4 and remove the m4 directory.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:91
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/128/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scope-click-ci/128/rebuild

review: Approve (continuous-integration)

[Mike McCracken (mikemc)]

+1 because although oot building still doesn't work, it's not the fault of any code in this tree, and this branch does fix the linked bugs.

review: Approve

=== modified file 'acinclude.m4'
--- acinclude.m4	2013-07-18 18:05:15 +0000
+++ acinclude.m4	2013-12-17 17:33:42 +0000
@@ -38,3 +38,89 @@
   prefix=$prefix_save
   exec_prefix=$exec_prefix_save
 ])
+# Checks for existence of coverage tools:
+#  * gcov
+#  * lcov
+#  * genhtml
+#  * gcovr
+# 
+# Sets ac_cv_check_gcov to yes if tooling is present
+# and reports the executables to the variables LCOV, GCOVR and GENHTML.
+AC_DEFUN([AC_TDD_GCOV],
+[
+  AC_ARG_ENABLE(gcov,
+  AS_HELP_STRING([--enable-gcov],
+		 [enable coverage testing with gcov]),
+  [use_gcov=$enableval], [use_gcov=no])
+
+  if test "x$use_gcov" = "xyes"; then
+  # we need gcc:
+  if test "$GCC" != "yes"; then
+    AC_MSG_ERROR([GCC is required for --enable-gcov])
+  fi
+
+  # Check if ccache is being used
+  AC_CHECK_PROG(SHTOOL, shtool, shtool)
+  case `$SHTOOL path $CC` in
+    *ccache*[)] gcc_ccache=yes;;
+    *[)] gcc_ccache=no;;
+  esac
+
+  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
+    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
+  fi
+
+  lcov_version_list="1.6 1.7 1.8 1.9"
+  AC_CHECK_PROG(LCOV, lcov, lcov)
+  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
+
+  if test "$LCOV"; then
+    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
+      glib_cv_lcov_version=invalid
+      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
+      for lcov_check_version in $lcov_version_list; do
+        if test "$lcov_version" = "$lcov_check_version"; then
+          glib_cv_lcov_version="$lcov_check_version (ok)"
+        fi
+      done
+    ])
+  else
+    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
+    AC_MSG_ERROR([$lcov_msg])
+  fi
+
+  case $glib_cv_lcov_version in
+    ""|invalid[)]
+      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
+      AC_MSG_ERROR([$lcov_msg])
+      LCOV="exit 0;"
+      ;;
+  esac
+
+  if test -z "$GENHTML"; then
+    AC_MSG_ERROR([Could not find genhtml from the lcov package])
+  fi
+
+  ac_cv_check_gcov=yes
+  ac_cv_check_lcov=yes
+
+  # Remove all optimization flags from CFLAGS
+  changequote({,})
+  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
+  changequote([,])
+
+  # Add the special gcc flags
+  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
+  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
+  COVERAGE_LDFLAGS="-lgcov"
+
+  # Check availability of gcovr
+  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
+  if test -z "$GCOVR"; then
+    ac_cv_check_gcovr=no
+  else
+    ac_cv_check_gcovr=yes
+  fi
+
+fi
+]) # AC_TDD_GCOV

=== modified file 'configure.ac'
--- configure.ac	2013-12-10 22:21:24 +0000
+++ configure.ac	2013-12-17 17:33:42 +0000
@@ -28,7 +28,6 @@
 ###########################
 # gcov coverage reporting
 ###########################
-m4_include([m4/gcov.m4])
 AC_TDD_GCOV
 AM_CONDITIONAL([HAVE_GCOV], [test "x$ac_cv_check_gcov" = xyes])
 AM_CONDITIONAL([HAVE_LCOV], [test "x$ac_cv_check_lcov" = xyes])
@@ -115,7 +114,6 @@
   Makefile
   data/Makefile
   src/Makefile
-  src/config.vala
 ])
 AC_OUTPUT
 

=== removed directory 'm4'
=== removed file 'm4/gcov.m4'
--- m4/gcov.m4	2013-07-18 18:05:15 +0000
+++ m4/gcov.m4	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-# Checks for existence of coverage tools:
-#  * gcov
-#  * lcov
-#  * genhtml
-#  * gcovr
-# 
-# Sets ac_cv_check_gcov to yes if tooling is present
-# and reports the executables to the variables LCOV, GCOVR and GENHTML.
-AC_DEFUN([AC_TDD_GCOV],
-[
-  AC_ARG_ENABLE(gcov,
-  AS_HELP_STRING([--enable-gcov],
-		 [enable coverage testing with gcov]),
-  [use_gcov=$enableval], [use_gcov=no])
-
-  if test "x$use_gcov" = "xyes"; then
-  # we need gcc:
-  if test "$GCC" != "yes"; then
-    AC_MSG_ERROR([GCC is required for --enable-gcov])
-  fi
-
-  # Check if ccache is being used
-  AC_CHECK_PROG(SHTOOL, shtool, shtool)
-  case `$SHTOOL path $CC` in
-    *ccache*[)] gcc_ccache=yes;;
-    *[)] gcc_ccache=no;;
-  esac
-
-  if test "$gcc_ccache" = "yes" && (test -z "$CCACHE_DISABLE" || test "$CCACHE_DISABLE" != "1"); then
-    AC_MSG_ERROR([ccache must be disabled when --enable-gcov option is used. You can disable ccache by setting environment variable CCACHE_DISABLE=1.])
-  fi
-
-  lcov_version_list="1.6 1.7 1.8 1.9"
-  AC_CHECK_PROG(LCOV, lcov, lcov)
-  AC_CHECK_PROG(GENHTML, genhtml, genhtml)
-
-  if test "$LCOV"; then
-    AC_CACHE_CHECK([for lcov version], glib_cv_lcov_version, [
-      glib_cv_lcov_version=invalid
-      lcov_version=`$LCOV -v 2>/dev/null | $SED -e 's/^.* //'`
-      for lcov_check_version in $lcov_version_list; do
-        if test "$lcov_version" = "$lcov_check_version"; then
-          glib_cv_lcov_version="$lcov_check_version (ok)"
-        fi
-      done
-    ])
-  else
-    lcov_msg="To enable code coverage reporting you must have one of the following lcov versions installed: $lcov_version_list"
-    AC_MSG_ERROR([$lcov_msg])
-  fi
-
-  case $glib_cv_lcov_version in
-    ""|invalid[)]
-      lcov_msg="You must have one of the following versions of lcov: $lcov_version_list (found: $lcov_version)."
-      AC_MSG_ERROR([$lcov_msg])
-      LCOV="exit 0;"
-      ;;
-  esac
-
-  if test -z "$GENHTML"; then
-    AC_MSG_ERROR([Could not find genhtml from the lcov package])
-  fi
-
-  ac_cv_check_gcov=yes
-  ac_cv_check_lcov=yes
-
-  # Remove all optimization flags from CFLAGS
-  changequote({,})
-  CFLAGS=`echo "$CFLAGS" | $SED -e 's/-O[0-9]*//g'`
-  changequote([,])
-
-  # Add the special gcc flags
-  COVERAGE_CFLAGS="-O0 -fprofile-arcs -ftest-coverage"
-  COVERAGE_CXXFLAGS="-O0 -fprofile-arcs -ftest-coverage"	
-  COVERAGE_LDFLAGS="-lgcov"
-
-  # Check availability of gcovr
-  AC_CHECK_PROG(GCOVR, gcovr, gcovr)
-  if test -z "$GCOVR"; then
-    ac_cv_check_gcovr=no
-  else
-    ac_cv_check_gcovr=yes
-  fi
-
-fi
-]) # AC_TDD_GCOV

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-12-11 16:46:03 +0000
+++ src/Makefile.am	2013-12-17 17:33:42 +0000
@@ -1,6 +1,7 @@
 
-INCLUDES = \
+AM_CPPFLAGS = \
 	-g -w \
+	$(COVERAGE_CFLAGS) \
 	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\" \
 	-D_LOG_DOMAIN=\"unity-scope-click\" \
 	$(SCOPE_DAEMON_CFLAGS) \
@@ -8,7 +9,6 @@
 	-I$(srcdir) \
 	-I$(builddir)
 
-AM_CPPFLAGS = $(COVERAGE_CFLAGS)
 AM_LDFLAGS = $(COVERAGE_LDFLAGS) -R $(PROTOCOLPRIVATELIBDIR)
 
 pkglibexec_PROGRAMS = \
@@ -23,6 +23,7 @@
 libclickscope_la_VALAFLAGS = \
 	--thread \
 	--vapidir $(srcdir) \
+	--vapidir $(builddir) \
 	--pkg unity-protocol \
 	--pkg oauth \
 	--pkg signon \
@@ -45,6 +46,13 @@
 	non-click-scope.vala \
 	utils.vala
 
+config.vala: config.vala.in
+	sed -e "s|\@DATADIR\@|${datadir}|g" \
+		-e "s|\@LOCALEDIR\@|${localedir}|g" \
+		-e "s|\@PACKAGE\@|${PACKAGE}|g" \
+		-e "s|\@VERSION\@|${VERSION}|g" \
+		< $< > $@
+
 click_scope_VALAFLAGS = \
 	--thread \
 	--vapidir=$(builddir) \
@@ -65,7 +73,7 @@
 	$(SCOPE_DAEMON_VALAFLAGS) \
 	--vapidir=$(srcdir) \
 	--vapidir=$(builddir) \
-	$(srcdir)/assertions.vapi \
+	assertions.vapi \
 	--pkg clickscope
 
 test_click_scope_LDFLAGS = \

=== modified file 'src/config.vala.in'
--- src/config.vala.in	2013-10-04 12:26:27 +0000
+++ src/config.vala.in	2013-12-17 17:33:42 +0000
@@ -1,12 +1,6 @@
 namespace Config {
-
-  const string PREFIX = "@prefix@";
-  
   const string DATADIR = "@DATADIR@";
-  
-  const string LOCALEDIR = "@DATADIR@/locale";
-  
+  const string LOCALEDIR = "@LOCALEDIR@";
   const string PACKAGE = "@PACKAGE@";
-  
   const string VERSION = "@VERSION@";
 }

=== modified file 'src/test-click-webservice.vala'
--- src/test-click-webservice.vala	2013-12-06 18:27:14 +0000
+++ src/test-click-webservice.vala	2013-12-17 17:33:42 +0000
@@ -194,11 +194,9 @@
     public static void test_click_get_dotdesktop ()
     {
         MainLoop mainloop = new MainLoop ();
-        var click_if = new ClickInterface ();
-        var real_path = GLib.Environment.get_variable("PATH");
-        GLib.Environment.set_variable("PATH", "test-extras", true);
+        var click_if = new FakeClickInterface ();
 
-        click_if.get_dotdesktop.begin("com.example.corner-weather", (obj, res) => {
+        click_if.get_dotdesktop.begin("com.ubuntu.ubuntu-weather", (obj, res) => {
             mainloop.quit ();
             try {
                 var dotdesktop = click_if.get_dotdesktop.end (res);
@@ -208,7 +206,6 @@
             }
         });
         assert (run_with_timeout (mainloop, 10000));
-        GLib.Environment.set_variable("PATH", real_path, true);
     }
 
 	private static bool preview_has_info_hint(Unity.Preview preview, string id, Variant val)

=== removed directory 'src/test-extras'
=== removed symlink 'src/test-extras/click'
=== target was u'fake-click'
=== removed file 'src/test-extras/fake-click'
--- src/test-extras/fake-click	2013-12-04 18:37:49 +0000
+++ src/test-extras/fake-click	1970-01-01 00:00:00 +0000
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-if [ "$1 $2" == "list --manifest" ] ; then
-    /bin/cat <<- EOF
-    [
-        {
-            "description": "Generate HDQR Codes",
-            "framework": "ubuntu-sdk-13.10",
-            "hooks": {
-                "hdqr-code": {
-                    "apparmor": "hdqr-code.json",
-                    "desktop": "hdqr-code.desktop"
-                }
-            },
-            "installed-size": "57000",
-            "maintainer": "John Doe <[e-mail]>",
-            "name": "com.example.developer.hdoe.hdqr-code",
-            "title": "Fake HDQR Codes",
-            "version": "0.3.2"
-        },
-        {
-            "description": "Go to the corner, check out the weather",
-            "framework": "ubuntu-sdk-13.10",
-            "hooks": {
-                "corner-weather": {
-                    "apparmor": "corner-weather.json",
-                    "desktop": "corner-weather.desktop"
-                }
-            },
-            "installed-size": "38000",
-            "maintainer": "Somebody Else <[e-mail]>",
-            "name": "com.example.corner-weather",
-            "title": "Fake Corner Weather",
-            "version": "0.8.3"
-        }
-    ]
-EOF
-fi