[fusion-commits] r1573 - in trunk: . lib

svn_fusion at osgeo.org svn_fusion at osgeo.org
Mon Sep 29 21:17:07 EDT 2008


Author: pagameba
Date: 2008-09-29 21:17:07 -0400 (Mon, 29 Sep 2008)
New Revision: 1573

Modified:
   trunk/build.xml
   trunk/lib/fusion.js
Log:
update build to replace fusion lib name after concatenation, update error message related to finding fusion to include the script name it is looking for.

Modified: trunk/build.xml
===================================================================
--- trunk/build.xml	2008-09-30 00:51:45 UTC (rev 1572)
+++ trunk/build.xml	2008-09-30 01:17:07 UTC (rev 1573)
@@ -208,8 +208,7 @@
     
     <!-- 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-->
-    <replace file="${build.home}/lib/fusion.js" token="lib/fusion" value="lib/${sfName}"/>
-    
+     
     <!-- merge everything into a single file -->
     <concat destfile="${buildOutput}.js" outputencoding="UTF-8">
         <filelist dir="${build.home}/lib" 
@@ -231,6 +230,9 @@
         <fileset dir="${build.home}/text" includes="**/*.json"/>
         <filelist dir="${build.home}" files="configHeader.json config.json"/>
     </concat>
+    
+    <replace file="${buildOutput}.js" token="lib/fusion" value="lib/${sfName}"/>
+   
   </target>
 
 <!-- =================== concat all support files (no appdef supplied) ================================== -->

Modified: trunk/lib/fusion.js
===================================================================
--- trunk/lib/fusion.js	2008-09-30 00:51:45 UTC (rev 1572)
+++ trunk/lib/fusion.js	2008-09-30 01:17:07 UTC (rev 1573)
@@ -1062,7 +1062,7 @@
                 }
             }
             if (!this.fusionURL) {
-                alert('failed to determine fusionURL.  Initialization aborted');
+                alert('failed to determine fusionURL using script name '+Fusion._scriptName+'.  Initialization aborted');
                 return;
             }
             return Fusion.fusionURL;



More information about the fusion-commits mailing list