From 5183936de05a9ac01c31b6d1a5cad2b5c061bdf6 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 8 Nov 2016 09:00:21 -0700 Subject: [PATCH] Add ref makefile target --- .gitignore | 1 + .gitmodules | 3 +++ Makefile | 11 +++++++++-- crates/docgen | 1 + 4 files changed, 14 insertions(+), 2 deletions(-) create mode 160000 crates/docgen diff --git a/.gitignore b/.gitignore index 3d6f0d2..dddd16e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build target initfs/bin filesystem/bin +filesystem/ref diff --git a/.gitmodules b/.gitmodules index 566a23b..3b2a8c6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -49,3 +49,6 @@ [submodule "syscall"] path = syscall url = https://github.com/redox-os/syscall.git +[submodule "crates/docgen"] + path = crates/docgen + url = https://github.com/redox-os/docgen.git diff --git a/Makefile b/Makefile index 79d0c4a..0c1f133 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ CARGO=RUSTC="$(RUSTC)" RUSTDOC="$(RUSTDOC)" cargo CARGOFLAGS=--target $(TARGET).json --release -- --cfg redox # Default targets -.PHONY: all clean doc update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE +.PHONY: all clean doc ref update qemu bochs drivers schemes coreutils extrautils netutils userutils wireshark FORCE all: $(KBUILD)/harddrive.bin @@ -71,6 +71,12 @@ doc-kernel: $(KBUILD)/libkernel.a FORCE doc-std: $(BUILD)/libstd.rlib FORCE $(CARGO) doc --target $(TARGET).json --manifest-path libstd/Cargo.toml +ref: FORCE + rm -rf filesystem/ref/ + mkdir -p 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/ + update: cargo update cargo update --manifest-path libstd/Cargo.toml @@ -420,10 +426,11 @@ extrautils: \ filesystem/bin/cur \ filesystem/bin/grep \ filesystem/bin/less \ + filesystem/bin/man \ filesystem/bin/mdless \ filesystem/bin/mtxt \ filesystem/bin/rem \ - #filesystem/bin/dmesg filesystem/bin/info filesystem/bin/man filesystem/bin/watch + #filesystem/bin/dmesg filesystem/bin/info filesystem/bin/watch netutils: \ filesystem/bin/dhcpd \ diff --git a/crates/docgen b/crates/docgen new file mode 160000 index 0000000..2e1bcf2 --- /dev/null +++ b/crates/docgen @@ -0,0 +1 @@ +Subproject commit 2e1bcf2ab5a03d176e7c66ae79c31ffccdcda77a