---

yaml
---
r: 95211
b: refs/heads/dist-snap
c: bf416e7
h: refs/heads/master
i:
  95209: 5b42f75
  95207: fbea83a
v: v3

Author: bors

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 1d19ad97871d22fb26a6ba0856d106546da8612d
+refs/heads/dist-snap: bf416e7daf533fd4eb6f270da3ab965ac7422f05
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/rust.md

@@ -1775,6 +1775,7 @@ Supported traits for `deriving` are:
   `obj.to_str()` has similar output as `fmt!("%?", obj)`, but it differs in that
   each constituent field of the type must also implement `ToStr` and will have
   `field.to_str()` invoked to build up the result.
+* `FromPrimitive`, to create an instance from a numeric primitve.
 
 ### Stability
 One can indicate the stability of an API using the following attributes:

branches/dist-snap/mk/dist.mk

@@ -60,6 +60,7 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
 
 $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
             $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
+	$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py i686-pc-mingw32/stage3/bin
 	@$(call E, ISCC: $@)
 	$(Q)"$(CFG_ISCC)" $<
 endif

branches/dist-snap/src/etc/copy-runtime-deps.py

@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+# xfail-license
+
+# Copies Rust runtime dependencies to the specified directory
+
+import snapshot, sys, os, shutil
+
+def copy_runtime_deps(dest_dir):
+    for path in snapshot.get_winnt_runtime_deps():
+        shutil.copy(path, dest_dir)
+
+    lic_dest = os.path.join(dest_dir, "third-party")
+    shutil.rmtree(lic_dest) # copytree() won't overwrite existing files
+    shutil.copytree(os.path.join(os.path.dirname(__file__), "third-party"), lic_dest)
+
+copy_runtime_deps(sys.argv[1])

branches/dist-snap/src/etc/get-snapshot.py

@@ -26,6 +26,8 @@ def unpack_snapshot(triple, dl_path):
     print("extracting " + p)
     tar.extract(p, download_unpack_base)
     tp = os.path.join(download_unpack_base, p)
+    if os.path.isdir(tp) and os.path.exists(fp):
+        continue
     shutil.move(tp, fp)
   tar.close()
   shutil.rmtree(download_unpack_base)

branches/dist-snap/src/etc/pkg/rust.iss

@@ -19,7 +19,7 @@ DisableStartupPrompt=true
 
 OutputDir=.\
 SourceDir=.\
-OutputBaseFilename=rust-{#CFG_VERSION}-install
+OutputBaseFilename=rust-{#CFG_VERSION_WIN}-install
 DefaultDirName={pf32}\Rust
 
 Compression=lzma2/ultra

branches/dist-snap/src/etc/snapshot.py

@@ -55,6 +55,10 @@ def scrub(b):
                 "lib/librustllvm.so"]
     }
 
+winnt_runtime_deps = ["libgcc_s_dw2-1.dll",
+                      "libstdc++-6.dll",
+                      "libpthread-2.dll"]
+
 def parse_line(n, line):
   global snapshotfile
 
@@ -155,6 +159,19 @@ def hash_file(x):
     h.update(open(x, "rb").read())
     return scrub(h.hexdigest())
 
+# Returns a list of paths of Rust's system runtime dependencies
+def get_winnt_runtime_deps():
+    runtime_deps = []
+    path_dirs = os.environ["PATH"].split(';')
+    for name in winnt_runtime_deps:
+      for dir in path_dirs:
+        matches = glob.glob(os.path.join(dir, name))
+        if matches:
+          runtime_deps.append(matches[0])
+          break
+      else:
+        raise Exception("Could not find runtime dependency: %s" % name)
+    return runtime_deps
 
 def make_snapshot(stage, triple):
     kernel = get_kernel(triple)
@@ -170,6 +187,7 @@ def in_tar_name(fn):
         return os.sep.join(cs[-2:])
 
     tar = tarfile.open(file0, "w:bz2")
+
     for name in snapshot_files[kernel]:
       dir = stage
       if stage == "stage1" and re.match(r"^lib/(lib)?std.*", name):
@@ -181,8 +199,15 @@ def in_tar_name(fn):
       if len(matches) == 1:
         tar.add(matches[0], "rust-stage0/" + in_tar_name(matches[0]))
       else:
-        raise Exception("Found stale files: \n  %s\n\
-Please make a clean build." % "\n  ".join(matches))
+        raise Exception("Found stale files: \n  %s\n"
+                        "Please make a clean build." % "\n  ".join(matches))
+
+    if kernel=="winnt":
+      for path in get_winnt_runtime_deps():
+        tar.add(path, "rust-stage0/bin/" + os.path.basename(path))
+      tar.add(os.path.join(os.path.dirname(__file__), "third-party"),
+              "rust-stage0/bin/third-party")
+
     tar.close()
 
     h = hash_file(file0)