From 72513ea49385f62d2e0f8696924dd6f38ec93484 Mon Sep 17 00:00:00 2001
From: Romain Kuntz <rkuntz@java.net>
Date: Fri, 5 Jan 2007 03:15:08 +0000
Subject: [PATCH] Removed the version from the app name (but not from the DMG
 name). Logs for the MacOSX package are now stored in the .app.

---
 build.xml                                     | 19 +++++++++++++++----
 .../install/macosx/logging.properties.sed     |  1 +
 2 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 resources/install/macosx/logging.properties.sed

diff --git a/build.xml b/build.xml
index aacbcb4fa..77ae4cb21 100644
--- a/build.xml
+++ b/build.xml
@@ -331,6 +331,15 @@
                 trim="true"/>
       </condition>
 
+      <!-- Prepare the logging.properties file for macosx -->
+      <exec executable="/usr/bin/sed" 
+          dir="${basedir}"
+          input="${inst.resrc}/logging.properties"
+          output="${macosx.resrc.dir}/logging.properties">
+        <arg value="-f"/>
+        <arg value="${macosx.resrc.dir}/logging.properties.sed"/>
+      </exec>
+
       <!-- Prepare the felix.client.run.properties file for macosx -->
       <exec executable="/usr/bin/sed"
           dir="${basedir}"
@@ -341,12 +350,12 @@
       </exec>
 
       <!-- Delete the old .app if it exists -->
-      <delete dir="${macosx.app.dir}/${macosx.app.name}-${sip-communicator.version}.app"
+      <delete dir="${macosx.app.dir}/${macosx.app.name}.app"
               quiet="yes" failonerror="false"/>
 
       <!-- This creates the .app for MacOSX -->
       <jarbundler dir="${macosx.app.dir}"
-                  name="${macosx.app.name}-${sip-communicator.version}"
+                  name="${macosx.app.name}"
                   shortname="SIP Communicator"
                   signature="sipc"
                   mainclass="org.apache.felix.main.Main"
@@ -384,10 +393,12 @@
           <include name="${bundles.dest.macosx}/*.jar" />
           <exclude name="${bundles.dest}/*-slick.jar" />
         </jarfileset>
-        <javafilelist dir="${lib}" files="logging.properties"/>
+        <javafilelist dir="${macosx.resrc.dir}" 
+                      files="logging.properties"/>
         <javafilelist dir="${macosx.resrc.dir}"
                       files="felix.client.run.properties"/>
       </jarbundler>
+      <mkdir dir="${macosx.app.dir}/${macosx.app.name}.app/Contents/Resources/Java/log"/>
     </target>
 
     <!-- Create the DMG - This only works on MacOSX (need hdiutil) -->
@@ -400,7 +411,7 @@
       <exec executable="/usr/bin/hdiutil" os="Mac OS X">
         <arg value="create"/>
         <arg value="-srcfolder"/>
-        <arg value="${macosx.app.dir}/${macosx.app.name}-${sip-communicator.version}.app"/>
+        <arg value="${macosx.app.dir}/${macosx.app.name}.app"/>
         <arg value="-volname"/>
         <arg value="${macosx.app.name} ${sip-communicator.version}"/>
         <arg value="-ov"/>
diff --git a/resources/install/macosx/logging.properties.sed b/resources/install/macosx/logging.properties.sed
new file mode 100644
index 000000000..9ae5f9f5e
--- /dev/null
+++ b/resources/install/macosx/logging.properties.sed
@@ -0,0 +1 @@
+s/java.util.logging.FileHandler.pattern\ =\ %h\/.sip-communicator\/log/java.util.logging.FileHandler.pattern\ =\ log/
\ No newline at end of file