[fusion-commits] r1670 - trunk

[svn_fusion at osgeo.org]

Author: madair
Date: 2008-11-18 15:45:38 -0500 (Tue, 18 Nov 2008)
New Revision: 1670

Modified:
   trunk/build.xml
Log:
re #140: update of build.xml to reflect new directory structure

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-11-17 21:33:23 UTC (rev 1669)
+++ trunk/build.xml	2008-11-18 20:45:38 UTC (rev 1670)
@@ -118,8 +118,7 @@
     <copy todir="${build.home}">
       <fileset dir="${basedir}" 
             includes="configHeader.json
-                      MapGuide/** 
-                      MapServer/** 
+                      layers/** 
                       common/** 
                       containerinfo/**
                       docs/** 
@@ -194,7 +193,7 @@
 
   
 <!-- =================== concat build ================================== -->
-  <target description="concatenate core files into a single file" name="concat" depends="clean,prepare">
+  <target description="concatenate core files into a single file" name="concat" depends="prepare">
     <echo message="concatenating core files"/>
     <delete dir="${buildOutput}.js"/>
     
@@ -234,7 +233,7 @@
     <!-- merge everything into a single file -->
     <concat destfile="${buildOutput}.js" outputencoding="UTF-8" append="true">
         <fileset dir="${build.home}/widgets" includes="**/*.js"/>
-        <filelist dir="${build.home}" files="MapGuide/MapGuide.js MapServer/MapServer.js"/>
+        <fileset dir="${build.home}" includes="layers/**"/>
     </concat>
   </target>
 
@@ -322,7 +321,7 @@
     dependencies) will have been assembled
 -->
 
-  <target name="dist" description="Create binary distribution" depends="docs,compress">
+  <target name="dist" description="Create binary distribution" depends="clean,docs,compress">
     
     <echo message="Creating distribution archive"/>
     <mkdir dir="${dist.home}"/>