Merge lp:~mikemc/unity-scope-click/remove-api-version-sniffing into lp:unity-scope-click

[Mike McCracken]

- remove out of date and unnecessary scope api version sniffing

- remove out of date and unnecessary scope api version sniffing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:170
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/364/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/265
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/262
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/262/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[dobey (dobey)]

Why not just remove config.h.in and the generation of it too? It looks like this was the only thing in it, so we shouldn't need it any more either. Will touch a few more files, but I think it's fine to just get rid of it completely.

review: Needs Information

[lp:~mikemc/unity-scope-click/remove-api-version-sniffing]

171. By Mike McCracken on 2014-02-27

Remove all traces of config.h.in

[dobey (dobey)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/unity-scope-click-ci/365/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-amd64-ci/266
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/263
        deb: http://jenkins.qa.ubuntu.com/job/unity-scope-click-trusty-armhf-ci/263/artifact/work/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~mikemc/unity-scope-click/remove-api-version-sniffing]

172. By Mike McCracken on 2014-03-05

merge with trunk, fixing minor conflict by removing unneeded qt Gui module requirement in scope/click/CMakeLists.txt

[dobey (dobey)]

The api-0.4.0 changes landed, so this now conflicts with trunk. I've fixed the conflicts and proposed https://code.launchpad.net/~dobey/unity-scope-click/remove-api-version-sniffing/+merge/210787 instead.

review: Needs Resubmitting

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-20 17:23:23 +0000
+++ CMakeLists.txt	2014-03-05 15:10:47 +0000
@@ -25,16 +25,6 @@
 pkg_check_modules(UNITY_SCOPES REQUIRED libunity-scopes>=0.3.1)
 add_definitions(${UNITY_SCOPES_CFLAGS} ${UNITY_SCOPES_CFLAGS_OTHER})
 
-# Config.h variables to account for breaking changes in 0.1.8:
-if (UNITY_SCOPES_VERSION VERSION_GREATER 0.1.7)
-  SET (UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY 1)
-  SET (UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE 1)
-else()
-  SET (UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY 0)
-  SET (UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE 0)
-endif ()
-
-
 find_package (PkgConfig REQUIRED)
 pkg_check_modules(UBUNTUONE REQUIRED ubuntuoneauth-2.0)
 add_definitions(${UBUNTUONE_CFLAGS} ${UBUNTUONE_CFLAGS_OTHER})

=== modified file 'scope/click/CMakeLists.txt'
--- scope/click/CMakeLists.txt	2014-02-23 22:04:42 +0000
+++ scope/click/CMakeLists.txt	2014-03-05 15:10:47 +0000
@@ -19,13 +19,10 @@
   qtbridge.cpp
 )
 
-configure_file(config.h.in config.h)
-
-include_directories (${CMAKE_BINARY_DIR}/scope)
 include_directories(${LIBURL_DISPATCHER_INCLUDE_DIRS})
 link_directories(${LIBURL_DISPATCHER_LIBRARY_DIRS})
 
-qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network Gui)
+qt5_use_modules (${SCOPE_LIB_UNVERSIONED} Network)
 
 target_link_libraries (${SCOPE_LIB_UNVERSIONED}
   ${UNITY_SCOPES_LDFLAGS}

=== removed file 'scope/click/config.h.in'
--- scope/click/config.h.in	2014-01-28 10:11:21 +0000
+++ scope/click/config.h.in	1970-01-01 00:00:00 +0000
@@ -1,36 +0,0 @@
-/*
- * Copyright (C) 2014 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3, as published
- * by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranties of
- * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
- * PURPOSE.  See the GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * In addition, as a special exception, the copyright holders give
- * permission to link the code of portions of this program with the
- * OpenSSL library under certain conditions as described in each
- * individual source file, and distribute linked combinations
- * including the two.
- * You must obey the GNU General Public License in all respects
- * for all of the code used other than OpenSSL.  If you modify
- * file(s) with this exception, you may extend this exception to your
- * version of the file(s), but you are not obligated to do so.  If you
- * do not wish to do so, delete this exception statement from your
- * version.  If you delete this exception statement from all source
- * files in the program, then also delete it here.
- */
-
-#ifndef SCOPE_CLICK_CONFIG_H
-#define SCOPE_CLICK_CONFIG_H
-
-#define UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY @UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY@
-#define UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE @UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE@
-
-#endif // SCOPE_CLICK_CONFIG_H

=== modified file 'scope/click/download-manager.h'
--- scope/click/download-manager.h	2014-02-21 18:18:19 +0000
+++ scope/click/download-manager.h	2014-03-05 15:10:47 +0000
@@ -30,8 +30,6 @@
 #ifndef CLICK_DOWNLOAD_MANAGER_H
 #define CLICK_DOWNLOAD_MANAGER_H
 
-#include <click/config.h>
-
 #include "network_access_manager.h"
 #include "ubuntuone_credentials.h"
 

=== modified file 'scope/click/preview.cpp'
--- scope/click/preview.cpp	2014-02-21 23:51:14 +0000
+++ scope/click/preview.cpp	2014-03-05 15:10:47 +0000
@@ -31,13 +31,9 @@
 #include "qtbridge.h"
 #include "download-manager.h"
 
-#if UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY
 #include <unity/scopes/PreviewReply.h>
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/VariantBuilder.h>
-#else
-#include <scopes/VariantBuilder.h>
-#endif
 
 #include <QDebug>
 

=== modified file 'scope/click/preview.h'
--- scope/click/preview.h	2014-02-20 18:34:26 +0000
+++ scope/click/preview.h	2014-03-05 15:10:47 +0000
@@ -30,27 +30,16 @@
 #ifndef CLICKPREVIEW_H
 #define CLICKPREVIEW_H
 
-#include "config.h"
 #include "index.h"
 #include "network_access_manager.h"
 #include "download-manager.h"
 #include "qtbridge.h"
 
-#if UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY
 #include <unity/scopes/PreviewQuery.h>
 #include <unity/scopes/PreviewWidget.h>
 #include <unity/scopes/Result.h>
-#else
-#include <scopes/Preview.h>
-#include <scopes/PreviewWidget.h>
-#include <scopes/Result.h>
-#endif
 
-#if UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE
 namespace scopes = unity::scopes;
-#else
-namespace scopes = unity::api::scopes;
-#endif
 
 namespace click {
 

=== modified file 'scope/click/query.cpp'
--- scope/click/query.cpp	2014-02-26 20:15:57 +0000
+++ scope/click/query.cpp	2014-03-05 15:10:47 +0000
@@ -32,19 +32,11 @@
 #include "key_file_locator.h"
 #include "interface.h"
 
-#if UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/Query.h>
 #include <unity/scopes/SearchReply.h>
-#else
-#include <scopes/Annotation.h>
-#include <scopes/CategoryRenderer.h>
-#include <scopes/CategorisedResult.h>
-#include <scopes/Query.h>
-#include <scopes/SearchReply.h>
-#endif
 
 #include<QJsonDocument>
 #include<QJsonArray>

=== modified file 'scope/click/query.h'
--- scope/click/query.h	2014-02-26 20:15:57 +0000
+++ scope/click/query.h	2014-03-05 15:10:47 +0000
@@ -30,19 +30,10 @@
 #ifndef CLICK_QUERY_H
 #define CLICK_QUERY_H
 
-#include "config.h"
 
-#if UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY
 #include <unity/scopes/SearchQuery.h>
-#else 
-#include <scopes/SearchQuery.h>
-#endif
 
-#if UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE
 namespace scopes = unity::scopes;
-#else
-namespace scopes = unity::api::scopes;
-#endif
 
 #include <QSharedPointer>
 

=== modified file 'scope/click/scope.h'
--- scope/click/scope.h	2014-02-18 09:01:41 +0000
+++ scope/click/scope.h	2014-03-05 15:10:47 +0000
@@ -30,25 +30,14 @@
 #ifndef CLICK_SCOPE_H
 #define CLICK_SCOPE_H
 
-#include "config.h"
 #include "index.h"
 #include "download-manager.h"
 
-#if UNITY_SCOPES_API_HEADERS_NOW_UNDER_UNITY
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/ActivationBase.h>
-#else
-#include <scopes/ScopeBase.h>
-#include <scopes/QueryBase.h>
-#include <scopes/ActivationBase.h>
-#endif
 
-#if UNITY_SCOPES_API_NEW_SHORTER_NAMESPACE
 namespace scopes = unity::scopes;
-#else
-namespace scopes = unity::api::scopes;
-#endif
 
 namespace click
 {

=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-02-22 09:50:30 +0000
+++ scope/tests/CMakeLists.txt	2014-03-05 15:10:47 +0000
@@ -16,7 +16,6 @@
 
 include_directories (
   ${CMAKE_SOURCE_DIR}/scope
-  ${CMAKE_BINARY_DIR}/scope
   ${GTEST_INCLUDE_DIR}
   ${GMOCK_INCLUDE_DIR}
 )

=== modified file 'scope/tests/download_manager_tool/CMakeLists.txt'
--- scope/tests/download_manager_tool/CMakeLists.txt	2014-02-11 10:14:58 +0000
+++ scope/tests/download_manager_tool/CMakeLists.txt	2014-03-05 15:10:47 +0000
@@ -2,7 +2,6 @@
 
 include_directories (
   ${CMAKE_SOURCE_DIR}/scope/click
-  ${CMAKE_BINARY_DIR}/scope/click
 )
 
 add_executable (${DOWNLOAD_MANAGER_TOOL_TARGET}

=== modified file 'scope/tests/integration/CMakeLists.txt'
--- scope/tests/integration/CMakeLists.txt	2014-02-08 08:24:19 +0000
+++ scope/tests/integration/CMakeLists.txt	2014-03-05 15:10:47 +0000
@@ -6,7 +6,6 @@
 find_package(Qt5Core REQUIRED)
 
 include_directories (${CMAKE_SOURCE_DIR}/scope)
-include_directories (${CMAKE_BINARY_DIR}/scope)
 
 FILE (GLOB TEST_SOURCES *.cpp)
 FILE (GLOB TEST_HEADERS *.h)