Merge lp:~tintou/switchboard/library-cleanup into lp:~elementary-pantheon/switchboard/switchboard

[Corentin Noël]

Removed the configuration file from the library.

[Cody Garver (codygarver)]

Why is more lines better?

[Corentin Noël (tintou)]

Because currently config.vala is a part of the API where it shoudn't.

[lp:~tintou/switchboard/library-cleanup]

558. By Corentin Noël on 2015-05-06

Removed the configuration file from the library.

[Rico Tzschichholz (ricotz)]

> Why is more lines better?

Fewer lines are not always better.

[Rico Tzschichholz (ricotz)]

review: Approve

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2013-12-14 17:34:09 +0000
+++ lib/CMakeLists.txt	2015-05-06 19:53:14 +0000
@@ -2,7 +2,7 @@
 # Set Variables
 ######################
 
-set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.vala)
+set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.h)
 set (PREFIX ${CMAKE_INSTALL_PREFIX})
 set (DOLLAR "$") # You hear that? It's kittens being killed by the gods of cmake
 set (LIB_VERSION 2.0)
@@ -12,11 +12,10 @@
 set (LIB_NAME ${CMAKE_PROJECT_NAME}-${LIB_VERSION})
 set (LIB_NAME ${LIB_NAME} PARENT_SCOPE)
 
-configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.vala.cmake ${CONFIG_FILE})
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake ${CONFIG_FILE})
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${LIB_NAME}.pc)
 
 set (LIB_SOURCE
-  ${CONFIG_FILE}
   Plug.vala
   PlugsManager.vala
 )
@@ -37,6 +36,8 @@
   ${LIB_PACKAGES}
   OPTIONS
   ${GLOBAL_VALAC_OPTIONS}
+  CUSTOM_VAPIS
+  config.vapi
   GENERATE_VAPI
   ${LIB_NAME}
   GENERATE_HEADER

=== renamed file 'lib/config.vala.cmake' => 'lib/config.h.cmake'
--- lib/config.vala.cmake	2013-11-08 18:02:11 +0000
+++ lib/config.h.cmake	2015-05-06 19:53:14 +0000
@@ -1,9 +1,12 @@
-namespace Switchboard.Build {
-    public const string DATADIR = "@DATADIR@";
-    public const string PKGDATADIR = "@PKGDATADIR@";
-    public const string PLUGS_DIR = "@PLUGS_DIR@";
-    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
-    public const string RELEASE_NAME = "@RELEASE_NAME@";
-    public const string VERSION = "@VERSION@";
-    public const string VERSION_INFO = "@VERSION_INFO@";
-}
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#cmakedefine DATADIR "@DATADIR@"
+#cmakedefine PKGDATADIR "@PKGDATADIR@"
+#cmakedefine PLUGS_DIR "@PLUGS_DIR@"
+#cmakedefine GETTEXT_PACKAGE "@GETTEXT_PACKAGE@"
+#cmakedefine RELEASE_NAME "@RELEASE_NAME@"
+#cmakedefine VERSION "@VERSION@"
+#cmakedefine VERSION_INFO "@VERSION_INFO@"
+
+#endif // CONFIG_H

=== added file 'lib/config.vapi'
--- lib/config.vapi	1970-01-01 00:00:00 +0000
+++ lib/config.vapi	2015-05-06 19:53:14 +0000
@@ -0,0 +1,10 @@
+[CCode (cprefix = "", lower_case_cprefix = "", cheader_filename = "config.h")]
+namespace Build {
+    public const string DATADIR;
+    public const string PKGDATADIR;
+    public const string PLUGS_DIR;
+    public const string GETTEXT_PACKAGE;
+    public const string RELEASE_NAME;
+    public const string VERSION;
+    public const string VERSION_INFO;
+}