[Bedework-commit] calendarapi r732 - in trunk: . annotations apiutil build calCore calCoreI calEnv calsvc calsvci client icalendar logging mail

svnadmin at bedework.org svnadmin at bedework.org
Fri Nov 7 17:11:11 EST 2008


Author: douglm
Date: 2008-11-07 17:11:10 -0500 (Fri, 07 Nov 2008)
New Revision: 732

Modified:
   trunk/annotations/build.xml
   trunk/apiutil/build.xml
   trunk/build.xml
   trunk/build/buildjar.xml
   trunk/calCore/build.xml
   trunk/calCoreI/build.xml
   trunk/calEnv/build.xml
   trunk/calsvc/build.xml
   trunk/calsvci/build.xml
   trunk/client/build.xml
   trunk/icalendar/build.xml
   trunk/logging/build.xml
   trunk/mail/build.xml
Log:
Fix the build

Modified: trunk/annotations/build.xml
===================================================================
--- trunk/annotations/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/annotations/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -12,6 +12,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/apiutil/build.xml
===================================================================
--- trunk/apiutil/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/apiutil/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -12,6 +12,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/build/buildjar.xml
===================================================================
--- trunk/build/buildjar.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/build/buildjar.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -58,7 +58,6 @@
 
     <!-- default to empty -->
     <fileset id="buildjar.resource.files" refid="empty.fileset" />
-    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
 
     <property name="jar.dest.dir" location="${dist.home}" />
 
@@ -79,7 +78,6 @@
     <uptodate property="build.jar.uptodate"
               targetfile="${build.jar.file}" >
       <srcfiles refid="buildjar.java.sources" />
-      <srcfiles refid="buildjar.generated.java.sources" />
       <srcfiles refid="buildjar.resource.files"/>
       <!-- change this to a fileset
       <srcfiles refid="compile.classpath" />
@@ -116,7 +114,7 @@
         <mkdir dir="${jar.temp.sources}" />
         <copy toDir="${jar.temp.sources}">
           <fileset refid="buildjar.java.sources" />
-          <fileset refid="buildjar.generated.java.sources" />
+          <fileset refid="buildjar.generated.java.sources" />
           <fileset refid="buildjar.resource.files"/>
         </copy>
 

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -76,7 +76,6 @@
              excludes="*" />
     <!-- default to empty -->
     <fileset id="buildjar.resource.files" refid="empty.fileset" />
-    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
 
     <property name="annotations.jar"
               location="${dist.home}/${org.bedework.annotations.jar}-${project.version}.jar" />

Modified: trunk/calCore/build.xml
===================================================================
--- trunk/calCore/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/calCore/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -22,6 +22,7 @@
   <target name="init">
     <dirname property="calcorehib.dir" file="${ant.file}"/>
     <property name="source.home" location="${calcorehib.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/calCoreI/build.xml
===================================================================
--- trunk/calCoreI/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/calCoreI/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -11,6 +11,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/calEnv/build.xml
===================================================================
--- trunk/calEnv/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/calEnv/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -11,6 +11,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/calsvc/build.xml
===================================================================
--- trunk/calsvc/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/calsvc/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -11,6 +11,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/calsvci/build.xml
===================================================================
--- trunk/calsvci/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/calsvci/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -11,6 +11,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/client/build.xml
===================================================================
--- trunk/client/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/client/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -13,6 +13,7 @@
 
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <!-- ========================== Base build Targets ===================

Modified: trunk/icalendar/build.xml
===================================================================
--- trunk/icalendar/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/icalendar/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -12,6 +12,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/logging/build.xml
===================================================================
--- trunk/logging/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/logging/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -12,6 +12,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"

Modified: trunk/mail/build.xml
===================================================================
--- trunk/mail/build.xml	2008-11-07 21:19:03 UTC (rev 731)
+++ trunk/mail/build.xml	2008-11-07 22:11:10 UTC (rev 732)
@@ -12,6 +12,7 @@
   <target name="init">
     <dirname property="this.dir" file="${ant.file}"/>
     <property name="source.home" location="${this.dir}/src"/>
+    <fileset id="buildjar.generated.java.sources" refid="empty.fileset" />
   </target>
 
   <target name="build" depends="init"



More information about the Bedework-commit mailing list