Makes sure that a delete of the mac symlinks is only attempted if at least one (the first) of the exists in order to avoid warrnings on every rebuild

resources/install/build.xml

@@ -606,28 +606,32 @@
 
     <!-- - - - - - - - - - - BUILDING RELEASE PACKAGES - - - - - - - - - - - -->
     <!-- Internal target called by the "clean target" - removes the macosx-specific file -->
-    <target name="clean-macosx" if="is.running.macos">
+    <!-- we only execute if at least one (in this case the first) of the links we are
+         deleting exist as otherwise we see a bunch of warnings on every compile. -->
+    <available file="${macosx.resrc.dir}/logging.properties" property="macResourcesExist"/>
+    <target name="clean-macosx" if="macResourcesExist">
+
         <delete failonerror="false" file="${macosx.resrc.dir}/logging.properties"/>
         <delete failonerror="false" file="${macosx.resrc.dir}/felix.client.run.properties"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.jnilib"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Growl.framework/Headers"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Growl.framework/Resources"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Growl.framework/Growl"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Growl.framework/Versions/Current"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Headers"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Resources/fr_CA.lproj"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Resources"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Sparkle"/>
-        <symlink action="delete" failonerror="false" 
+        <symlink action="delete" failonerror="false"
                  link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Versions/Current"/>
     </target>
 
@@ -767,7 +771,7 @@
       <symlink link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Growl.framework/Resources"
                resource="./Versions/Current/Resources"/>
       <symlink link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Growl.framework/Growl"
-               resource="./Versions/Current/Growl"/>   
+               resource="./Versions/Current/Growl"/>
 
       <!-- Add the url types in the Info.plist file -->
       <replace file="${macosx.app.dir}/${application.name}.app/Contents/Info.plist">
@@ -785,7 +789,7 @@
       </array>
       <key>CFBundleName</key>]]></replacevalue>
       </replace>
-      <symlink resource="lib/native/mac/libAEGetURLEventHandlerAgent.jnilib" 
+      <symlink resource="lib/native/mac/libAEGetURLEventHandlerAgent.jnilib"
                link="${macosx.app.dir}/${application.name}.app/Contents/Resources/Java/libAEGetURLEventHandlerAgent.jnilib"/>
     </target>
 
@@ -842,10 +846,10 @@
             resource="./Versions/Current/Sparkle"/>
       <symlink link="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Resources/fr_CA.lproj"
             resource="./fr.lproj"/>
-    
+
       <!-- Restore the file permissions to the Sparke relaunch tool -->
-      <chmod file="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Resources/relaunch" 
-      	     perm="ugo+rx">
+      <chmod file="${macosx.app.dir}/${application.name}.app/Contents/Frameworks/Sparkle.framework/Resources/relaunch"
+               perm="ugo+rx">
       </chmod>
     </target>