From fcba89ac946daa661e322ddbb2622b7407f1a48c Mon Sep 17 00:00:00 2001
From: Romain Kuntz <rkuntz@java.net>
Date: Mon, 29 Jan 2007 03:14:09 +0000
Subject: [PATCH] Removed dependencies to sed for the macosx package
 generation. Replaced with ant's "replace" and "echo" tasks.

---
 build.xml                                     | 29 ++++++++++---------
 .../macosx/felix.client.run.properties.sed    |  3 --
 .../install/macosx/logging.properties.sed     |  1 -
 3 files changed, 15 insertions(+), 18 deletions(-)
 delete mode 100644 resources/install/macosx/felix.client.run.properties.sed
 delete mode 100644 resources/install/macosx/logging.properties.sed

diff --git a/build.xml b/build.xml
index ae1ec8b57..124e6b1a0 100644
--- a/build.xml
+++ b/build.xml
@@ -354,22 +354,23 @@
       </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>
+      <copy file="${inst.resrc}/logging.properties"
+              tofile="${macosx.resrc.dir}/logging.properties"
+              overwrite="true"/>
+      <replace file="${macosx.resrc.dir}/logging.properties"
+            token="java.util.logging.FileHandler.pattern = %h/.sip-communicator/log" 
+            value="java.util.logging.FileHandler.pattern = log"/>
 
       <!-- Prepare the felix.client.run.properties file for macosx -->
-      <exec executable="/usr/bin/sed"
-          dir="${basedir}"
-          input="${lib}/felix.client.run.properties"
-          output="${macosx.resrc.dir}/felix.client.run.properties">
-        <arg value="-f"/>
-        <arg value="${macosx.resrc.dir}/felix.client.run.properties.sed"/>
-      </exec>
+      <copy file="${lib}/felix.client.run.properties"
+            tofile="${macosx.resrc.dir}/felix.client.run.properties"
+            overwrite="true"/>
+      <replace file="${macosx.resrc.dir}/felix.client.run.properties"
+            token="org.osgi.framework.system.packages=" 
+            value="org.osgi.framework.system.packages= com.growl;"/>
+      <echo file="${macosx.resrc.dir}/felix.client.run.properties" 
+            append="true">felix.auto.start.70= reference:file:sc-bundles/os-specific/macosx/growlnotification.jar
+      </echo>
 
       <!-- Delete the old .app if it exists -->
       <delete dir="${macosx.app.dir}/${macosx.app.name}.app"
diff --git a/resources/install/macosx/felix.client.run.properties.sed b/resources/install/macosx/felix.client.run.properties.sed
deleted file mode 100644
index 59416d415..000000000
--- a/resources/install/macosx/felix.client.run.properties.sed
+++ /dev/null
@@ -1,3 +0,0 @@
-s/org.osgi.framework.system.packages=/org.osgi.framework.system.packages=\ com.growl;/
-$a\
-felix.auto.start.70= reference:file:sc-bundles/os-specific/macosx/growlnotification.jar
diff --git a/resources/install/macosx/logging.properties.sed b/resources/install/macosx/logging.properties.sed
deleted file mode 100644
index 9ae5f9f5e..000000000
--- a/resources/install/macosx/logging.properties.sed
+++ /dev/null
@@ -1 +0,0 @@
-s/java.util.logging.FileHandler.pattern\ =\ %h\/.sip-communicator\/log/java.util.logging.FileHandler.pattern\ =\ log/
\ No newline at end of file