[fusion-commits] r1726 - branches/fusion2-mg21

svn_fusion at osgeo.org svn_fusion at osgeo.org
Thu Dec 18 18:29:31 EST 2008


Author: chrisclaydon
Date: 2008-12-18 18:29:31 -0500 (Thu, 18 Dec 2008)
New Revision: 1726

Modified:
   branches/fusion2-mg21/build.xml
Log:
Fixed accidentally reverted build number

Modified: branches/fusion2-mg21/build.xml
===================================================================
--- branches/fusion2-mg21/build.xml	2008-12-18 22:46:17 UTC (rev 1725)
+++ branches/fusion2-mg21/build.xml	2008-12-18 23:29:31 UTC (rev 1726)
@@ -43,7 +43,7 @@
 -->
   <property file="build.properties"/>
   <property file="${user.home}/build.properties"/>
-  <property file="default.properties"/>  	
+  <property file="default.properties"/>
 
 <!-- ==================== File and Directory Names ======================== -->
 <!--
@@ -74,7 +74,7 @@
   <property environment="env"/>
   <property name="app.name" value="fusion"/>
   <property name="app.path" value="/${app.name}"/>
-  <property name="app.version" value="1.1.x"/>
+  <property name="app.version" value="2.0.x"/>
   <property name="build.home" value="${basedir}/build"/>
   <property name="deploy.home" value="${basedir}/../${app.name}"/>
   <property name="dist.home" value="${basedir}/dist"/>
@@ -85,7 +85,7 @@
 
 <!--
   Use property values to define the locations of external libraries on which
-  your application will depend.  
+  your application will depend.
   -->
 
   <property name="YUIcompressor"  value="${basedir}/utils/yuicompressor-2.3.6.jar"/>
@@ -116,16 +116,16 @@
     <copy file="config_dist.json" tofile="${build.home}/config.json"/>
     <!-- Copy static content -->
     <copy todir="${build.home}">
-      <fileset dir="${basedir}" 
+      <fileset dir="${basedir}"
             includes="configHeader.json
-                      layers/** 
-                      common/** 
+                      layers/**
+                      common/**
                       containerinfo/**
-                      docs/** 
-                      ext/** 
-                      lib/** 
-                      templates/** 
-                      text/** 
+                      docs/**
+                      ext/**
+                      lib/**
+                      templates/**
+                      text/**
                       widgets/**"
             excludes="selenium/**"
        />
@@ -135,33 +135,33 @@
 <!-- ==================== Documentation =================================== -->
 
   <target description="Create documentation" name="docs" depends="prepare">
-  
+
     <delete dir="${build.home}/docs/NaturalDocs"/>
     <mkdir dir="${build.home}/docs"/>
     <mkdir dir="${build.home}/docs/NaturalDocs"/>
-    
+
     <echo message="Generating documentation"/>
     <exec executable="cmd" os="Windows Vista, Windows XP" dir="${build.home}">
-	<!--
+    <!--
         <arg value="/c"/>
-		<arg value="NaturalDocs.bat"/>
+        <arg value="NaturalDocs.bat"/>
         <arg value="-i ./"/>
         <arg value="-o html ./docs"/>
         <arg value="-p ./docs/NaturalDocs"/>
         <arg value="-xi ./scriptaculous"/>
         <arg value="-xi ./lib"/>
         <arg value="-r"/>
-		-->
+        -->
         <arg line="/c perl C:\Progra~1\NaturalDocs\NaturalDocs -i ./lib -i ./widgets -o html ./docs/NaturalDocs -p ./docs/NaturalDocs -r"/>
     </exec>
   </target>
-    
+
   <target description="Create documentation" name="widgetInfo" depends="prepare">
     <delete dir="${build.home}/docs/widgetinfo"/>
     <mkdir dir="${build.home}/docs/widgetinfo"/>
-    <xslt basedir="${basedir}/widgets/widgetinfo" 
+    <xslt basedir="${basedir}/widgets/widgetinfo"
           destdir="${build.home}/docs/widgetinfo"
-          style="${basedir}/widgets/widgetinfo/widgetInfo.xsl" 
+          style="${basedir}/widgets/widgetinfo/widgetInfo.xsl"
           excludes="WidgetInfoTemplate.xml widgetInfo.xsl"/>
   </target>
 
@@ -169,21 +169,21 @@
   <target description="convert AppDef to JSON" name="appDef2Json" if="appDef">
     <echo message="converting ${appDef} to JSON"/>
     <delete dir="${build.home}/appDefFileset.xml"/>
-    
+
     <!-- generate the list of files for this Application and load as a property -->
-    <xslt in="${appDef}" 
+    <xslt in="${appDef}"
           out="${build.home}/appDefFileset.xml"
           style="${basedir}/parseAppDef.xsl">
       <param name="buildHome" expression="${build.home}"/>
     </xslt>
     <xmlproperty file="${build.home}/appDefFileset.xml"/>
-    
+
     <!-- convert the application definition file to JSON -->
-    <exec executable="php" os="Windows Vista, Windows XP" 
+    <exec executable="php" os="Windows Vista, Windows XP"
               output="${build.home}/appDef.json">
         <arg line="common\php\Xml2JSON.php --file='${appDef}'"/>
     </exec>
-    
+
   </target>
 
 <!-- =================== single file build ================================== -->
@@ -191,30 +191,30 @@
     <echo message="preparing single file build"/>
   </target>
 
-  
+
 <!-- =================== concat build ================================== -->
   <target description="concatenate core files into a single file" name="concat" depends="prepare">
     <echo message="concatenating core files"/>
     <delete file="${buildOutput}.js"/>
-    
+
     <!-- Fusion looks for it's own script name to set paths for other widgets
         so replace the value to look for with the sfName used to create the file-->
-     
+
     <!-- merge everything into a single file -->
     <concat destfile="${buildOutput}.js" outputencoding="UTF-8">
-        <filelist dir="${build.home}/lib" 
+        <filelist dir="${build.home}/lib"
                   files=" SingleFile.js
                           fusion.js
                           OpenLayers/OpenLayers.js
                           jxlib.uncompressed.js
                           excanvas/excanvas.js
-                          Error.js 
+                          Error.js
                           EventMgr.js
                           ApplicationDefinition.js
-                          MGBroker.js 
-                          Widget.js 
-                          CanvasTool.js 
-                          RectTool.js 
+                          MGBroker.js
+                          Widget.js
+                          CanvasTool.js
+                          RectTool.js
                           Search.js
                           Map.js"
         />
@@ -222,7 +222,7 @@
         <filelist dir="${build.home}" files="configHeader.json config.json"/>
         <filelist dir="${build.home}/layers" files="Layers.js"/>
     </concat>
-    
+
     <replace file="${buildOutput}.js" token="lib/fusion" value="lib/${sfName}"/>
     <copy file="${buildOutput}.js" todir="${basedir}/lib"/>
   </target>
@@ -230,7 +230,7 @@
 <!-- =================== concat all support files (no appdef supplied) ================================== -->
   <target description="concatenate core files into a single file" name="concatNoAppDef" unless="appDef">
     <echo message="concatenating all widget and map layer files"/>
-    
+
     <!-- merge everything into a single file -->
     <concat destfile="${buildOutput}.js" outputencoding="UTF-8" append="true">
         <fileset dir="${build.home}/widgets" includes="**/*.js"/>
