---

yaml
---
r: 81395
b: refs/heads/snap-stage3
c: 8cb3426
h: refs/heads/master
i:
  81393: 8c416fc
  81391: e948622
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 4c6bf4872012c010f84dc7fa2cdfe87522533f89
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 87294c23baacaee17a13d2f7316fffc76239cff5
+refs/heads/snap-stage3: 8cb3426f16e22215f9a8dd61bb8b965fb9b26023
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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/snap-stage3/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/snap-stage3/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/snap-stage3/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)

branches/snap-stage3/src/etc/third-party/COPYING.LIB

@@ -0,0 +1,73 @@
+GCC RUNTIME LIBRARY EXCEPTION
+
+Version 3.1, 31 March 2009
+
+Copyright (C) 2009 Free Software Foundation, Inc. <http://fsf.org/>
+
+Everyone is permitted to copy and distribute verbatim copies of this
+license document, but changing it is not allowed.
+
+This GCC Runtime Library Exception ("Exception") is an additional
+permission under section 7 of the GNU General Public License, version
+3 ("GPLv3"). It applies to a given file (the "Runtime Library") that
+bears a notice placed by the copyright holder of the file stating that
+the file is governed by GPLv3 along with this Exception.
+
+When you use GCC to compile a program, GCC may combine portions of
+certain GCC header files and runtime libraries with the compiled
+program. The purpose of this Exception is to allow compilation of
+non-GPL (including proprietary) programs to use, in this way, the
+header files and runtime libraries covered by this Exception.
+
+0. Definitions.
+
+A file is an "Independent Module" if it either requires the Runtime
+Library for execution after a Compilation Process, or makes use of an
+interface provided by the Runtime Library, but is not otherwise based
+on the Runtime Library.
+
+"GCC" means a version of the GNU Compiler Collection, with or without
+modifications, governed by version 3 (or a specified later version) of
+the GNU General Public License (GPL) with the option of using any
+subsequent versions published by the FSF.
+
+"GPL-compatible Software" is software whose conditions of propagation,
+modification and use would permit combination with GCC in accord with
+the license of GCC.
+
+"Target Code" refers to output from any compiler for a real or virtual
+target processor architecture, in executable form or suitable for
+input to an assembler, loader, linker and/or execution
+phase. Notwithstanding that, Target Code does not include data in any
+format that is used as a compiler intermediate representation, or used
+for producing a compiler intermediate representation.
+
+The "Compilation Process" transforms code entirely represented in
+non-intermediate languages designed for human-written code, and/or in
+Java Virtual Machine byte code, into Target Code. Thus, for example,
+use of source code generators and preprocessors need not be considered
+part of the Compilation Process, since the Compilation Process can be
+understood as starting with the output of the generators or
+preprocessors.
+
+A Compilation Process is "Eligible" if it is done using GCC, alone or
+with other GPL-compatible software, or if it is done without using any
+work based on GCC. For example, using non-GPL-compatible Software to
+optimize any GCC intermediate representations would not qualify as an
+Eligible Compilation Process.
+
+1. Grant of Additional Permission.
+
+You have permission to propagate a work of Target Code formed by
+combining the Runtime Library with Independent Modules, even if such
+propagation would otherwise violate the terms of GPLv3, provided that
+all Target Code was generated by Eligible Compilation Processes. You
+may then convey such a combination under terms of your choice,
+consistent with the licensing of the Independent Modules.
+
+2. No Weakening of GCC Copyleft.
+
+The availability of this Exception does not imply any general
+presumption that third-party software is unaffected by the copyleft
+requirements of the license of GCC.
+