From 58f02984ca6ec0821906eb53f5edc9756b508f7d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 16 Jan 2017 10:33:09 -0700 Subject: [PATCH] Update and move docgen --- .gitmodules | 2 +- Cargo.toml | 2 +- mk/doc.mk | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3282f5..9cbca81 100644 --- a/.gitmodules +++ b/.gitmodules @@ -43,7 +43,7 @@ [submodule "installer"] path = installer url = https://github.com/redox-os/installer.git -[submodule "crates/docgen"] +[submodule "docgen"] path = docgen url = https://github.com/redox-os/docgen.git [submodule "programs/binutils"] diff --git a/Cargo.toml b/Cargo.toml index f191a7f..1201b64 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [workspace] members = [ - "crates/docgen", + "docgen", "drivers/ahcid", "drivers/bgad", "drivers/e1000d", diff --git a/mk/doc.mk b/mk/doc.mk index 2cb7bfd..78371f7 100644 --- a/mk/doc.mk +++ b/mk/doc.mk @@ -5,9 +5,9 @@ doc: $(KBUILD)/libkernel.a $(BUILD)/libstd.rlib FORCE ref: FORCE rm -rf filesystem/ref/ mkdir -p filesystem/ref/ - #cargo run --manifest-path crates/docgen/Cargo.toml -- programs/binutils/src/bin/ filesystem/ref/ - cargo run --manifest-path crates/docgen/Cargo.toml -- programs/coreutils/src/bin/ filesystem/ref/ - cargo run --manifest-path crates/docgen/Cargo.toml -- programs/extrautils/src/bin/ filesystem/ref/ - cargo run --manifest-path crates/docgen/Cargo.toml -- programs/netutils/src/ filesystem/ref/ - cargo run --manifest-path crates/docgen/Cargo.toml -- programs/pkgutils/src/ filesystem/ref/ - cargo run --manifest-path crates/docgen/Cargo.toml -- programs/userutils/src/ filesystem/ref/ + #cargo run --manifest-path docgen/Cargo.toml -- programs/binutils/src/bin/ filesystem/ref/ + cargo run --manifest-path docgen/Cargo.toml -- programs/coreutils/src/bin/ filesystem/ref/ + cargo run --manifest-path docgen/Cargo.toml -- programs/extrautils/src/bin/ filesystem/ref/ + cargo run --manifest-path docgen/Cargo.toml -- programs/netutils/src/ filesystem/ref/ + cargo run --manifest-path docgen/Cargo.toml -- programs/pkgutils/src/ filesystem/ref/ + cargo run --manifest-path docgen/Cargo.toml -- programs/userutils/src/ filesystem/ref/