diff options
| -rw-r--r-- | .gitattributes | 1 | ||||
| -rw-r--r-- | mk/dist.mk | 19 | ||||
| -rw-r--r-- | src/etc/pkg/Distribution.xml | 6 | ||||
| -rw-r--r-- | src/etc/pkg/rust-logo.png | bin | 0 -> 5844 bytes | |||
| -rw-r--r-- | src/etc/pkg/welcome.rtf | 12 |
5 files changed, 35 insertions, 3 deletions
diff --git a/.gitattributes b/.gitattributes index 3e368ce70e9..052341b5845 100644 --- a/.gitattributes +++ b/.gitattributes @@ -5,6 +5,7 @@ *.h rust *.rs rust src/etc/pkg/rust-logo.ico binary +src/etc/pkg/rust-logo.png binary src/rt/msvc/* -whitespace src/rt/vg/* -whitespace src/rt/jemalloc/**/* -whitespace diff --git a/mk/dist.mk b/mk/dist.mk index cd6aedc6e89..d0990dfd720 100644 --- a/mk/dist.mk +++ b/mk/dist.mk @@ -160,12 +160,27 @@ dist-prepare-osx-$(1): PREPARE_LIB_CMD=$(DEFAULT_PREPARE_LIB_CMD) dist-prepare-osx-$(1): PREPARE_MAN_CMD=$(DEFAULT_PREPARE_MAN_CMD) dist-prepare-osx-$(1): prepare-base-osx-$(1) -dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt dist-prepare-osx-$(1) +dist/$(PKG_NAME)-$(1).pkg: $(S)src/etc/pkg/Distribution.xml LICENSE.txt \ + dist-prepare-osx-$(1) \ + tmp/dist/pkgres-$(1)/LICENSE.txt \ + tmp/dist/pkgres-$(1)/welcome.rtf \ + tmp/dist/pkgres-$(1)/rust-logo.png @$$(call E, making OS X pkg) $(Q)pkgbuild --identifier org.rust-lang.rust --root tmp/dist/pkgroot-$(1) rust.pkg - $(Q)productbuild --distribution $(S)src/etc/pkg/Distribution.xml --resources . dist/$(PKG_NAME)-$(1).pkg + $(Q)productbuild --distribution $(S)src/etc/pkg/Distribution.xml \ + --resources tmp/dist/pkgres-$(1) dist/$(PKG_NAME)-$(1).pkg $(Q)rm -rf tmp rust.pkg +tmp/dist/pkgres-$(1)/LICENSE.txt: $(S)/LICENSE.txt + @$$(call E,pkg resource LICENSE.txt) + $(Q)mkdir -p $$(@D) + $(Q)cp $$< $$@ + +tmp/dist/pkgres-$(1)/%: $(S)src/etc/pkg/% + @$$(call E,pkg resource $$*) + $(Q)mkdir -p $$(@D) + $(Q)cp -r $$< $$@ + endef $(foreach host,$(CFG_HOST),$(eval $(call DEF_OSX_PKG,$(host)))) diff --git a/src/etc/pkg/Distribution.xml b/src/etc/pkg/Distribution.xml index 9c2e5d65884..c7383c0bb1a 100644 --- a/src/etc/pkg/Distribution.xml +++ b/src/etc/pkg/Distribution.xml @@ -14,9 +14,13 @@ <line choice="org.rust-lang.rust"/> </line> </choices-outline> - <choice id="default"/> + <choice id="default" + customLocation="usr/local"/> <choice id="org.rust-lang.rust" visible="false"> <pkg-ref id="org.rust-lang.rust"/> </choice> <pkg-ref id="org.rust-lang.rust" version="0" onConclusion="none">rust.pkg</pkg-ref> + <welcome file="welcome.rtf" mime-type="text/enriched"/> + <background file="rust-logo.png" mime-type="image/png" + alignment="bottomleft"/> </installer-gui-script> diff --git a/src/etc/pkg/rust-logo.png b/src/etc/pkg/rust-logo.png new file mode 100644 index 00000000000..2c3de300087 --- /dev/null +++ b/src/etc/pkg/rust-logo.png Binary files differdiff --git a/src/etc/pkg/welcome.rtf b/src/etc/pkg/welcome.rtf new file mode 100644 index 00000000000..2433348998e --- /dev/null +++ b/src/etc/pkg/welcome.rtf @@ -0,0 +1,12 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1265\cocoasubrtf190 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} +{\colortbl;\red255\green255\blue255;} +\margl1440\margr1440\vieww10800\viewh6300\viewkind0 +\pard\tx720\tx1440\tx2160\tx2880\tx3600\tx4320\tx5040\tx5760\tx6480\tx7200\tx7920\tx8640\pardirnatural + +\f0\fs28 \cf0 \ +\ + You will be guided through the steps necessary to\ + install this software.\ +\ + This will install Rust to /usr/local} |
