From 6d482cf23980d0f9940012294ea9e6e4b0b76594 Mon Sep 17 00:00:00 2001
From: Christian Muehlhaeuser <muesli@gmail.com>
Date: Mon, 21 Mar 2011 09:02:59 +0100
Subject: [PATCH] * Fixed OS X build scripts.

---
 admin/mac/DS_Store.in          | Bin 12292 -> 15364 bytes
 admin/mac/Info.plist           |   2 +-
 admin/mac/build-release-osx.sh |   9 ++++++---
 admin/mac/create-dmg.sh        |  16 +++++++++++-----
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/admin/mac/DS_Store.in b/admin/mac/DS_Store.in
index a6317e0b4ed6b9d6f51c855a7874ed9ef313ed06..bea3a4bcf34a6fff608c393efe7a1e9694e09c4e 100644
GIT binary patch
literal 15364
zcmeHM&u<$=6n<lG=sI?iO`JgUqp4N5sG+It5Q2(@RM!n65fX_S(<W+)yS6vZD(hWq
zcOBCNg8>N%2@Z%qfCF4AA_b}35E4in$UndhapZ&q2e^heJG<-HX#iDKsLG5q^WM(9
z_h#Pb@i(3|0FZ30GzAa?01+#dQUsg(6gp1pp%QR==paFVFbb$i_;BrzE$`q6a0EC4
z90861N8r&w0MBe%#4wY*<p^*DI08NblpkVPsm!>t$)rOa*f>`Jlmd1;1$DdtI6g5~
zW?b21(s9L@?DjxhSK?kV2y@5r7&S+kab=T9<_?6p194|2?hS=Fv!h?kF$a=ilD8ZI
zj=*6A*xfxbuNlRH)^>kCzwZ>sg+QWEx2mqiZlS8FmYqudNCH8j>xmO$NE9QhH&nf3
z)U!rSFIhL2){Xj-T2czKdCSpl*{)ex*>px0WqTb*96e_k8tSXA^$oRTuji$c+uP5l
zrYB?5Q`3#f*!E0n3iTJJ8x1;_^sP8_Ch_82PJXlT*4s^%6>*sXdOEUv7oRZ!wYcdf
zAbjK{@UztCr_dda^z`;g{R7d#p(md@IXp5tHa4D@q6N9QQ8sB-R}IZDvsz7AR*Qzd
zq;4sBX|OdsUy;ko6-||`Wm|c}X5#~`amW3dQhL4BmAg}IkKx$7Y$}R=vuvuRg|#(H
zv6m0%E2|bFJ8vtMd40{uO9Pv#QeUXrs-aug71KhwBAceHmzC_DTbf)@v;{qD*tSv0
zOMQ+nu6@x|sGk#esVWy$y&S*%8^bN0d6g*({ekbPhAon<m@_K!x?JC2gKh2J&UY8)
zE<hLJ9PVvpm#FIHHoJfKKq7lP-)wrebQ1#fxODIJLO9WyhaNe&kN0-&jpBGe(|6ZU
zcTN`)#`VX&<);rgrdu)CT6<v}dZ7R^6k!9(V1fZP(4hngsG=-G9}Hmp9QIexY8`7G
zEeBvUc_41GGj0_6lh+NcR#B{^w-A6qa+~IZEoRqMD;S1NpAVP4t^FwCi$-6367l>K
zrOJb#3zweRz|U)<q->g{lC{C`4aGWU4b2)wT&`|g9=cn<2hqkw_ueq-1R``rSl<Wu
z_*2Yc!bu|inuR+tU8yOSrl$Qs>GqZP!U+0zBAGy}D-O;W8?i4S(gxUwaNLQSWKolT
zR3A@<M-)gBU<lXJL-!4>@yuD4oWI4TfUm~AynRKKAg3F;5(>pLEAFTW6L1;kAdjDT
z13rY$U>ClIAK)kW1^yr>NR*6`bHQJOe+KsjB6JH;VN5tBoEFXs=Y*$OjDSZ^r@a}O
z6mYqeo;EF8vyl$eqE7dI7<b%#_Td2*{?a2cpM}Nlht0yn+uP60AoE^)7O59$_)=<S
zGBz_a)o6r5VyH#Kl!f16`5Z~Z?;V}h0c!rh%j)l_d1z#G^wj^7nim<!oSHc`KOWS4
zo^5EKk0tO`pOJk<^ojWu=7vY{gAnr>AuhOQf=|oiZbVlI7g3486+HH<pn-}%2xL5l
zR6LAyusVJ&e}%T6V-4)@U(GmvhmSRxMr!v1`fa|8mAHPW^1>0|2yg_B1A!o$Bu3x=
zzl1;YkNE%pIF`ca;0SO8{v!m4FuOFH#mT)ZYUeue^#sJQ-o{D`wQDlzxL`v~Xum)u
zKG64y&Tl*HOVK`BP|vus$t3n*IrcvT`2C;0ll|wnu>AhtdXx7^yqbM@_kZV$#~Y3S
nM}Q;15#R`L1ULd50geDifFr;W;0SO8I0762jsQpCu|(i6W!HN@

literal 12292
zcmeI0K~EDw6vy8n1{A0jB%mgw@kC<WYU07vgSFNmu_}q7XSd6?Y}oEJ-4;AHF<y-)
zFJ8I%4Lrd&;2Y`x%}k-CZ8X7y#`lt$H=TL!&FpWxZ+4c5RH?i3fM}J7W>HvY=TMCi
z9_KP5Q?4fit>90(hSvO6&?$}BN{0{-0zyCt2mvARcM!my%`!V--?yVu3jrbUUlQQ_
zkV9czbh>A?Ngb%n5deA`-A2&PasxW&bkXUa)fj;&>k4gMl{;c6>yG}Mvnx8?v)a0o
zGBYENn_0ONiZZjKKWEHI6|I(92nc~u0`~0gm0oU?Yw_Uued>frFT+8RxB0C4rlxhw
z&mMl(52E|dI7?6HvHCWZkAh_1MK>1dL9CModOr7k_IJ}=-9~`e_C!HLyD0sy3;Zm@
zI|}yuBe&3gNWDZSVNG|M7`M_-8f@FKacLey@NPvx$HwJLK#DryR5MfY(~eg^i(uoJ
z`uK4B>x;W|89!DsH9y#Ev~@Sx@ml5r1`L0%xq5t9O}1Wd)E|{LU;Tg(Ex2rT8eq;l
zn};(d2=FQ}e%-dK3EDO}u3-Il-0}+peuc9TW~mukqYTx^r-1gTL2c61rG$3KqZV|7
zu3@Gbs=y+p4tnd<q(!=&9|)R17nGJLo3HA)+YHlupWzLK`-tVWne22$$3FiYBS(7K
z16juZVaa)WY0Gb?Vbt^+;TV_6T{kP=9V267$zI8wbC@ZI>0U>-9MvN|vjz)C)eu(r
zr(iuO?}>Il;u`MpB^0*Pu$>l~-7t-#f{RiZyXXw9gUc{S4@_Gi+lCG)0$Cr#LomOJ
zEv|xl5u<03*3C3|J5AnA(<eK`W{FguXc_BU;QtU8$UHs8JS{|vaG!nL#|W_#N;hL2
zoIaJLzQFbqGje`&BkT1!&af9&j3@TjUPBpxR|PQ{!0yfy=Bgi@W(AO^30C9tf}$Qz
zLQ3|3!$B$`a8Ux6Y=Bih|362*l<xo+B`W?x;NK&lrps^3C9K=+ts_^!Z?8F&cPK1u
z*R$HVpfWGG(B{P)y8lYgwmF!xE;`+_8a)vC5MVG!B?N?k5D)@FKnMr{As_^VfDjM@
PLO=)z0U;m+{wRT;0}cOh

diff --git a/admin/mac/Info.plist b/admin/mac/Info.plist
index a761cee82..f43437a4d 100644
--- a/admin/mac/Info.plist
+++ b/admin/mac/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleSignature</key>
 	<string>tomahawk</string>
 	<key>CFBundleIconFile</key>
-	<string>tomahawk.icns</string>
+	<string>Tomahawk.icns</string>
 	<key>CFBundleName</key>
 	<string>Tomahawk</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/admin/mac/build-release-osx.sh b/admin/mac/build-release-osx.sh
index a1c863b10..2c9f17b6c 100755
--- a/admin/mac/build-release-osx.sh
+++ b/admin/mac/build-release-osx.sh
@@ -48,16 +48,19 @@ CREATEDMG='1'
     header "Running install_name_tool"
     $ROOT/../admin/mac/deposx.sh
 
-    header "Renaming icon"
-    mv Contents/Resources/tomahawkSources.icns Contents/Resources/tomahawk.icns
+    header "Renaming icon & copying Info.plist"
+    mv Contents/Resources/tomahawkSources.icns Contents/Resources/Tomahawk.icns
+    cp $ROOT/../admin/mac/Info.plist Contents/Info.plist
 
     header "Copying Sparkle pubkey & framework, and qt.conf"
     cp $ROOT/../admin/mac/sparkle_pub.pem Contents/Resources
     cp -R /Library/Frameworks/Sparkle.framework Contents/Frameworks
     cp $ROOT/../admin/mac/qt.conf Contents/Resources
 
-    header "Renaming app bundle"
+    header "Creating DMG"
     cd ..
     mv tomahawk.app Tomahawk.app
+    $ROOT/../admin/mac/create-dmg.sh Tomahawk.app
+    mv Tomahawk.app tomahawk.app
 
     header "Done!"
diff --git a/admin/mac/create-dmg.sh b/admin/mac/create-dmg.sh
index c2b7ce241..74c42ddc0 100755
--- a/admin/mac/create-dmg.sh
+++ b/admin/mac/create-dmg.sh
@@ -43,11 +43,17 @@ ln -s /Applications "$TMP/Applications"
 cp -R "$IN" "$TMP"
 
 # create
-hdiutil create -srcfolder "$TMP" \
-               -format UDZO -imagekey zlib-level=9 \
-               -scrub \
-               "$OUT" \
-               || die "Error creating DMG :("
+hdiutil makehybrid -hfs -hfs-volume-name Tomahawk -hfs-openfolder "$TMP" "$TMP" -o tmp.dmg
+hdiutil convert -format UDZO -imagekey zlib-level=9 tmp.dmg -o "$OUT"
+
+# cleanup
+rm tmp.dmg
+
+#hdiutil create -srcfolder "$TMP" \
+#               -format UDZO -imagekey zlib-level=9 \
+#               -scrub \
+#               "$OUT" \
+#               || die "Error creating DMG :("
 
 # done !
 echo 'DMG size:' `du -hs "$OUT" | awk '{print $1}'`