move codegen to separate crate

ewilken · Aug 10, 2020 · 588c6eb · 588c6eb
1 parent 25ff572
commit 588c6eb
Show file tree

Hide file tree

Showing 225 changed files with 255 additions and 247 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,3 +45,6 @@ uuid = {version = "0.8", features = ["v4", "serde"]}
 
 [dev-dependencies]
 env_logger = "0.7"
+
+[workspace]
+members = ["codegen"]
diff --git a/README.md b/README.md
@@ -48,8 +48,6 @@ For a full list of the predefined characteristics, services and accessories, see
 Creating a simple lightbulb accessory and starting the IP server:
 
 ```rust
-use std::net::{IpAddr, SocketAddr};
-
 use hap::{
     accessory::{lightbulb::LightbulbAccessory, AccessoryCategory, AccessoryInformation},
     server::{IpServer, Server},
@@ -62,28 +60,13 @@ use hap::{
 
 #[tokio::main]
 async fn main() {
-    let current_ipv4 = || -> Option<IpAddr> {
-        for iface in pnet::datalink::interfaces() {
-            for ip_network in iface.ips {
-                if ip_network.is_ipv4() {
-                    let ip = ip_network.ip();
-                    if !ip.is_loopback() {
-                        return Some(ip);
-                    }
-                }
-            }
-        }
-        None
-    };
-
     let lightbulb = LightbulbAccessory::new(1, AccessoryInformation {
         name: "Acme Lightbulb".into(),
         ..Default::default()
     })
     .unwrap();
 
     let config = Config {
-        socket_addr: SocketAddr::new(current_ipv4().unwrap(), 32000),
         pin: Pin::new([1, 1, 1, 2, 2, 3, 3, 3]).unwrap(),
         name: "Acme Lightbulb".into(),
         device_id: MacAddress::new([10, 20, 30, 40, 50, 60]),
@@ -162,6 +145,12 @@ lightbulb.lightbulb.on.set_value(Value::Bool(true)).await.unwrap();
   - [ ] Video Doorbell Accessory
 - [ ] BLE Transport
 
+## Development
+
+Codegen is handled by the `codegen` crate in the workspace. Generated files are checked in. To run the code generation, do:
+
+    cargo run --package hap-codegen
+
 ## License
 
 HAP is licensed under either of

diff --git a/codegen/Cargo.toml b/codegen/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+authors = ["Elias Wilken <[email protected]>"]
+description = "Rust implementation of the Apple HomeKit Accessory Protocol (HAP)"
+documentation = "https://docs.rs/hap"
+edition = "2018"
+keywords = ["apple", "homekit"]
+license = "MIT/Apache-2.0"
+name = "hap-codegen"
+publish = false
+readme = "README.md"
+repository = "https://github.com/ewilken/hap-rs"
+version = "0.1.0-pre.2"
+
+[dependencies]
+handlebars = "2.0"
+serde = {version = "1.0", features = ["derive"]}
+serde_json = "1.0"
+uuid = {version = "0.8", features = ["v4", "serde"]}
diff --git a/gen/default.json → codegen/gen/default.json b/gen/default.json → codegen/gen/default.json
diff --git a/build.rs → codegen/src/main.rs b/build.rs → codegen/src/main.rs
@@ -369,7 +369,7 @@ fn pascal_case_helper(
     Ok(())
 }
 
-static CATEGORIES: &'static str = "// this file is auto-generated by build.rs\n
+static CATEGORIES: &'static str = "// this file is auto-generated by hap-codegen\n
 use serde::{Deserialize, Serialize};
 
 /// HAP Accessory category.
@@ -381,7 +381,7 @@ pub enum AccessoryCategory {
 }
 ";
 
-static HAP_TYPE: &'static str = "// this file is auto-generated by build.rs\n
+static HAP_TYPE: &'static str = "// this file is auto-generated by hap-codegen\n
 use serde::ser::{Serialize, Serializer};
 
 /// HAP Service and Characteristic type representation.
@@ -421,7 +421,7 @@ impl Serialize for HapType {
 }
 ";
 
-static CHARACTERISTIC: &'static str = "// this file is auto-generated by build.rs\n
+static CHARACTERISTIC: &'static str = "// this file is auto-generated by hap-codegen\n
 use async_trait::async_trait;
 use serde::Serialize;
 use serde_json::json;
@@ -542,11 +542,11 @@ impl AsyncCharacteristicCallbacks<{{type characteristic.Format}}> for {{pascal_c
 }
 ";
 
-static CHARACTERISTIC_MOD: &'static str = "// this file is auto-generated by build.rs
+static CHARACTERISTIC_MOD: &'static str = "// this file is auto-generated by hap-codegen
 {{#each characteristics as |c|}}\npub mod {{c}};{{/each}}
 ";
 
-static SERVICE: &'static str = "// this file is auto-generated by build.rs\n
+static SERVICE: &'static str = "// this file is auto-generated by hap-codegen\n
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 
 use crate::{
@@ -685,11 +685,11 @@ impl Serialize for {{pascal_case service.Name}}Service {
 }
 ";
 
-static SERVICE_MOD: &'static str = "// this file is auto-generated by build.rs
+static SERVICE_MOD: &'static str = "// this file is auto-generated by hap-codegen
 {{#each services as |s|}}\npub mod {{s}};{{/each}}
 ";
 
-static ACCESSORY: &'static str = "// this file is auto-generated by build.rs\n
+static ACCESSORY: &'static str = "// this file is auto-generated by hap-codegen\n
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 
 use crate::{
@@ -779,7 +779,7 @@ impl Serialize for {{pascal_case service.Name}}Accessory {
 }
 ";
 
-static ACCESSORY_MOD: &'static str = "// this file is auto-generated by build.rs
+static ACCESSORY_MOD: &'static str = "// this file is auto-generated by hap-codegen
 {{#each accessories as |a|}}\npub mod {{a}};{{/each}}
 ";
 
@@ -841,8 +841,6 @@ static ACCESSORY_MOD: &'static str = "// this file is auto-generated by build.rs
 // ";
 
 fn main() {
-    println!("cargo:rerun-if-changed=gen/default.json");
-
     let metadata_file = File::open("gen/default.json").unwrap();
     let mut metadata_ex = MetadataEx {
         metadata: serde_json::from_reader(&metadata_file).unwrap(),

diff --git a/src/accessory/category.rs b/src/accessory/category.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::{Deserialize, Serialize};
 

diff --git a/src/accessory/generated/air_purifier.rs b/src/accessory/generated/air_purifier.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/air_quality_sensor.rs b/src/accessory/generated/air_quality_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/carbon_dioxide_sensor.rs b/src/accessory/generated/carbon_dioxide_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/carbon_monoxide_sensor.rs b/src/accessory/generated/carbon_monoxide_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/contact_sensor.rs b/src/accessory/generated/contact_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/door.rs b/src/accessory/generated/door.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/fan.rs b/src/accessory/generated/fan.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/fan_v2.rs b/src/accessory/generated/fan_v2.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/garage_door_opener.rs b/src/accessory/generated/garage_door_opener.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/heater_cooler.rs b/src/accessory/generated/heater_cooler.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/humidifier_dehumidifier.rs b/src/accessory/generated/humidifier_dehumidifier.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/humidity_sensor.rs b/src/accessory/generated/humidity_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/leak_sensor.rs b/src/accessory/generated/leak_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/light_sensor.rs b/src/accessory/generated/light_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/lightbulb.rs b/src/accessory/generated/lightbulb.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/mod.rs b/src/accessory/generated/mod.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 pub mod air_purifier;
 pub mod air_quality_sensor;

diff --git a/src/accessory/generated/motion_sensor.rs b/src/accessory/generated/motion_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/occupancy_sensor.rs b/src/accessory/generated/occupancy_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/outlet.rs b/src/accessory/generated/outlet.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/security_system.rs b/src/accessory/generated/security_system.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/smoke_sensor.rs b/src/accessory/generated/smoke_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/stateless_programmable_switch.rs b/src/accessory/generated/stateless_programmable_switch.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/switch.rs b/src/accessory/generated/switch.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/temperature_sensor.rs b/src/accessory/generated/temperature_sensor.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/thermostat.rs b/src/accessory/generated/thermostat.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/valve.rs b/src/accessory/generated/valve.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/window.rs b/src/accessory/generated/window.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/accessory/generated/window_covering.rs b/src/accessory/generated/window_covering.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use serde::ser::{Serialize, SerializeStruct, Serializer};
 

diff --git a/src/characteristic/generated/accessory_flags.rs b/src/characteristic/generated/accessory_flags.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/active.rs b/src/characteristic/generated/active.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/active_identifier.rs b/src/characteristic/generated/active_identifier.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/administrator_only_access.rs b/src/characteristic/generated/administrator_only_access.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/air_particulate_density.rs b/src/characteristic/generated/air_particulate_density.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/air_particulate_size.rs b/src/characteristic/generated/air_particulate_size.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/air_quality.rs b/src/characteristic/generated/air_quality.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/audio_feedback.rs b/src/characteristic/generated/audio_feedback.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/battery_level.rs b/src/characteristic/generated/battery_level.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/brightness.rs b/src/characteristic/generated/brightness.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/carbon_dioxide_detected.rs b/src/characteristic/generated/carbon_dioxide_detected.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;

diff --git a/src/characteristic/generated/carbon_dioxide_level.rs b/src/characteristic/generated/carbon_dioxide_level.rs
@@ -1,4 +1,4 @@
-// this file is auto-generated by build.rs
+// this file is auto-generated by hap-codegen
 
 use async_trait::async_trait;
 use serde::Serialize;