diff --git a/contrib/codegen/Cargo.toml b/contrib/codegen/Cargo.toml index 5914ec12..29a9a25b 100644 --- a/contrib/codegen/Cargo.toml +++ b/contrib/codegen/Cargo.toml @@ -3,15 +3,13 @@ name = "rocket_contrib_codegen" version = "0.4.0-dev" authors = ["Sergio Benitez "] description = "Procedural macros for the Rocket contrib libraries." -documentation = "https://api.rocket.rs/v0.4/rocket_contrib_codegen/" +documentation = "https://api.rocket.rs/v0.4/rocket_contrib/" homepage = "https://rocket.rs" repository = "https://github.com/SergioBenitez/Rocket" -readme = "../../../README.md" +readme = "../../README.md" keywords = ["rocket", "contrib", "code", "generation", "proc-macro"] license = "MIT/Apache-2.0" - -# if publishing, add to config scripts -publish = false +build = "../../core/lib/build.rs" [features] database_attribute = [] @@ -22,3 +20,7 @@ proc-macro = true [dependencies] devise = "0.1" quote = "0.6" + +[build-dependencies] +yansi = "0.4" +version_check = "0.1.3" diff --git a/contrib/lib/Cargo.toml b/contrib/lib/Cargo.toml index 415df68c..eac96369 100644 --- a/contrib/lib/Cargo.toml +++ b/contrib/lib/Cargo.toml @@ -35,7 +35,8 @@ redis_pool = ["databases", "redis", "r2d2_redis"] [dependencies] # Global dependencies. -rocket = { version = "0.4.0-dev", path = "../../core/lib/" } +rocket_contrib_codegen = { version = "0.4.0-rc", path = "../codegen", optional = true } +rocket = { version = "0.4.0-rc", path = "../../core/lib/" } log = "0.4" # Serialization and templating dependencies. @@ -65,9 +66,6 @@ r2d2_cypher = { version = "0.4", optional = true } redis = { version = "0.9", optional = true } r2d2_redis = { version = "0.8", optional = true } -# Contrib codegen dependencies -rocket_contrib_codegen = { path = "../codegen", optional = true } - [target.'cfg(debug_assertions)'.dependencies] notify = { version = "^4.0" } diff --git a/core/codegen/Cargo.toml b/core/codegen/Cargo.toml index f0df9abf..f7de3509 100644 --- a/core/codegen/Cargo.toml +++ b/core/codegen/Cargo.toml @@ -11,9 +11,6 @@ keywords = ["rocket", "web", "framework", "code", "generation"] license = "MIT/Apache-2.0" build = "../lib/build.rs" -# if publishing, add to config scripts -publish = false - [lib] proc-macro = true diff --git a/scripts/config.sh b/scripts/config.sh index 78565991..6a70947f 100755 --- a/scripts/config.sh +++ b/scripts/config.sh @@ -46,11 +46,11 @@ EXAMPLES_DIR=$(relative "examples") || exit $? DOC_DIR=$(relative "target/doc") || exit $? ALL_PROJECT_DIRS=( - "${CORE_LIB_ROOT}" - "${CORE_CODEGEN_ROOT}" "${CORE_HTTP_ROOT}" - "${CONTRIB_LIB_ROOT}" + "${CORE_CODEGEN_ROOT}" + "${CORE_LIB_ROOT}" "${CONTRIB_CODEGEN_ROOT}" + "${CONTRIB_LIB_ROOT}" ) if [ "${1}" = "-p" ]; then