Merge pull request #37 from metajack/cargoify

Cargoify sharegl
servo · Aug 27, 2014 · 3706681 · 3706681
2 parents f2ae0df + e6d6fd9
commit 3706681
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1 +1,3 @@
 /doc
+/target
+/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+
+name = "sharegl"
+version = "0.1.0"
+authors = ["The Servo Project Developers"]
+
+[dependencies.core_foundation]
+
+git = "https://github.com/servo/rust-core-foundation"
+
+[dependencies.io_surface]
+
+git = "https://github.com/servo/rust-io-surface"
+
+[dependencies.opengles]
+
+git = "https://github.com/servo/rust-opengles"
diff --git 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:    libsharegl.dummy
 
-libsharegl.dummy: lib.rs $(RUST_SRC) $(EXT_DEPS)
+libsharegl.dummy: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTC) $(RUSTFLAGS) $< --out-dir .
 	touch $@
 
-sharegl-test: lib.rs $(RUST_SRC)
+sharegl-test: src/lib.rs $(RUST_SRC)
 	$(RUSTC) $(RUSTFLAGS) $< -o $@ --test
 
 .PHONY: doc
 doc: $(RUSTDOC_TARGET)/sharegl/index.html
 
-$(RUSTDOC_TARGET)/sharegl/index.html: lib.rs $(RUST_SRC) $(EXT_DEPS)
+$(RUSTDOC_TARGET)/sharegl/index.html: src/lib.rs $(RUST_SRC) $(EXT_DEPS)
 	$(RUSTDOC) $(RUSTDOC_FLAGS) $< -o $(RUSTDOC_TARGET)
 
 .PHONY: check

diff --git a/base.rs → src/base.rs b/base.rs → src/base.rs
diff --git a/context.rs → src/context.rs b/context.rs → src/context.rs
diff --git a/lib.rs → src/lib.rs b/lib.rs → src/lib.rs
diff --git a/platform/dummy.rs → src/platform/dummy.rs b/platform/dummy.rs → src/platform/dummy.rs
diff --git a/platform/linux.rs → src/platform/linux.rs b/platform/linux.rs → src/platform/linux.rs
diff --git a/platform/macos.rs → src/platform/macos.rs b/platform/macos.rs → src/platform/macos.rs