Merge pull request brendanzab#379 from bjz/khronos_api

Bump khronos_api to v1.0.0

README.md

@@ -184,7 +184,7 @@ This generator should only be used only if the platform you are compiling for
 is guaranteed to support the requested API. Otherwise you will get a
 compilation error.
 For example, you can use it for WGL and OpenGL 1.1 on Windows or GLX and
-OpenGL 1.3 on Linux, because Windows and Linux are guanteed to provide
+OpenGL 1.3 on Linux, because Windows and Linux are guaranteed to provide
 implementations for these APIs.
 
 You will need to manually provide the linkage. For example to use WGL or
@@ -204,16 +204,24 @@ and in your plugin registrar, register a function which calls
 
 ### gl
 
+#### v0.5.1
+
+- Upgrade `khronos_api` to v1.0.0
+
 #### v0.5.0
 
 - Use glutin from examples
 - Use `raw::c_void` for `GLvoid`
 
 ### gl_generator
 
+#### v0.4.1
+
+- Upgrade `khronos_api` to v1.0.0
+
 #### v0.4.0
 
-- Upgrade to xml-rs v0.2.2
+- Upgrade `xml-rs` to v0.2.2
 - Use `raw::c_void` for `GLvoid`
 - Remove `registry::{Group, EnumNs, CmdNs}`
 - Remove `groups` field from `registry::Registry`

gl/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "gl"
-version = "0.5.0"
+version = "0.5.1"
 authors = ["Brendan Zabarauskas <[email protected]>",
         "Corey Richardson",
         "Arseny Kapoulkine"
@@ -10,13 +10,9 @@ license = "Apache-2.0"
 build = "build.rs"
 repository = "https://github.com/bjz/gl-rs/"
 
-[build-dependencies.gl_generator]
-path = "../gl_generator"
-version = "0.4.0"
-
-[build-dependencies.khronos_api]
-path = "../khronos_api"
-version = "0.0.8"
+[build-dependencies]
+gl_generator = { version = "0.4.0", path = "../gl_generator" }
+khronos_api = { version = "1.0.0", path = "../khronos_api" }
 
 [dev-dependencies]
 glutin = "0.4"

gl_generator/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 
 name = "gl_generator"
-version = "0.4.0"
+version = "0.4.1"
 authors = ["Brendan Zabarauskas <[email protected]>",
         "Corey Richardson",
         "Arseny Kapoulkine"
@@ -14,10 +14,7 @@ license = "Apache-2.0"
 name = "gl_generator"
 path = "lib.rs"
 
-[dev-dependencies.khronos_api]
-path = "../khronos_api"
-version = "0.0.8"
-
 [dependencies]
+khronos_api = { version = "1.0.0", path = "../khronos_api" }
 log = "0.3.2"
 xml-rs = "0.2.2"

gl_tests/Cargo.toml

@@ -1,13 +1,9 @@
 [package]
 # we don't include some metadata to avoid accidental publishes
 name = "gl_tests"
-version = "0.0.1"
+version = "0.0.0"
 build = "build.rs"
 
-[build-dependencies.gl_generator]
-path = "../gl_generator"
-version = "0.4.0"
-
-[build-dependencies.khronos_api]
-path = "../khronos_api"
-version = "0.0.8"
+[build-dependencies]
+gl_generator = { path = "../gl_generator" }
+khronos_api = { path = "../khronos_api" }

khronos_api/Cargo.toml

@@ -1,11 +1,18 @@
 [package]
 
 name = "khronos_api"
-version = "0.0.8"
-authors = ["Brendan Zabarauskas <[email protected]>",
-        "Corey Richardson",
-        "Arseny Kapoulkine",
-        "Pierre Krieger <[email protected]>"
+version = "1.0.0"
+authors = [
+  "Brendan Zabarauskas <[email protected]>",
+  "Corey Richardson",
+  "Arseny Kapoulkine",
+  "Pierre Krieger <[email protected]>"
 ]
-description = "Khronos API XML descriptions for gl_generator"
+description = "The Khronos XML API Registry, exposed as byte string constants."
 license = "Apache-2.0"
+
+homepage = "https://github.com/bjz/gl-rs/khronos_api/"
+repository = "https://github.com/bjz/gl-rs/"
+readme = "README.md"
+
+keywords = ["opengl", "khronos"]

khronos_api/README.md

@@ -0,0 +1,14 @@
+# khronos_api
+
+[![Version](https://img.shields.io/crates/v/khronos_api.svg)](https://crates.io/crates/khronos_api)
+[![License](https://img.shields.io/crates/l/khronos_api.svg)](https://github.com/bjz/gl-rs/blob/master/LICENSE)
+[![Downloads](https://img.shields.io/crates/d/khronos_api.svg)](https://crates.io/crates/khronos_api)
+
+The Khronos XML API Registry, exposed as byte string constants.
+
+The following constants are provided:
+
+- `GL_XML`: the contents of [`gl.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml)
+- `EGL_XML`: the contents of [`egl.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/egl.xml)
+- `WGL_XML`: the contents of [`wgl.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml)
+- `GLX_XML`: the contents of [`glx.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/glx.xml)

khronos_api/src/lib.rs

@@ -1,13 +1,27 @@
+// Copyright 2015 Brendan Zabarauskas
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 //! This crates contains the sources of the official OpenGL repository.
 
-/// Content of the official `gl.xml` file.
+/// The contents of [`gl.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/gl.xml)
 pub const GL_XML: &'static [u8] = include_bytes!("../api/gl.xml");
 
-/// Content of the official `egl.xml` file.
+/// The contents of [`egl.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/egl.xml)
 pub const EGL_XML: &'static [u8] = include_bytes!("../api/egl.xml");
 
-/// Content of the official `wgl.xml` file.
+/// The contents of [`wgl.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/wgl.xml)
 pub const WGL_XML: &'static [u8] = include_bytes!("../api/wgl.xml");
 
-/// Content of the official `glx.xml` file.
+/// The contents of [`glx.xml`](https://cvs.khronos.org/svn/repos/ogl/trunk/doc/registry/public/api/glx.xml)
 pub const GLX_XML: &'static [u8] = include_bytes!("../api/glx.xml");