From 44305ad4037b1a8e7df32259a3da953f8a6cc3dd Mon Sep 17 00:00:00 2001
From: mguessan <mguessan@3d1905a2-6b24-0410-a738-b14d5a86fcbd>
Date: Wed, 5 Jun 2013 21:09:58 +0000
Subject: [PATCH] OSX: switch back to single archive and add a comment

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2133 3d1905a2-6b24-0410-a738-b14d5a86fcbd
---
 build.xml                     | 10 +---------
 src/site/xdoc/macosxsetup.xml |  9 ++++-----
 2 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/build.xml b/build.xml
index a039ccfc..4883948d 100644
--- a/build.xml
+++ b/build.xml
@@ -125,7 +125,7 @@
         <!-- Retina display support -->
         <replaceregexp file="dist/DavMail.app/Contents/Info.plist" match="&lt;key>CFBundleName&lt;/key>"
                        replace="&lt;key>NSHighResolutionCapable&lt;/key>&lt;true/>&lt;key>CFBundleName&lt;/key>"/>
-        <zip file="dist/DavMail.app.zip">
+        <zip file="dist/DavMail-MacOSX-${release-name}.app.zip" comment="In order to run DavMail on OSX Mountain Lion, you will need to disable Gatekeeper temporarily, see http://davmail.sourceforge.net/macosxsetup.html">
             <zipfileset dir="dist">
                 <include name="DavMail.app/**/*"/>
                 <exclude name="DavMail.app/Contents/MacOS/davmail"/>
@@ -134,14 +134,6 @@
                 <include name="DavMail.app/Contents/MacOS/davmail"/>
             </zipfileset>
         </zip>
-        <zip file="dist/DavMail-MacOSX-${release-name}.app.zip">
-            <zipfileset dir="dist">
-                <include name="DavMail.app.zip"/>
-            </zipfileset>
-            <zipfileset dir="src/osx">
-                <include name="readme.txt"/>
-            </zipfileset>
-        </zip>
         <!--delete dir="dist/DavMail.app"/-->
     </target>
 
diff --git a/src/site/xdoc/macosxsetup.xml b/src/site/xdoc/macosxsetup.xml
index 7109d5a6..8edfcef2 100644
--- a/src/site/xdoc/macosxsetup.xml
+++ b/src/site/xdoc/macosxsetup.xml
@@ -25,8 +25,10 @@
             <div style="width: 100%;text-align: center">
                 <img src="images/osxdownload.png" alt="OSX Download"/>
             </div>
-            <p>Safari should automatically extract the external archive. If not, just
-                double click on the zip file to trigger decompression.
+            <p>Safari should automatically extract application from archive. If not, just
+                double click on the zip file to trigger decompression. DavMail.app directory is then recognised as a
+                valid OSX application, except on Mountain Lion as application downloaded through Safari are marked
+                as invalid.
             </p>
             <p>On OSX Mountain Lion, open System Preferences and choose
                 Security and Privacy, then unlock panel with lock icon and choose Anywhere:
@@ -34,9 +36,6 @@
             <div style="width: 100%;text-align: center">
                 <img src="images/osxgatekeeper.png" alt="OSX Gatekeeper"/>
             </div>
-            <p>Uncompress DavMail.app.zip (Double click in Finder), DavMail.app directory is then recognised as a
-                valid OSX application.
-            </p>
             <p>Launch DavMail application once (double click on the application icon).</p>
             <p>You can then go back to System Preferences/Security and Privacy and restore original setting.
             </p>