Update of /var/cvs/speeltuin/ernst/vpro-wizards
In directory james.mmbase.org:/tmp/cvs-serv9401/applications/vpro-wizards

Modified Files:
        build.xml 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/speeltuin/ernst/vpro-wizards


Index: build.xml
===================================================================
RCS file: /var/cvs/speeltuin/ernst/vpro-wizards/build.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- build.xml   11 Aug 2008 15:07:09 -0000      1.4
+++ build.xml   29 Sep 2008 12:52:18 -0000      1.5
@@ -14,12 +14,15 @@
 
   <!--** create the jar **-->
     <target name="jar" description="Create the vpro-wizards jar"
-        
depends="copy.resources,vpro-wizards.jars,project.manifest,buildbase.jar" />
+        depends="copy.resources,project.manifest,buildbase.jar" />
 
     <target name="init" depends="buildbase.init">
-        <available property="xerces.available"           
file="${project.build.dir}/${xerces.file.noversion}"/>
+        <available property="xerces.available"
+          file="${project.build.dir}/${xerces.file.noversion}"/>
     </target>
     
+    <target name="compile" depends="vpro-wizards.jars,buildbase.compile"/>
+    
     
     <!--copy all the resources to the classes dir, so they become part of the 
jar-->
     <target name="copy.resources" >
@@ -77,7 +80,7 @@
         </antcall>
         <copy file="${download.dir}/${nekohtml.file}" 
todir="${project.jar.dir}" preservelastmodified="true" />
 
-        <!--xerces: if not present yet. we rename this one, so we don't get 2 
versions when mmbase has one too. this is a hack :-(-->
+        ch
         <antcall target="download.xerces"/>
 
         <!--oscache-->
@@ -94,10 +97,8 @@
       <echo message="download xerces" />
       <antcall target="download">
           <param name="sourcefile" value="${xerces.loc}"/>
-          <param name="destfile" value="${download.dir}/${xerces.file}"/>
+          <param name="destfile" 
value="${download.dir}/${xerces.file.noversion}"/>
       </antcall>
-      <!--rename to generic name (no version)-->
-      <move file="${download.dir}/${xerces.file}" 
tofile="${download.dir}/${xerces.file.noversion}"/>
       <copy file="${download.dir}/${xerces.file.noversion}" 
todir="${project.jar.dir}" preservelastmodified="false" />
   </target>
 
@@ -105,6 +106,7 @@
   <target name="test" depends="init">
         <echo message="build.dir: ${build.dir}"/>
         <echo message="webapp.dir: ${webapp.dir}"/>
+        <echo message="download.dir: ${download.dir}"/>
         <echo message="templates.dir: ${templates.dir}"/>
         <echo message="templates.available: ${templates.available}"/>
         <echo message="project.templates.dir: ${project.templates.dir}"/>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to