[fusion-commits] r2092 - trunk

[svn_fusion at osgeo.org]

Author: madair
Date: 2010-03-08 15:17:06 -0500 (Mon, 08 Mar 2010)
New Revision: 2092

Modified:
   trunk/BUILDING.TXT
   trunk/COPYING.TXT
   trunk/build.xml
Log:
closes #362: documentation updates

Modified: trunk/BUILDING.TXT
===================================================================
--- trunk/BUILDING.TXT	2010-03-05 05:15:16 UTC (rev 2091)
+++ trunk/BUILDING.TXT	2010-03-08 20:17:06 UTC (rev 2092)
@@ -16,10 +16,8 @@
 For some tasks, external executable files are used and must be available for 
 execution on the PATH environment variable.
 
-This script requires an HTDOCS environment variable be set to point to the
-document root directory of your web server.
+Targets available include:
 
-targets available include:
 prepare - creates a "build" subdirectory with all files required to be put on 
           the web server
 deploy  - places a copy of the build directory in the web server HTDOCS directory
@@ -42,11 +40,14 @@
 
 
 Properties that can be set (and their defaults) include:
-<property name="sfName"  value="${build.home}/lib/fusionSF"/>
-<property name="cssOutput"  value="${sfName}"/>
-<property name="cssFiles"  value=""/>
-<property name="appDef"  value=""/>
+  <property name="YUIcompressor"  value="${basedir}/utils/yuicompressor-2.3.6.jar"/>
+  <property name="sfName"  value="fusionSF"/>
+  <property name="buildOutput"  value="${build.home}/lib/${sfName}"/>
+  <property name="cssOutput"  value="${build.home}/lib/${sfName}"/>
+  <property name="cssFiles"  value=""/>
+  <property name="PHP" value="/usr/local/php5cgi/bin/php"/>
 
+
 These properties can be assigned a value when ant is invoked by using the
 -D command line option, e.g.:
 

Modified: trunk/COPYING.TXT
===================================================================
--- trunk/COPYING.TXT	2010-03-05 05:15:16 UTC (rev 2091)
+++ trunk/COPYING.TXT	2010-03-08 20:17:06 UTC (rev 2092)
@@ -1,14 +1,9 @@
 Fusion License
 
-Scriptaculous and prototype are third party libraries included in the jx
-directory and are distributed under their own licenses.  Please see 
-MIT-LICENSE in the Scriptaculous directory for more information.
+Mootools is a third party library included in the jx distribution and is 
+distributed under an MIT-style license.  Please see the jxlib.uncompressed.js
+file for more information.
 
-ExplorerCanvas is Copyright 2006 Google Inc. and is distributed under 
-the Apache License Version 2.0, January 2004.
-
-JavaScript Scalebar for MapServer (widgets/scalebar/) is Copyright (c) 2005 Tim Schaub of CommEn Space (http://www.commenspace.org) and is distributed under the LGPL license.
-
 This license applies to all files obtained with the fusion source that are not
 explicitly covered by a separate license.
 

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2010-03-05 05:15:16 UTC (rev 2091)
+++ trunk/build.xml	2010-03-08 20:17:06 UTC (rev 2092)
@@ -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"/>
@@ -155,8 +155,7 @@
         <arg value="-i ./"/>
         <arg value="-o html ./docs"/>
         <arg value="-p ./docs/NaturalDocs"/>
-        <arg value="-xi ./scriptaculous"/>
-        <arg value="-xi ./lib"/>
+         <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"/>