From 33544fc3e6f54de994483ed22f1fb0d1d3688e43 Mon Sep 17 00:00:00 2001
From: "David A. Mellis" <d.mellis@arduino.cc>
Date: Mon, 28 Nov 2011 17:36:03 -0500
Subject: [PATCH] Changing Mac OS X build to a .zip file (and adding OS name to
 archive).

http://code.google.com/p/arduino/issues/detail?id=645
---
 build/build.xml                               | 45 +++++++++++++++----
 build/macosx/template.app/Contents/Info.plist |  6 +--
 2 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 13b6c2ea6..6a40d1b2c 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -217,7 +217,37 @@
     <exec executable="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" spawn="true"/>
   </target>
 
-  <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">
+  <target name="macosx-dist" if="macosx" depends="macosx-build" description="Create a downloadable .zip for the Mac OS X version">
+    <!-- The ant copy command does not preserve permissions. -->
+    <chmod file="macosx/work/Arduino.app/Contents/MacOS/JavaApplicationStub" perm="+x" />
+    <chmod perm="+x">
+      <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/bin" includes="**/*" />
+      <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr/bin" includes="**/*" />
+      <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-3/bin" includes="**/*" />
+      <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/avr-4/bin" includes="**/*" />
+      <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/3.4.6/" includes="**/cc1*" />
+      <fileset dir="macosx/work/Arduino.app/Contents/Resources/Java/hardware/tools/avr/libexec/gcc/avr/4.3.2/" includes="**/cc1*" />
+    </chmod>
+
+    <replace file="macosx/work/Arduino.app/Contents/Info.plist"
+             token="VERSION" value="${version}" />
+    <replace file="macosx/work/Arduino.app/Contents/Info.plist"
+             token="REVISION" value="${revision}" />
+    
+    <exec executable="ditto" dir="macosx/work">
+      <arg line="-c -k -rsrc . ../arduino-${version}-macosx.zip" />
+    </exec>
+
+    <echo>
+      =======================================================
+      Arduino for Mac OS X was built. Grab the image from   
+      
+      macosx/arduino-${version}-macosx.zip
+      =======================================================
+    </echo>
+  </target>
+
+  <target name="macosx-dist-old" if="macosx" depends="macosx-build" description="Create a .dmg of the Mac OS X version">
     <!-- now build the dmg -->
     <gunzip src="macosx/template.dmg.gz" dest="macosx/working.dmg" />
     
@@ -270,7 +300,6 @@
       =======================================================
     </echo>
   </target>
-
   
   <!-- - - - - - - - -->
   <!-- Linux         -->
@@ -352,7 +381,7 @@
     <tar compression="gzip" basedir="linux/work" 
 	 destfile="linux/arduino-${version}.tgz" />
 -->
-    <tar compression="gzip" destfile="linux/arduino-${version}.tgz">
+    <tar compression="gzip" destfile="linux/arduino-${version}-linux.tgz">
       <tarfileset dir="linux/work" 
 		  prefix="arduino-${version}" 
 		  excludes="arduino, 
@@ -368,7 +397,7 @@
       =======================================================
       Arduino for Linux was built. Grab the archive from   
       
-      build/linux/arduino-${version}.tgz
+      build/linux/arduino-${version}-linux.tgz
       =======================================================
     </echo>
   </target>
@@ -477,12 +506,12 @@
 	 excludes="java/**" />
     -->
 
-    <zip destfile="windows/arduino-${version}.zip">
+    <zip destfile="windows/arduino-${version}-windows.zip">
       <zipfileset dir="windows/work" 
 		  prefix="arduino-${version}" />
     </zip>
 
-    <zip destfile="windows/arduino-${version}-expert.zip">
+    <zip destfile="windows/arduino-${version}-windows-expert.zip">
       <zipfileset dir="windows/work" 
 		  prefix="arduino-${version}" 
 		  excludes="java/**" />
@@ -492,8 +521,8 @@
       =======================================================
       Arduino for Windows was built. Grab the archive from   
       
-      windows/arduino-${version}.zip
-      windows/arduino-${version}-expert.zip
+      windows/arduino-${version}-windows.zip
+      windows/arduino-${version}-windows-expert.zip
       =======================================================
     </echo>
   </target>
diff --git a/build/macosx/template.app/Contents/Info.plist b/build/macosx/template.app/Contents/Info.plist
index 6fe5351f4..8ef724206 100755
--- a/build/macosx/template.app/Contents/Info.plist
+++ b/build/macosx/template.app/Contents/Info.plist
@@ -7,11 +7,11 @@
 
     <!-- all these need to change for new releases -->
     <key>CFBundleGetInfoString</key>
-    <string>1.0-rc2</string>
+    <string>VERSION</string>
     <key>CFBundleVersion</key>
-    <string>0100</string>
+    <string>REVISION</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0-rc2</string>
+    <string>VERSION</string>
     <!-- now stop changing things and get outta here -->
 
     <key>CFBundleAllowMixedLocalizations</key>