Merge pull request #25 from StrangeHome/hm/cppject

.gitignore

@@ -172,4 +172,160 @@ dmypy.json
 .pytype/
 
 # Cython debug symbols
-cython_debug/
+cython_debug/
+
+Skip to content
+Search or jump to…
+
+Pull requests
+Issues
+Trending
+Explore
+
+@haydenmcp
+github
+/
+gitignore
+110k
+Code
+Pull requests
+225
+Actions
+More
+gitignore/Node.gitignore
+@ch4ot1c
+ch4ot1c Add .yarn/install-state.gz to Node.gitignore (#3407)
+…
+Latest commit 7293c14 on May 14
+ History
+ 58 contributors
+@stuartpb@shiftkey@SimonSiefke@TennyZhuang@venatoria@ro31337@Richienb@melonmanchan@gouthamve@jucrouzet@cheddar@arcresu
+116 lines (86 sloc)  1.77 KB
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+.env.test
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+Terms
+Privacy
+Security
+Status
+Help
+Contact GitHub
+Pricing
+API
+Training
+Blog
+About

CMakeLists.txt

@@ -10,7 +10,6 @@ include(InstallRequiredSystemLibraries)
 include(GNUInstallDirs)
 include(FetchContent)
 set(FETCHCONTENT_QUIET OFF)
-set(FETCHCONTENT_BASE_DIR "${CMAKE_SOURCE_DIR}/_dep" CACHE PATH "Directory into which dependencies are stored." FORCE)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -55,7 +54,6 @@ set(SMARTHOME_PACKAGE_DEPENDENCIES "git" "clang" "build-essential")
 
 add_subdirectory("core")
 add_subdirectory("logger")
-add_subdirectory("service")
 
 if(INCLUDE_DEVICE_PACKAGE)
 	add_subdirectory("device")

device/cli/CMakeLists.txt

@@ -10,5 +10,5 @@ message(STATUS "Linking device CLI target libraries")
 target_link_libraries(smarthome-device-cli
     PRIVATE
         smarthome-logger
-        smarthome-service
+        cppject
         CLI11::CLI11)

device/cli/cli.cpp

@@ -1,7 +1,7 @@
 
 #include <smarthome/logger/apply_production_logger.hpp>
 #include <smarthome/logger/logger.hpp>
-#include <smarthome/service/service_factory.hpp>
+#include <cppject/service_factory.hpp>
 
 #include <CLI/CLI.hpp>
 #include <CLI/App.hpp>

device/cli/extern/upstream/CMakeLists.txt

@@ -6,4 +6,10 @@ FetchContent_Declare(
     GIT_TAG "v1.8.0"
     GIT_PROGRESS TRUE)
 
-FetchContent_MakeAvailable(cli11)
+FetchContent_Declare(
+    cppject
+    GIT_REPOSITORY "https://github.com/haydenmcp/cppject"
+    GIT_TAG "v0.0.2-alpha"
+    GIT_PROGRESS TRUE)
+
+FetchContent_MakeAvailable(cli11 cppject)

device/extern/upstream/CMakeLists.txt

@@ -1 +1 @@
-message(STATUS "Fetching device library dependencies")
+message(STATUS "Fetching device library dependencies")

gui/lerna.json

@@ -0,0 +1,6 @@
+{
+  "packages": [
+    "packages/*"
+  ],
+  "version": "0.0.0"
+}

gui/package.json

@@ -0,0 +1,15 @@
+{
+  "name": "smarthome-gui",
+  "version": "0.0.1",
+  "description": "Graphical user-interface into the smart home system.",
+  "main": "index.js",
+  "repository": {
+    "url": "https://github.com/StrangeHome/smarthome",
+    "type": "git"
+  },
+  "author": "Hayden McParlane",
+  "license": "GPL2",
+  "dependencies": {
+    "lerna": "^3.22.1"
+  }
+}