From bec333c4bc9d414c7f393adfdb8d8ab2d394bb37 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Fri, 28 Mar 2014 14:35:43 -0700
Subject: [PATCH] dist: Tweak the OSX pkg installer

This performs a few touch-ups to the OSX installer:

* A rust logo is shown during installation
* The installation happens to /usr/local by default (instead of /)
* A new welcome screen is shown that's slightly more relevant
---
 .gitattributes               |   1 +
 mk/dist.mk                   |  19 +++++++++++++++++--
 src/etc/pkg/Distribution.xml |   6 +++++-
 src/etc/pkg/rust-logo.png    | Bin 0 -> 5844 bytes
 src/etc/pkg/welcome.rtf      |  12 ++++++++++++
 5 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 src/etc/pkg/rust-logo.png
 create mode 100644 src/etc/pkg/welcome.rtf

diff --git a/.gitattributes b/.gitattributes
index 3e368ce70e928..052341b5845be 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 cd6aedc6e8992..d0990dfd72073 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 9c2e5d6588433..c7383c0bb1a9f 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 0000000000000000000000000000000000000000..2c3de3000879b36b1dc4751ea5db0fa8fce4b5aa
GIT binary patch
literal 5844
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
Q_^+aDa?8xH`lbu=e-rnYoB#j-

literal 0
HcmV?d00001

diff --git a/src/etc/pkg/welcome.rtf b/src/etc/pkg/welcome.rtf
new file mode 100644
index 0000000000000..2433348998ecf
--- /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}