diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-02-13 00:22:18 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-02-15 14:18:00 -0800 |
| commit | 508cb29dc4358a625afaa83dce8a9853864999f2 (patch) | |
| tree | d4c2dedb9ffc213254bdb17d8b9a1f2a535e17fb | |
| parent | 8f2bee21170c3e85c47474009314684198724b0c (diff) | |
| download | rust-508cb29dc4358a625afaa83dce8a9853864999f2.tar.gz rust-508cb29dc4358a625afaa83dce8a9853864999f2.zip | |
mk: Base the windows dist target on prepare.mk
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | mk/dist.mk | 18 | ||||
| -rw-r--r-- | src/etc/pkg/rust.iss | 2 |
3 files changed, 17 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 65c3d626783..5e6e8f310c7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -222,6 +222,7 @@ endif # Copy all the distributables to another directory for binary install ifneq ($(strip $(findstring prepare,$(MAKECMDGOALS)) \ + $(findstring dist,$(MAKECMDGOALS)) \ $(findstring install,$(MAKECMDGOALS))),) CFG_INFO := $(info cfg: including prepare rules) include $(CFG_SRC_DIR)mk/prepare.mk diff --git a/mk/dist.mk b/mk/dist.mk index 89727cecef9..1a4d7a27843 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -52,12 +52,24 @@ LICENSE.txt: $(S)COPYRIGHT $(S)LICENSE-APACHE $(S)LICENSE-MIT cp $< $@ $(PKG_EXE): rust.iss modpath.iss LICENSE.txt rust-logo.ico \ - $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) - $(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py i686-pc-mingw32/stage3/bin + $(PKG_FILES) $(CSREQ3_T_$(CFG_BUILD)_H_$(CFG_BUILD)) \ + dist-prepare-win + $(CFG_PYTHON) $(S)src/etc/copy-runtime-deps.py tmp/dist/win/bin @$(call E, ISCC: $@) $(Q)"$(CFG_ISCC)" $< -endif +dist-prepare-win: PREPARE_HOST=$(CFG_BUILD) +dist-prepare-win: PREPARE_TARGETS=$(CFG_BUILD) +dist-prepare-win: PREPARE_DEST_DIR=tmp/dist/win +# On windows we're using stage3, unlike Unix... +dist-prepare-win: PREPARE_STAGE=3 +dist-prepare-win: PREPARE_DIR_CMD=$(DEFAULT_PREPARE_DIR_CMD) +dist-prepare-win: PREPARE_BIN_CMD=$(DEFAULT_PREPARE_BIN_CMD) +dist-prepare-win: PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) +dist-prepare-win: PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) +dist-prepare-win: prepare-base + +endif $(PKG_TAR): $(PKG_FILES) @$(call E, making dist dir) diff --git a/src/etc/pkg/rust.iss b/src/etc/pkg/rust.iss index 635d385d7c4..559ed0e860f 100644 --- a/src/etc/pkg/rust.iss +++ b/src/etc/pkg/rust.iss @@ -36,7 +36,7 @@ Uninstallable=yes Name: modifypath; Description: &Add {app}\bin to your PATH (recommended) [Files] -Source: "i686-pc-mingw32/stage3/*.*" ; DestDir: "{app}"; Flags: ignoreversion recursesubdirs +Source: "tmp/dist/win/*.*" ; DestDir: "{app}"; Flags: ignoreversion recursesubdirs [Code] const |