Update to latest cargo

andrewrk · Jul 8, 2014 · c1a6984 · c1a6984
1 parent c04e5fe
commit c1a6984
Show file tree

Hide file tree

Showing 13 changed files with 10 additions and 24 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,8 +1,7 @@
-before_install:
-  - yes | sudo add-apt-repository ppa:cmrx64/cargo
-  - sudo apt-get update
 install:
-  - sudo apt-get install cargo
+  # cargo
+  - curl -O http://static.rust-lang.org/cargo-dist/cargo-nightly-linux.tar.gz
+  - tar xf cargo-nightly-linux.tar.gz
   # rustc
   - wget http://static.rust-lang.org/dist/rust-nightly-x86_64-unknown-linux-gnu.tar.gz
   - tar xzf rust-nightly-x86_64-unknown-linux-gnu.tar.gz
@@ -20,6 +19,6 @@ install:
   - sudo make install
   - cd ..
 script:
-  - cargo build
+  - ./cargo-nightly/bin/cargo build
   - make
   - make clean
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,8 @@ authors = ["Brendan Zabarauskas <[email protected]>",
 [[lib]]
 
 name = "gl"
-path = "src/gl_bind.rs"
+path = "src/lib.rs"
 
 [dependencies.gl_generator]
 
-path = "src/gen"
+path = "src/gl_generator"
diff --git a/Makefile b/Makefile
@@ -19,7 +19,7 @@ RUSTDOC             = rustdoc
 SRC_DIR             = src
 TEST_DIR            = test
 LIB_FILE            = $(SRC_DIR)/gl.rs
-GEN_FILE            = $(SRC_DIR)/gen/main.rs
+GEN_FILE            = $(SRC_DIR)/gl_generator/src/main.rs
 EXAMPLE_FILES       = $(SRC_DIR)/examples/*.rs
 
 BIN_DIR             = bin

diff --git a/cargo-lite.conf b/cargo-lite.conf
diff --git a/src/gen/cargo-lite.conf b/src/gen/cargo-lite.conf
diff --git a/src/gl/cargo-lite.conf b/src/gl/cargo-lite.conf
diff --git a/src/gen/Cargo.toml → src/gl_generator/Cargo.toml b/src/gen/Cargo.toml → src/gl_generator/Cargo.toml
@@ -11,7 +11,7 @@ authors = ["Brendan Zabarauskas <[email protected]>",
 
 name = "gl_generator"
 crate_type = ["dylib"]
-path = "lib.rs"
+path = "src/gl_generator.rs"
 
 [dependencies.sax-rs]
 

diff --git a/src/gen/generator.rs → src/gl_generator/src/generator.rs b/src/gen/generator.rs → src/gl_generator/src/generator.rs
diff --git a/src/gen/lib.rs → src/gl_generator/src/gl_generator.rs b/src/gen/lib.rs → src/gl_generator/src/gl_generator.rs
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#![crate_name = "gen"]
+#![crate_name = "gl_generator"]
 #![comment = "OpenGL function loader generator."]
 #![license = "ASL2"]
 

diff --git a/src/gen/main.rs → src/gl_generator/src/main.rs b/src/gen/main.rs → src/gl_generator/src/main.rs
diff --git a/src/gen/registry.rs → src/gl_generator/src/registry.rs b/src/gen/registry.rs → src/gl_generator/src/registry.rs
diff --git a/src/gen/ty.rs → src/gl_generator/src/ty.rs b/src/gen/ty.rs → src/gl_generator/src/ty.rs
diff --git a/src/gl_bind.rs → src/lib.rs b/src/gl_bind.rs → src/lib.rs
@@ -26,7 +26,7 @@
 #![allow(unused_variable)]
 
 #[phase(plugin)]
-extern crate gen;
+extern crate gl_generator;
 
 extern crate libc;