@@ -241,14 +241,14 @@
 <!-- =================== concat support files included in AppDef ================================== -->
   <target description="concatenate core files into a single file" name="concatWithAppDef" depends="appDef2Json" if="appDef">
     <echo message="preparing single file build for ${appDef}"/>
-    
+
     <!-- merge everything into a single file -->
     <concat destfile="${buildOutput}.js" outputencoding="UTF-8" append="true">
         <filelist dir="${build.home}" files="${AppDef.Maps}"/>
         <filelist dir="${build.home}" files="${AppDef.Widgets}"/>
         <filelist dir="${build.home}" files="appDef.json"/>
     </concat>
-    
+
   </target>
 
 
@@ -261,20 +261,20 @@
         <arg value="${buildOutput}.js"/>
     </java>
     <copy file="${buildOutput}-compressed.js" todir="${basedir}/lib"/>
-    
+
   </target>
 
 <!-- =================== concat all CSS files ================================== -->
   <target description="concatenate CSS files into a single file" name="concatCSS" depends="prepare">
     <echo message="concatenating all CSS files"/>
-    
+
     <!-- merge everything into a single file -->
     <echo message="merging with ${cssFiles}"/>
     <concat destfile="${cssOutput}.css">
         <filelist files="${cssFiles}"/>
         <fileset dir="${build.home}/widgets" includes="**/*.css" excludes="**/*scalebar*"/>
     </concat>
-    
+
     <java jar="${YUIcompressor}" fork="true"
           output="${cssOutput}-compressed.css">
         <arg value="${cssOutput}.css"/>
@@ -284,13 +284,13 @@
 <!-- =================== concat and compress a list of CSS files ================================== -->
   <target description="concatenate and compress CSS files into a single file" name="compressCSS" if="cssFiles">
     <echo message="concatenating all CSS files"/>
-    
+
     <!-- merge everything into a single file -->
     <echo message="merging ${cssFiles}"/>
     <concat destfile="${cssOutput}.css">
         <filelist files="${cssFiles}"/>
     </concat>
-    
+
     <java jar="${YUIcompressor}" fork="true"
           output="${cssOutput}-compressed.css">
         <arg value="${cssOutput}.css"/>
@@ -325,7 +325,7 @@
 -->
 
   <target name="dist" description="Create binary distribution" depends="clean,docs,compress">
-    
+
     <echo message="Creating distribution archive"/>
     <mkdir dir="${dist.home}"/>
 
@@ -333,15 +333,15 @@
     <zip destfile="${dist.home}/${app.name}-${app.version}.zip" update="true">
       <zipfileset dir="${build.home}" prefix="${app.name}"/>
     </zip>
-    
+
     <!-- create tar file -->
     <tar destfile="${dist.home}/${app.name}-${app.version}.tar">
       <tarfileset dir="${build.home}" prefix="${app.name}"/>
     </tar>
     <gzip src="${dist.home}/${app.name}-${app.version}.tar" destfile="${dist.home}/${app.name}-${app.version}.tar.gz"/>
-    
+
     <!--tar destfile=""/-->
-    
+
   </target>
 
 <!-- ==================== Clean Target ==================================== -->



More information about the fusion-commits mailing list