Skip to content

Commit 4d5c054

Browse files
committed
---
yaml --- r: 82867 b: refs/heads/auto c: 4e59ab0 h: refs/heads/master i: 82865: aa463bf 82863: 37bcc25 v: v3
1 parent 04e9bc6 commit 4d5c054

File tree

4 files changed

+19
-2
lines changed

4 files changed

+19
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 1a6b6c4301f924ee5d7068c49e65f488dbe93592
16+
refs/heads/auto: 4e59ab097a8026f9bdbabc7eda4313d2efd70e1e
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/mk/dist.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT
6060

6161
$(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \
6262
$(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD_TRIPLE)_H_$(CFG_BUILD_TRIPLE))
63+
$(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py i686-pc-mingw32/stage3/bin
6364
@$(call E, ISCC: $@)
6465
$(Q)"$(CFG_ISCC)" $<
6566
endif
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
#!/usr/bin/env python
2+
# xfail-license
3+
4+
# Copies Rust runtime dependencies to the specified directory
5+
6+
import snapshot, sys, os, shutil
7+
8+
def copy_runtime_deps(dest_dir):
9+
for path in snapshot.get_winnt_runtime_deps():
10+
shutil.copy(path, dest_dir)
11+
12+
lic_dest = os.path.join(dest_dir, "third-party")
13+
shutil.rmtree(lic_dest) # copytree() won't overwrite existing files
14+
shutil.copytree(os.path.join(os.path.dirname(__file__), "third-party"), lic_dest)
15+
16+
copy_runtime_deps(sys.argv[1])

branches/auto/src/etc/pkg/rust.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ DisableStartupPrompt=true
1919

2020
OutputDir=.\
2121
SourceDir=.\
22-
OutputBaseFilename=rust-{#CFG_VERSION}-install
22+
OutputBaseFilename=rust-{#CFG_VERSION_WIN}-install
2323
DefaultDirName={pf32}\Rust
2424

2525
Compression=lzma2/ultra

0 commit comments

Comments
 (0)