From b17dd2bc6d9c034b89c89a4675578bbc2030d2dd Mon Sep 17 00:00:00 2001
From: Romain Kuntz <rkuntz@java.net>
Date: Tue, 28 Apr 2009 12:46:31 +0000
Subject: [PATCH] Removed references to the updatechecker bundle and
 versionupdate.properties file. Sparkle is now the only way to update a MacOSX
 package.

---
 resources/install/build.xml                   | 21 +++++--------------
 .../install/macosx/versionupdate.properties   |  2 --
 2 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 resources/install/macosx/versionupdate.properties

diff --git a/resources/install/build.xml b/resources/install/build.xml
index 28d0374cf..b1863bbf8 100644
--- a/resources/install/build.xml
+++ b/resources/install/build.xml
@@ -637,6 +637,10 @@
       <replace file="${macosx.resrc.dir}/felix.client.run.properties"
             token="org.osgi.framework.system.packages.extra="
             value="org.osgi.framework.system.packages.extra= com.growl;"/>
+      <!-- Remove the reference to the updatechecker bundle -->
+      <replace file="${macosx.resrc.dir}/felix.client.run.properties"
+               token="reference:file:sc-bundles/updatechecker.jar"
+               value=""/>
       <replaceregexp file="${macosx.resrc.dir}/felix.client.run.properties"
                 match="^org.osgi.framework.storage=\$\{user.home\}/.sip-communicator/sip-communicator.bin"
                 replace="org.osgi.framework.storage=$\{user.home\}/Library/Application Support/${application.name}/sip-communicator.bin"
@@ -711,14 +715,13 @@
             <include name="${bundles.dest}/*.jar" />
             <exclude name="${bundles.dest}/*-slick.jar" />
             <exclude name="${bundles.dest}/sparkle.jar" />
+            <exclude name="${bundles.dest}/updatechecker.jar" />
             <include name="resources/images/logo/sc_logo_128x128.icns" />
         </jarfileset>
         <javafilelist dir="${macosx.resrc.dir}"
                       files="logging.properties"/>
         <javafilelist dir="${macosx.resrc.dir}"
                       files="felix.client.run.properties"/>
-        <javafilelist dir="${macosx.resrc.dir}"
-                      files="versionupdate.properties"/>
       </jarbundler>
 
       <!-- Add the url types in the Info.plist file -->
@@ -752,13 +755,6 @@
             append="true">felix.auto.start.71= reference:file:sc-bundles/sparkle.jar
       </echo>
 
-      <!-- Remove the path to the updatechecker bundle in the felix.client.run.properties file -->
-      <replace file="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/felix.client.run.properties"
-               token="reference:file:sc-bundles/updatechecker.jar"
-               value=""/>
-      <delete file="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/sc-bundles/updatechecker.jar"
-              failonerror="false" />
-
       <!-- Add the Sparkle bundle and JNI to the application package -->
       <copy file="${bundles.dest}/sparkle.jar"
             todir="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/sc-bundles/"/>
@@ -797,13 +793,6 @@
             if="is.running.macos"
             description="Create a .dmg package for MACOSX (only works on MACOSX)">
 
-      <!--propertyfile file="${macosx.app.dir}/versionupdate.properties"
-            comment="Last Build Version">
-            <entry  key="last_version" value="${sip-communicator.version}"/>
-            <entry  key="download_link"
-                    value="http://download.sip-communicator.org/nightly/macosx/${package.name}-${sip-communicator.version}.dmg"/>
-      </propertyfile-->
-
       <property name="macosx.dmg.name"
                 value="${package.name}-${sip-communicator.version}.dmg"/>
       <property name="macosx.dmg.tmpname"
diff --git a/resources/install/macosx/versionupdate.properties b/resources/install/macosx/versionupdate.properties
deleted file mode 100644
index 0a44c8c3c..000000000
--- a/resources/install/macosx/versionupdate.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-# Check Update Link
-update_link=http://download.sip-communicator.org/nightly/macosx/versionupdate.properties
\ No newline at end of file