mirror of https://github.com/rwf2/Rocket.git
Reorganize repository.
The directory structure has changed to better isolate crates serving core and contrib. The new directory structure is: contrib/ lib/ - the contrib library core/ lib/ - the core Rocket library codegen/ - the "compile extension" codegen library codegen_next/ - the new proc-macro library examples/ - unchanged scripts/ - unchanged site/ - unchanged This commit also removes the following files: appveyor.yml - AppVeyor (Rust on Windows) is far too spotty for use rustfmt.toml - rustfmt is, unfortunately, not mature enough for use Finally, all example Cargo crates were marked with 'publish = false'.
This commit is contained in:
parent
74a5970c9d
commit
f171dc9d09
|
@ -3,10 +3,10 @@ codegen-units = 4
|
||||||
|
|
||||||
[workspace]
|
[workspace]
|
||||||
members = [
|
members = [
|
||||||
"lib/",
|
"core/lib/",
|
||||||
"codegen/",
|
"core/codegen/",
|
||||||
"codegen_next/",
|
"core/codegen_next/",
|
||||||
"contrib/",
|
"contrib/lib",
|
||||||
"examples/cookies",
|
"examples/cookies",
|
||||||
"examples/errors",
|
"examples/errors",
|
||||||
"examples/form_validation",
|
"examples/form_validation",
|
||||||
|
|
34
appveyor.yml
34
appveyor.yml
|
@ -1,34 +0,0 @@
|
||||||
environment:
|
|
||||||
matrix:
|
|
||||||
- TARGET: i686-pc-windows-gnu
|
|
||||||
CHANNEL: nightly
|
|
||||||
- TARGET: i686-pc-windows-msvc
|
|
||||||
CHANNEL: nightly
|
|
||||||
- TARGET: x86_64-pc-windows-gnu
|
|
||||||
CHANNEL: nightly
|
|
||||||
- TARGET: x86_64-pc-windows-msvc
|
|
||||||
CHANNEL: nightly
|
|
||||||
|
|
||||||
# Install Rust and Cargo
|
|
||||||
install:
|
|
||||||
- curl -sSf -o rustup-init.exe https://win.rustup.rs
|
|
||||||
- rustup-init.exe --default-host %TARGET% --default-toolchain %CHANNEL% -y
|
|
||||||
- set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
|
|
||||||
- rustc -Vv
|
|
||||||
- cargo -V
|
|
||||||
|
|
||||||
# Disable Appveyor's build stage. This prevents the "directory does not contain
|
|
||||||
# a project or solution file" error
|
|
||||||
build: false
|
|
||||||
|
|
||||||
# Equivalent to Travis' `script` phase
|
|
||||||
test_script:
|
|
||||||
- sh "./scripts/test.sh"
|
|
||||||
|
|
||||||
branches:
|
|
||||||
only:
|
|
||||||
- master
|
|
||||||
# IMPORTANT Regex to match tags. Required, or appveyor may not trigger
|
|
||||||
# deploys when a new tag is pushed. This regex matches semantic versions
|
|
||||||
# like v1.2.3-rc4+2016.02.22
|
|
||||||
- /^v\d+\.\d+\.\d+.*$/
|
|
|
@ -21,7 +21,7 @@ handlebars_templates = ["handlebars", "templates"]
|
||||||
templates = ["serde", "serde_json", "glob"]
|
templates = ["serde", "serde_json", "glob"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
rocket = { version = "0.4.0-dev", path = "../lib/" }
|
rocket = { version = "0.4.0-dev", path = "../../core/lib/" }
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
|
|
||||||
# UUID dependencies.
|
# UUID dependencies.
|
|
@ -29,7 +29,7 @@ fn target_path() -> PathBuf {
|
||||||
#[cfg(not(debug_assertions))] const ENVIRONMENT: &str = "release";
|
#[cfg(not(debug_assertions))] const ENVIRONMENT: &str = "release";
|
||||||
|
|
||||||
Path::new(env!("CARGO_MANIFEST_DIR"))
|
Path::new(env!("CARGO_MANIFEST_DIR"))
|
||||||
.parent().unwrap()
|
.parent().unwrap().parent().unwrap()
|
||||||
.join("target")
|
.join("target")
|
||||||
.join(ENVIRONMENT)
|
.join(ENVIRONMENT)
|
||||||
}
|
}
|
|
@ -10,6 +10,9 @@ readme = "../README.md"
|
||||||
keywords = ["rocket", "web", "framework", "code", "generation"]
|
keywords = ["rocket", "web", "framework", "code", "generation"]
|
||||||
license = "MIT/Apache-2.0"
|
license = "MIT/Apache-2.0"
|
||||||
|
|
||||||
|
# if publishing, add to config scripts
|
||||||
|
publish = false
|
||||||
|
|
||||||
[lib]
|
[lib]
|
||||||
proc-macro = true
|
proc-macro = true
|
||||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue