Merge cmake configured headers into one config.h.in

This looks better than leave cmake *.in everywhere in the tree.
Also fix typo according to review comments of PR 425.

.gitignore

@@ -16,7 +16,6 @@ CMakeLists.txt.user
 modules.order
 .tmp_versions
 .idea
-src/anbox/config.h
 
 
 debian/anbox-modules-dkms.debhelper.log

CMakeLists.txt

@@ -105,14 +105,11 @@ endif()
 if (ANBOX_VERSION_SUFFIX)
     set(ANBOX_VERSION "${ANBOX_VERSION}-${ANBOX_VERSION_SUFFIX}")
 endif()
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/version.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/version.h)
-
 set(ANBOX_RESOURCE_DIR "${CMAKE_INSTALL_DATADIR}/anbox")
 set(ANBOX_RESOURCE_DIR_FULL "${CMAKE_INSTALL_FULL_DATADIR}/anbox")
 set(ANBOX_STATEDIR_FULL "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/anbox")
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/config.h.in
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h.in
-               ${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/config.h)
+               ${CMAKE_CURRENT_SOURCE_DIR}/src/anbox/build/config.h)
 
 add_subdirectory(external)
 add_subdirectory(src)

src/CMakeLists.txt

@@ -60,10 +60,10 @@ set(SOURCES
     anbox/cli.cpp
     anbox/runtime.cpp
     anbox/daemon.cpp
-    anbox/config.cpp
+    anbox/system_configuration.cpp
     anbox/not_reachable.cpp
 
-    anbox/build/version.h.in
+    anbox/build/config.h.in
 
     anbox/android/intent.cpp
     anbox/android/ip_config_builder.cpp

src/anbox/application/database.cpp

@@ -17,7 +17,7 @@
 
 #include "anbox/application/database.h"
 #include "anbox/application/launcher_storage.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/logger.h"
 
 namespace anbox {

src/anbox/audio/server.cpp

@@ -22,7 +22,7 @@
 #include "anbox/network/local_socket_messenger.h"
 #include "anbox/network/message_processor.h"
 #include "anbox/common/type_traits.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/utils.h"
 #include "anbox/logger.h"
 

src/anbox/bridge/android_api_stub.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "anbox/bridge/android_api_stub.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/logger.h"
 #include "anbox/rpc/channel.h"
 #include "anbox/utils.h"

src/anbox/build/config.h.in

@@ -17,8 +17,8 @@
  *
  */
 
-#ifndef ANBOX_VERSION_H_
+#ifndef ANBOX_CONFIG_H_
-#define ANBOX_VERSION_H_
+#define ANBOX_CONFIG_H_
 
 #include <cstdint>
 #include <string>
@@ -27,7 +27,11 @@ namespace anbox {
 namespace build {
 /// @brief version marks the version
 static constexpr const char *version{"@ANBOX_VERSION@"};
+
+// path for system configuration
+static constexpr const char *default_resource_path{"@ANBOX_RESOURCE_DIR_FULL@"};
+static constexpr const char *default_data_path{"@ANBOX_STATEDIR_FULL@"};
 }  // namespace build
 }  // namespace anbox
 
-#endif  // ANBOX_VERSION_H_
+#endif  // ANBOX_CONFIG_H_

src/anbox/cmds/container_manager.cpp

@@ -20,7 +20,7 @@
 #include "anbox/common/loop_device_allocator.h"
 #include "anbox/logger.h"
 #include "anbox/runtime.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 
 #include "core/posix/signal.h"
 #include "core/posix/exec.h"

src/anbox/cmds/launch.cpp

@@ -20,7 +20,7 @@
 #include "anbox/dbus/stub/application_manager.h"
 #include "anbox/common/dispatcher.h"
 #include "anbox/ui/splash_screen.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/runtime.h"
 #include "anbox/logger.h"
 

src/anbox/cmds/session_manager.cpp

@@ -35,7 +35,7 @@ std::istream& operator>>(std::istream& in, anbox::graphics::GLRendererServer::Co
 
 #include "anbox/cmds/session_manager.h"
 #include "anbox/common/dispatcher.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/container/client.h"
 #include "anbox/dbus/skeleton/service.h"
 #include "anbox/input/manager.h"

src/anbox/cmds/system_info.cpp

@@ -21,7 +21,7 @@
 #include "anbox/utils/environment_file.h"
 #include "anbox/logger.h"
 
-#include "anbox/build/version.h"
+#include "anbox/build/config.h"
 
 #include <sstream>
 #include <fstream>

src/anbox/cmds/version.cpp

@@ -18,7 +18,7 @@
  */
 
 #include "anbox/cmds/version.h"
-#include "anbox/build/version.h"
+#include "anbox/build/config.h"
 #include "anbox/utils.h"
 
 anbox::cmds::Version::Version()

src/anbox/container/client.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "anbox/container/client.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/container/management_api_stub.h"
 #include "anbox/logger.h"
 #include "anbox/network/local_socket_messenger.h"

src/anbox/container/lxc_container.cpp

@@ -17,7 +17,7 @@
 
 #include "anbox/android/ip_config_builder.h"
 #include "anbox/container/lxc_container.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/logger.h"
 #include "anbox/utils.h"
 

src/anbox/container/service.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "anbox/container/service.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/container/lxc_container.h"
 #include "anbox/container/management_api_message_processor.h"
 #include "anbox/container/management_api_skeleton.h"

src/anbox/daemon.cpp

@@ -18,7 +18,7 @@
 #include <signal.h>
 #include <sys/prctl.h>
 
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/daemon.h"
 #include "anbox/logger.h"
 

src/anbox/input/manager.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "anbox/input/manager.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/input/device.h"
 #include "anbox/runtime.h"
 #include "anbox/utils.h"

src/anbox/system_configuration.cpp

@@ -16,8 +16,9 @@
  */
 
 
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/utils.h"
+#include "anbox/build/config.h"
 
 #include "external/xdg/xdg.h"
 
@@ -86,15 +87,15 @@ anbox::SystemConfiguration& anbox::SystemConfiguration::instance() {
 }
 
 anbox::SystemConfiguration::SystemConfiguration() {
-  auto gen_resource_path = [] () -> fs::path {
+  auto detect_resource_path = [] () -> fs::path {
     const auto snap_path = utils::get_env_value("SNAP");
     if (!snap_path.empty()) {
-      return fs::path(snap_path) / "usr/share/anbox";
+      return fs::path(snap_path) / "usr" / "share" / "anbox";
     } else {
-      return default_resource_path;
+      return anbox::build::default_resource_path;
     }
   };
 
-  resource_path = gen_resource_path();
+  resource_path = detect_resource_path();
-  data_path = default_path_path;
+  data_path = anbox::build::default_data_path;
 }

src/anbox/system_configuration.h

@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef ANBOX_CONFIG_H_
+#ifndef ANBOX_SYSTEM_CONFIGURATION_H_
-#define ANBOX_CONFIG_H_
+#define ANBOX_SYSTEM_CONFIGURATION_H_
 
 #include <string>
 #include <memory>
@@ -47,12 +47,7 @@ class SystemConfiguration {
 
   boost::filesystem::path data_path;
   boost::filesystem::path resource_path;
-
- private:
-  static constexpr const char *default_resource_path{"@ANBOX_RESOURCE_DIR_FULL@"};
-  static constexpr const char *default_path_path{"@ANBOX_STATEDIR_FULL@"};
-
 };
 }  // namespace anbox
 
-#endif
+#endif // ANBOX_SYSTEM_CONFIGURATION_H_

src/anbox/ui/splash_screen.cpp

@@ -16,7 +16,7 @@
  */
 
 #include "anbox/ui/splash_screen.h"
-#include "anbox/config.h"
+#include "anbox/system_configuration.h"
 #include "anbox/utils.h"
 #include "anbox/logger.h"