Update project structure and ensure examples, tests and docs are buil…

…t on travis-ci
kvark · Aug 6, 2014 · bc7af39 · bc7af39
1 parent 4cf82d2
commit bc7af39
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 .DS_store
 /target
+/examples/*/target
 Cargo.lock
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,8 @@
 language: rust
 
+env:
+  global:
+    - secure: SH7xrrH8ONXcrpHzKVJsBuLX1AikKBTBBI0SsEfCWfDZsAur0rQW5ZlPPorhQ0iZUbvw5xwY26T+0EYdBAWOwp7AOBM2iwoGZ15ERTd8o2JX3ZlMQ9AvDHNaXAc6YToj69DaiaimX+oX9DtZeRfQ309Lkp4D1YMrf4X/jhNpQdI=
 install:
   # glfw
   - sudo apt-get install libXxf86vm-dev
@@ -10,3 +13,12 @@ install:
   - make
   - sudo make install
   - cd ..
+script:
+  - cargo build
+  - cargo test
+  - make -C examples
+  # the doc directory needs to be in the root for rust-ci
+  - cargo doc
+  - ln -s target/doc doc
+after_script:
+  - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh
diff --git a/Cargo.toml b/Cargo.toml
@@ -7,8 +7,9 @@ authors = ["Brendan Zabarauskas <[email protected]>",
         "Arseny Kapoulkine"
 ]
 
-build = "git submodule update --init --recursive"
+[[lib]]
+name = "gl"
+path = "src/gl/lib.rs"
 
 [dependencies.gl_generator]
-
 path = "src/gl_generator"
diff --git a/examples/Makefile b/examples/Makefile
@@ -0,0 +1,17 @@
+all: build
+
+build:
+	(cd static_basic && cargo build)
+	(cd static_triangle && cargo build)
+#	error: couldn't open file (no such file or directory (No such file or directory); path=deps/khronos-api/gl.xml; mode=open; access=read)
+#	(cd struct_triangle && cargo build)
+
+update:
+	(cd static_basic && cargo update)
+	(cd static_triangle && cargo update)
+#	(cd struct_triangle && cargo update)
+
+clean:
+	(cd static_basic && cargo clean)
+	(cd static_triangle && cargo clean)
+#	(cd struct_triangle && cargo clean)
diff --git a/examples/static_basic/Cargo.toml b/examples/static_basic/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+
+name = "static-basic"
+version = "0.1.0"
+authors = [
+]
+
+build = "git submodule update --init --recursive"
+
+[[bin]]
+name = "static-basic"
+path = "main.rs"
+
+[dependencies.gl]
+path = "../../"
+
+[dependencies.glfw]
+git = "https://github.com/bjz/glfw-rs.git"
diff --git a/src/examples/static_basic.rs → examples/static_basic/main.rs b/src/examples/static_basic.rs → examples/static_basic/main.rs
diff --git a/examples/static_triangle/Cargo.toml b/examples/static_triangle/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+
+name = "static-triangle"
+version = "0.1.0"
+authors = [
+]
+
+[[bin]]
+name = "static-triangle"
+path = "main.rs"
+
+[dependencies.gl]
+path = "../../"
+
+[dependencies.glfw]
+git = "https://github.com/bjz/glfw-rs.git"
diff --git a/src/examples/static_triangle.rs → examples/static_triangle/main.rs b/src/examples/static_triangle.rs → examples/static_triangle/main.rs
diff --git a/examples/struct_triangle/Cargo.toml b/examples/struct_triangle/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+
+name = "struct-triangle"
+version = "0.1.0"
+authors = [
+]
+
+[[bin]]
+name = "struct-triangle"
+path = "main.rs"
+
+[dependencies.gl_generator]
+path = "../../"
+
+[dependencies.glfw]
+git = "https://github.com/bjz/glfw-rs.git"
diff --git a/src/examples/struct_triangle.rs → examples/struct_triangle/main.rs b/src/examples/struct_triangle.rs → examples/struct_triangle/main.rs
diff --git a/src/lib.rs → src/gl/lib.rs b/src/lib.rs → src/gl/lib.rs
diff --git a/src/gl_generator/Cargo.toml b/src/gl_generator/Cargo.toml
@@ -10,9 +10,8 @@ authors = ["Brendan Zabarauskas <[email protected]>",
 [[lib]]
 
 name = "gl_generator"
+path = "lib.rs"
 plugin = true
-path = "src/lib.rs"
 
 [dependencies.rust-xml]
 git = "https://github.com/netvl/rust-xml"
-
diff --git a/src/gl_generator/src/common.rs → src/gl_generator/common.rs b/src/gl_generator/src/common.rs → src/gl_generator/common.rs
diff --git a/src/gl_generator/src/lib.rs → src/gl_generator/lib.rs b/src/gl_generator/src/lib.rs → src/gl_generator/lib.rs
diff --git a/src/gl_generator/src/registry.rs → src/gl_generator/registry.rs b/src/gl_generator/src/registry.rs → src/gl_generator/registry.rs
diff --git a/src/gl_generator/src/static_gen.rs → src/gl_generator/static_gen.rs b/src/gl_generator/src/static_gen.rs → src/gl_generator/static_gen.rs
diff --git a/src/gl_generator/src/struct_gen.rs → src/gl_generator/struct_gen.rs b/src/gl_generator/src/struct_gen.rs → src/gl_generator/struct_gen.rs
diff --git a/src/gl_generator/src/ty.rs → src/gl_generator/ty.rs b/src/gl_generator/src/ty.rs → src/gl_generator/ty.rs