From 427a5bb6cad839025a69501807a119a806617b27 Mon Sep 17 00:00:00 2001
From: Jack Moffitt <jack@metajack.im>
Date: Tue, 26 Aug 2014 18:18:44 -0600
Subject: [PATCH] Cargoify rust-layers

---
 .gitignore                                    |  2 ++
 Cargo.toml                                    | 29 +++++++++++++++++++
 Makefile.in                                   |  8 ++---
 color.rs => src/color.rs                      |  0
 layers.rs => src/layers.rs                    |  0
 lib.rs => src/lib.rs                          |  0
 {platform => src/platform}/android/surface.rs |  0
 {platform => src/platform}/linux/surface.rs   |  0
 {platform => src/platform}/macos/surface.rs   |  0
 {platform => src/platform}/surface.rs         |  0
 rendergl.rs => src/rendergl.rs                |  0
 scene.rs => src/scene.rs                      |  0
 texturegl.rs => src/texturegl.rs              |  0
 tiling.rs => src/tiling.rs                    |  0
 util.rs => src/util.rs                        |  0
 15 files changed, 35 insertions(+), 4 deletions(-)
 create mode 100644 Cargo.toml
 rename color.rs => src/color.rs (100%)
 rename layers.rs => src/layers.rs (100%)
 rename lib.rs => src/lib.rs (100%)
 rename {platform => src/platform}/android/surface.rs (100%)
 rename {platform => src/platform}/linux/surface.rs (100%)
 rename {platform => src/platform}/macos/surface.rs (100%)
 rename {platform => src/platform}/surface.rs (100%)
 rename rendergl.rs => src/rendergl.rs (100%)
 rename scene.rs => src/scene.rs (100%)
 rename texturegl.rs => src/texturegl.rs (100%)
 rename tiling.rs => src/tiling.rs (100%)
 rename util.rs => src/util.rs (100%)

diff --git a/.gitignore b/.gitignore
index 5df5866..09ab198 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 /doc
+/target
+/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
new file mode 100644
index 0000000..2c914fb
--- /dev/null
+++ b/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+
+name = "layers"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+
+[dependencies.geom]
+
+git = "https://github.com/servo/rust-geom"
+
+[dependencies.opengles]
+
+git = "https://github.com/servo/rust-opengles"
+
+[dependencies.core_foundation]
+
+git = "https://github.com/servo/rust-core-foundation"
+
+[dependencies.io_surface]
+
+git = "https://github.com/servo/rust-io-surface"
+
+[dependencies.xlib]
+
+git = "https://github.com/servo/rust-xlib"
+
+[dependencies.egl]
+
+git = "https://github.com/servo/rust-egl"
diff --git a/Makefile.in b/Makefile.in
index 83b6592..1faed5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -7,22 +7,22 @@ RUSTDOC ?= rustdoc
 RUSTDOC_FLAGS ?=
 RUSTDOC_TARGET ?= doc
 
-RUST_SRC=$(shell find $(VPATH)/. -type f -name '*.rs')
+RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
 
 .PHONY: all
 all:    librust-layers.dummy
 
-librust-layers.dummy: lib.rs $(RUST_SRC) $(EXT_DEPS)
+librust-layers.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTC) $(RUSTFLAGS) $< --out-dir .
 	touch $@
 
-rust-layers-test: lib.rs $(RUST_SRC)
+rust-layers-test: src/lib.rs $(RUST_SRC)
 	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
 
 .PHONY: doc
 doc: $(RUSTDOC_TARGET)/layers/index.html
 
-$(RUSTDOC_TARGET)/layers/index.html: lib.rs $(RUST_SRC) $(EXT_DEPS)
+$(RUSTDOC_TARGET)/layers/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET)
 
 .PHONY: check
diff --git a/color.rs b/src/color.rs
similarity index 100%
rename from color.rs
rename to src/color.rs
diff --git a/layers.rs b/src/layers.rs
similarity index 100%
rename from layers.rs
rename to src/layers.rs
diff --git a/lib.rs b/src/lib.rs
similarity index 100%
rename from lib.rs
rename to src/lib.rs
diff --git a/platform/android/surface.rs b/src/platform/android/surface.rs
similarity index 100%
rename from platform/android/surface.rs
rename to src/platform/android/surface.rs
diff --git a/platform/linux/surface.rs b/src/platform/linux/surface.rs
similarity index 100%
rename from platform/linux/surface.rs
rename to src/platform/linux/surface.rs
diff --git a/platform/macos/surface.rs b/src/platform/macos/surface.rs
similarity index 100%
rename from platform/macos/surface.rs
rename to src/platform/macos/surface.rs
diff --git a/platform/surface.rs b/src/platform/surface.rs
similarity index 100%
rename from platform/surface.rs
rename to src/platform/surface.rs
diff --git a/rendergl.rs b/src/rendergl.rs
similarity index 100%
rename from rendergl.rs
rename to src/rendergl.rs
diff --git a/scene.rs b/src/scene.rs
similarity index 100%
rename from scene.rs
rename to src/scene.rs
diff --git a/texturegl.rs b/src/texturegl.rs
similarity index 100%
rename from texturegl.rs
rename to src/texturegl.rs
diff --git a/tiling.rs b/src/tiling.rs
similarity index 100%
rename from tiling.rs
rename to src/tiling.rs
diff --git a/util.rs b/src/util.rs
similarity index 100%
rename from util.rs
rename to src/util.rs