[fusion-commits] r1913 - trunk

svn_fusion at osgeo.org svn_fusion at osgeo.org
Thu Sep 24 15:58:24 EDT 2009


Author: madair
Date: 2009-09-24 15:58:24 -0400 (Thu, 24 Sep 2009)
New Revision: 1913

Modified:
   trunk/build.xml
Log:
closes #255: add charset arg to YUI compressor

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2009-09-24 19:42:09 UTC (rev 1912)
+++ trunk/build.xml	2009-09-24 19:58:24 UTC (rev 1913)
@@ -185,7 +185,7 @@
     <xmlproperty file="${build.home}/appDefFileset.xml"/>
 
     <!-- convert the application definition file to JSON -->
-    <exec executable="php" os="Windows Vista, Windows XP"
+    <exec executable="C:\ms4w\Apache\cgi-bin\php.exe" os="Windows Vista, Windows XP"
               output="${build.home}/appDef.json">
         <arg line="common\php\Xml2JSON.php --file='${appDef}'"/>
     </exec>
@@ -262,6 +262,8 @@
     <echo message="compressing..."/>
     <java jar="${YUIcompressor}" fork="true"
           output="${buildOutput}-compressed.js">
+        <arg value="--charset"/>
+        <arg value="utf-8"/>
         <arg value="${buildOutput}.js"/>
     </java>
     <copy file="${buildOutput}-compressed.js" todir="${basedir}/lib"/>
@@ -281,6 +283,8 @@
 
     <java jar="${YUIcompressor}" fork="true"
           output="${cssOutput}-compressed.css">
+        <arg value="--charset"/>
+        <arg value="utf-8"/>
         <arg value="${cssOutput}.css"/>
     </java>
   </target>
@@ -297,6 +301,8 @@
 
     <java jar="${YUIcompressor}" fork="true"
           output="${cssOutput}-compressed.css">
+        <arg value="--charset"/>
+        <arg value="utf-8"/>
         <arg value="${cssOutput}.css"/>
     </java>
   </target>



More information about the fusion-commits mailing list