diff options
| author | Graydon Hoare <graydon@mozilla.com> | 2010-07-03 00:27:33 -0700 |
|---|---|---|
| committer | Graydon Hoare <graydon@mozilla.com> | 2010-07-03 00:27:33 -0700 |
| commit | df0fa603d091eb92e9ce7d2be969ae78a11057e2 (patch) | |
| tree | 6ce0b17ca8366bd1fca560b4ca33f7dffb0a16cb /src | |
| parent | cf19c5132a074195b61c3a09b9b61f99840744df (diff) | |
| download | rust-df0fa603d091eb92e9ce7d2be969ae78a11057e2.tar.gz rust-df0fa603d091eb92e9ce7d2be969ae78a11057e2.zip | |
Add version-stamp machinery (and put "Draft + datestamp" into doc footer).
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile | 16 | ||||
| -rw-r--r-- | src/boot/driver/main.ml | 7 | ||||
| -rw-r--r-- | src/boot/me/dwarf.ml | 2 |
3 files changed, 19 insertions, 6 deletions
diff --git a/src/Makefile b/src/Makefile index fa02a2a228a..93cb0b11af5 100644 --- a/src/Makefile +++ b/src/Makefile @@ -209,7 +209,7 @@ endif # List them in link order. # Nobody calculates the link-order DAG automatically, sadly. -UTIL_BOT_MLS := $(addprefix boot/util/, fmt.ml common.ml bits.ml) +UTIL_BOT_MLS := $(addprefix boot/util/, version.ml fmt.ml common.ml bits.ml) DRIVER_BOT_MLS := $(addprefix boot/driver/, session.ml) BE_MLS := $(addprefix boot/be/, x86.ml ra.ml pe.ml elf.ml \ macho.ml) @@ -256,10 +256,16 @@ STDLIB_INPUTS := $(wildcard lib/*.rc lib/*.rs lib/*/*.rs) COMPILER_CRATE := comp/rustc.rc COMPILER_INPUTS := $(wildcard comp/*.rc comp/*.rs comp/*/*.rs) -all: $(CFG_COMPILER) $(MKFILES) boot/fe/lexer.ml +GENERATED := boot/fe/lexer.ml boot/util/version.ml + +all: $(CFG_COMPILER) $(MKFILES) $(GENERATED) + +boot/util/version.ml: Makefile + $(CFG_QUIET)git log -1 \ + --format='let version = "prerelease (%h %ci)";;' >$@ loc: - wc -l $(BOOT_MLS) $(RUNTIME_CS) $(RUNTIME_HDR) + $(CFG_QUIET)wc -l $(BOOT_MLS) $(RUNTIME_CS) $(RUNTIME_HDR) $(CFG_RUNTIME): $(RUNTIME_OBJS) $(MKFILES) $(RUNTIME_HDR) @$(call CFG_ECHO, compile: $<) @@ -742,7 +748,7 @@ tidy: $(CFG_QUIET) python etc/tidy.py \ $(wildcard ../*.txt) \ ../README \ - $(filter-out boot/fe/lexer.ml $(PKG_3RDPARTY), $(PKG_FILES)) + $(filter-out $(GENERATED) $(PKG_3RDPARTY), $(PKG_FILES)) clean: @$(call CFG_ECHO, cleaning) @@ -750,7 +756,7 @@ clean: $(CFG_QUIET)rm -f $(BOOT_CMOS) $(BOOT_CMIS) $(BOOT_CMXS) $(BOOT_OBJS) $(CFG_QUIET)rm -f $(CFG_COMPILER) $(CFG_QUIET)rm -f $(ML_DEPFILES) $(C_DEPFILES) $(CRATE_DEPFILES) - $(CFG_QUIET)rm -f boot/fe/lexer.ml + $(CFG_QUIET)rm -f $(GENERATED) $(CFG_QUIET)rm -f $(CFG_BOOT) $(CFG_RUNTIME) $(CFG_STDLIB) $(CFG_QUIET)rm -f $(TEST_RPASS_EXES_X86) $(TEST_RPASS_OUTS_X86) $(CFG_QUIET)rm -f $(TEST_RPASS_EXES_LLVM) $(TEST_RPASS_OUTS_LLVM) diff --git a/src/boot/driver/main.ml b/src/boot/driver/main.ml index 5655604d3f2..9cb068efe06 100644 --- a/src/boot/driver/main.ml +++ b/src/boot/driver/main.ml @@ -118,6 +118,11 @@ let dump_meta (filename:filename) : unit = exit 0 ;; +let print_version _ = + Printf.fprintf stdout "rustboot %s\n" Version.version; + exit 0; +;; + let flag f opt desc = (opt, Arg.Unit f, desc) ;; @@ -206,6 +211,8 @@ let argspecs = "report metadata from DWARF info in compiled file, then exit"); ("-rdeps", Arg.Unit (fun _ -> sess.Session.sess_report_deps <- true), "report dependencies of input, then exit"); + ("-version", Arg.Unit (fun _ -> print_version()), + "print version information, then exit"); ] @ (Glue.alt_argspecs sess) ;; diff --git a/src/boot/me/dwarf.ml b/src/boot/me/dwarf.ml index 5fd8638f4a5..a568db417bd 100644 --- a/src/boot/me/dwarf.ml +++ b/src/boot/me/dwarf.ml @@ -2238,7 +2238,7 @@ let dwarf_visitor (SEQ [| uleb abbrev_code; (* DW_AT_producer: DW_FORM_string *) - ZSTRING "Rustboot pre-release"; + ZSTRING ("Rustboot " ^ Version.version); (* DW_AT_language: DW_FORM_data4 *) WORD (word_ty_mach, IMM 0x2L); (* DW_LANG_C *) (* DW_AT_name: DW_FORM_string *) |