about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorVadim Chugunov <vadimcn@gmail.com>2013-10-02 11:40:50 -0700
committerVadim Chugunov <vadimcn@gmail.com>2013-10-02 11:40:50 -0700
commit4e59ab097a8026f9bdbabc7eda4313d2efd70e1e (patch)
tree55e372f50b4bfdb74fa592f235eafd6f6046004c /src
parent1a6b6c4301f924ee5d7068c49e65f488dbe93592 (diff)
downloadrust-4e59ab097a8026f9bdbabc7eda4313d2efd70e1e.tar.gz
rust-4e59ab097a8026f9bdbabc7eda4313d2efd70e1e.zip
Package system runtime dependencies into Windows distribution.
Diffstat (limited to 'src')
-rw-r--r--src/etc/copy-runtime-deps.py16
-rw-r--r--src/etc/pkg/rust.iss2
2 files changed, 17 insertions, 1 deletions
diff --git a/src/etc/copy-runtime-deps.py b/src/etc/copy-runtime-deps.py
new file mode 100644
index 00000000000..16155a99b69
--- /dev/null
+++ b/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])
diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss
index 0375a041a39..dc46f891219 100644
--- a/src/etc/pkg/rust.iss
+++ b/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