Get Cargo working for the zinc rlib

Author: bharrisau

.gitignore

@@ -1,3 +1,5 @@
+/target/
 /build/
 /thirdparty/
 .DS_Store
+Cargo.lock

Cargo.toml

@@ -0,0 +1,21 @@
+[package]
+name = "zinc"
+version = "0.0.1"
+authors = ["[email protected]"]
+#build = ["rake target_deps", "support/cargo_deps"]
+
+[lib]
+name = "zinc"
+path = "src/zinc/lib.rs"
+
+[dependencies.rlibc]
+git = "https://github.com/bharrisau/rust-librlibc.git"
+
+[dependencies.core]
+git = "https://github.com/bharrisau/rust-libcore.git"
+
+[dependencies.ioreg]
+path = "src/ioreg"
+
+[dev-dependencies.hamcrest]
+git = "https://github.com/carllerche/hamcrest-rust.git"

Rakefile

@@ -11,6 +11,12 @@ provide_stdlibs
 desc "Run tests"
 task :test
 
+# task for target specific rust crates
+desc "Build target libraries"
+task :target_deps => [
+  'thirdparty/libcore/lib.rs'.in_root.as_rlib.in_build,
+  'thirdparty/librlibc/lib.rs'.in_root.as_rlib.in_build]
+
 # external dependencies
 compile_rust :shiny_crate, {
   source:    'thirdparty/shiny/src/lib.rs'.in_root,
@@ -51,24 +57,16 @@ compile_rust :ioreg_crate, {
   build_for: :host,
 }
 
-compile_rust :macro_ioreg, {
-  source:    'macro/ioreg.rs'.in_source,
-  deps:      [:ioreg_crate],
-  produce:   'macro/ioreg.rs'.in_source.as_dylib.in_build,
-  out_dir:   true,
-  build_for: :host,
-}
-
 rust_tests :ioreg_test, {
   source:    'ioreg/test.rs'.in_source,
-  deps:      [:core_crate, :macro_ioreg, :shiny_crate],
+  deps:      [:core_crate, :ioreg_crate, :shiny_crate],
   produce:   'ioreg_test'.in_build,
 }
 
 # zinc crate
 compile_rust :zinc_crate, {
   source:  'zinc/lib.rs'.in_source,
-  deps:    [:core_crate, :rlibc_crate, :macro_ioreg],
+  deps:    [:core_crate, :rlibc_crate, :ioreg_crate],
   produce: 'zinc/lib.rs'.in_source.as_rlib.in_build,
   out_dir: true,
   recompile_on: [:triple, :platform],
@@ -108,7 +106,7 @@ rust_tests :platformtree_test, {
 # zinc test
 rust_tests :zinc_test, {
   source:  'zinc/lib.rs'.in_source,
-  deps:    [:core_crate, :macro_ioreg, :hamcrest_crate, :shiny_crate],
+  deps:    [:core_crate, :ioreg_crate, :hamcrest_crate, :shiny_crate],
   produce: 'zinc_test'.in_build,
   recompile_on: [:platform],
   build_for: :host,

src/ioreg/Cargo.toml

@@ -0,0 +1,12 @@
+[package]
+name = "ioreg"
+version = "0.0.1"
+authors = ["[email protected]"]
+
+[lib]
+name = "ioreg"
+path = "ioreg.rs"
+plugin = true
+
+[dev-dependencies.hamcrest]
+git = "https://github.com/carllerche/hamcrest-rust.git"

src/ioreg/ioreg.rs

@@ -327,13 +327,56 @@ N => NAME
 
 */
 
-#![feature(quote, struct_variant)]
+#![feature(quote, struct_variant, plugin_registrar)]
 #![crate_name="ioreg"]
-#![crate_type="rlib"]
+#![crate_type="dylib"]
 
+extern crate rustc;
 extern crate syntax;
 extern crate serialize;
 
+use rustc::plugin::Registry;
+use syntax::ast;
+use syntax::ptr::P;
+use syntax::codemap::Span;
+use syntax::ext::base::{ExtCtxt, MacResult};
+use syntax::util::small_vector::SmallVector;
+
 pub mod node;
 pub mod parser;
 pub mod builder;
+
+#[plugin_registrar]
+pub fn plugin_registrar(reg: &mut Registry) {
+  reg.register_macro("ioregs", macro_ioregs);
+}
+
+pub fn macro_ioregs(cx: &mut ExtCtxt, _: Span, tts: &[ast::TokenTree])
+                    -> Box<MacResult+'static> {
+  match parser::Parser::new(cx, tts).parse_ioregs() {
+    Some(group) => {
+      let mut builder = builder::Builder::new();
+      let items = builder.emit_items(cx, group);
+      MacItems::new(items)
+    },
+    None => {
+      panic!();
+    }
+  }
+}
+
+pub struct MacItems {
+  items: Vec<P<ast::Item>>
+}
+
+impl MacItems {
+  pub fn new(items: Vec<P<ast::Item>>) -> Box<MacResult+'static> {
+    box MacItems { items: items } as Box<MacResult>
+  }
+}
+
+impl MacResult for MacItems {
+  fn make_items(self: Box<MacItems>) -> Option<SmallVector<P<ast::Item>>> {
+    Some(SmallVector::many(self.items.clone()))
+  }
+}

src/ioreg/test.rs

@@ -16,7 +16,7 @@
 //! Tests for ioreg! syntax extension
 
 #![feature(phase)]
-#[phase(plugin)] extern crate macro_ioreg;
+#[phase(plugin)] extern crate ioreg;
 #[phase(plugin,link)] extern crate shiny;
 extern crate core;
 

src/macro/ioreg.rs

@@ -49,7 +49,7 @@ extern crate rlibc;
 
 #[cfg(test)] #[phase(plugin,link)] extern crate std;
 #[cfg(test)] extern crate native;
-#[phase(plugin)] extern crate macro_ioreg;
+#[phase(plugin)] extern crate ioreg;
 
 pub mod drivers;
 pub mod hal;

src/zinc/lib.rs

@@ -0,0 +1,3 @@
+#!/bin/bash
+mkdir -p ./target/$TARGET/deps
+cp ./build/libcore.rlib ./build/librlibc.rlib ./target/$TARGET/deps