[fusion-commits] r1758 - trunk
svn_fusion at osgeo.org
svn_fusion at osgeo.org
Thu Jan 29 13:22:25 EST 2009
Author: chrisclaydon
Date: 2009-01-29 13:22:25 -0500 (Thu, 29 Jan 2009)
New Revision: 1758
Modified:
trunk/build.xml
Log:
re #206 - Fix problems with character encoding
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2009-01-29 18:21:25 UTC (rev 1757)
+++ trunk/build.xml 2009-01-29 18:22:25 UTC (rev 1758)
@@ -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 ======================== -->
<!--
@@ -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"/>
@@ -113,25 +113,25 @@
<echo message="Preparing uncompressed build"/>
<!-- Create build directories as needed -->
<mkdir dir="${build.home}"/>
-
+
<!-- first copy over the distributed version of the config file -->
<copy file="config_dist.json" tofile="${build.home}/config.json"/>
<!-- overwrite that with the customized config.json file if it exists
it is safe to ignore warnings issued by this step -->
<copy file="config.json" tofile="${build.home}/config.json" overwrite="true" failonerror="false"/>
-
+
<!-- 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/**"
/>
@@ -141,33 +141,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>
@@ -175,21 +175,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 ================================== -->
@@ -198,27 +198,27 @@
<copy file="${buildOutput}.js" todir="${basedir}/lib"/>
</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"
+ <concat destfile="${buildOutput}.js" encoding="UTF-8" outputencoding="UTF-8">
+ <filelist dir="${build.home}/lib"
files=" SingleFile.js
fusion.js
OpenLayers/OpenLayers.js
jxlib.uncompressed.js
- Error.js
+ Error.js
EventMgr.js
ApplicationDefinition.js
- MGBroker.js
- Widget.js
+ MGBroker.js
+ Widget.js
Search.js
Map.js"
/>
@@ -227,16 +227,16 @@
<fileset dir="${build.home}/lib/OpenLayers/Lang" includes="**/*.js"/>
<filelist dir="${build.home}" files="configHeader.json config.json"/>
</concat>
-
- <replace file="${buildOutput}.js" token="lib/fusion" value="lib/${sfName}"/>
+
+ <replace file="${buildOutput}.js" token="lib/fusion" value="lib/${sfName}" encoding="UTF-8"/>
</target>
<!-- =================== 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">
+ <concat destfile="${buildOutput}.js" encoding="UTF-8" outputencoding="UTF-8" append="true">
<fileset dir="${build.home}/widgets" includes="**/*.js"/>
<fileset dir="${build.home}/layers" includes="**/*.js" excludes="Layers.js MapGuide/MapGuideViewerApi.js"/>
</concat>
@@ -245,14 +245,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">
+ <concat destfile="${buildOutput}.js" encoding="UTF-8" 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>
@@ -265,20 +265,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">
+ <concat destfile="${cssOutput}.css" encoding="UTF-8" outputencoding="UTF-8">
<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"/>
@@ -288,13 +288,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">
+ <concat destfile="${cssOutput}.css" encoding="UTF-8" outputencoding="UTF-8">
<filelist files="${cssFiles}"/>
</concat>
-
+
<java jar="${YUIcompressor}" fork="true"
output="${cssOutput}-compressed.css">
<arg value="${cssOutput}.css"/>
@@ -329,7 +329,7 @@
-->
<target name="dist" description="Create binary distribution" depends="clean,docs,compress">
-
+
<echo message="Creating distribution archive"/>
<mkdir dir="${dist.home}"/>
@@ -337,15 +337,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