[Bedework-commit] contrib r15 - trunk/build

[svnadmin at bedework.org]

Author: douglm
Date: 2009-03-23 21:08:45 -0400 (Mon, 23 Mar 2009)
New Revision: 15

Modified:
   trunk/build/getJar.xml
Log:
Update 1:
Implement use of -offline parameter fro bw script so bedework can be built with flaky network.

Update 2:
Make SpecialFreeBusy a method of SysIntf and move some code out of  CalDavBwIntf into the SysIntf implementation. One more small step in making CalDAV independent of CalFacade.

Modified: trunk/build/getJar.xml
===================================================================
--- trunk/build/getJar.xml	2008-11-07 21:19:08 UTC (rev 14)
+++ trunk/build/getJar.xml	2009-03-24 01:08:45 UTC (rev 15)
@@ -109,18 +109,43 @@
         </then>
       </if>
 
+      <!-- if org.bedework.getjar.finished is true we found a local file,
+          otherwise we need to check the repository. -->
+
       <if>
         <equals arg1="${org.bedework.getjar.finished}" arg2="false" />
         <then>
-          <echo message="Fetch ${org.bedework.getjar.jarname} from archive" />
-          <get src="@{src}/${org.bedework.getjar.jarname}"
-               dest="@{libcache}/${org.bedework.getjar.jarname}"
-               ignoreerrors="true"
-               verbose="true"
-               usetimestamp="true"/>
+          <if>
+            <equals arg1="${org.bedework.offline.build}" arg2="yes" />
+            <then>
+              <echo message="Offline: skip check for ${org.bedework.getjar.jarname}" />
+            </then>
+            <else>
+              <!-- Not offline - check repository -->
+              <echo message="Fetch ${org.bedework.getjar.jarname} from archive" />
+              <get src="@{src}/${org.bedework.getjar.jarname}"
+                   dest="@{libcache}/${org.bedework.getjar.jarname}"
+                   ignoreerrors="true"
+                   verbose="true"
+                   usetimestamp="true"/>
+            </else>
+          </if>
 
-          <copy file="@{libcache}/${org.bedework.getjar.jarname}"
-                todir="@{lib}" overwrite="yes" />
+          <if>
+            <not>
+              <available file="@{libcache}/${org.bedework.getjar.jarname}" />
+            </not>
+            <then>
+              <echo message="******************************************************" />
+              <echo message="File ${org.bedework.getjar.jarname} is not available" />
+              <echo message="******************************************************" />
+            </then>
+            <else>
+              <copy file="@{libcache}/${org.bedework.getjar.jarname}"
+                    todir="@{lib}" overwrite="yes" />
+            </else>
+          </if>
+
         </then>
       </if>