diff options
| author | Vadim Chugunov <vadimcn@gmail.com> | 2013-10-02 11:40:50 -0700 |
|---|---|---|
| committer | Vadim Chugunov <vadimcn@gmail.com> | 2013-10-02 11:40:50 -0700 |
| commit | 4e59ab097a8026f9bdbabc7eda4313d2efd70e1e (patch) | |
| tree | 55e372f50b4bfdb74fa592f235eafd6f6046004c | |
| parent | 1a6b6c4301f924ee5d7068c49e65f488dbe93592 (diff) | |
| download | rust-4e59ab097a8026f9bdbabc7eda4313d2efd70e1e.tar.gz rust-4e59ab097a8026f9bdbabc7eda4313d2efd70e1e.zip | |
Package system runtime dependencies into Windows distribution.
| -rw-r--r-- | mk/dist.mk | 1 | ||||
| -rw-r--r-- | src/etc/copy-runtime-deps.py | 16 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 2 |
3 files changed, 18 insertions, 1 deletions
diff --git a/mk/dist.mk b/mk/dist.mk index 4a980edf767..beaa6dc5215 100644 --- a/mk/dist.mk +++ b/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 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 |