svn commit: r1352890 - in /incubator/flex/trunk: build.xml frameworks/downloads.xml

[cf...@apache.org]

Author: cframpton
Date: Fri Jun 22 13:43:52 2012
New Revision: 1352890

URL: http://svn.apache.org/viewvc?rev=1352890&view=rev
Log:
Fix staging of javascript source so it will build and fix awkward wording in Mozilla v1.1 acknowledgement text.

Modified:
    incubator/flex/trunk/build.xml
    incubator/flex/trunk/frameworks/downloads.xml

Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1352890&r1=1352889&r2=1352890&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Fri Jun 22 13:43:52 2012
@@ -578,12 +578,18 @@
         <!-- frameworks/javascript -->
         <copy todir="${basedir}/temp/frameworks/javascript" includeEmptyDirs="false">
             <fileset dir="${basedir}/frameworks/javascript">
-                <exclude name="**/swfobject.js"/>
+                <include name="build.xml"/>
+            </fileset>
+        </copy>
+
+        <copy todir="${basedir}/temp/frameworks/javascript" includeEmptyDirs="false">
+            <fileset dir="${basedir}/frameworks/javascript">
+                <exclude name="FABridge/**/swfobject.js"/>
                 <exclude name="FABridge/readme.txt"/>
             </fileset>
             <mapper type="glob" from="FABridge/*" to="fabridge/*" />            
         </copy>
-
+        
         <!-- frameworks/tests -->
         <antcall target="stage-frameworks-tests"/>
 
@@ -1503,6 +1509,8 @@
     <!--  which are missing the correct license headers -->
     <!-- You need to place apache-rat-tasks-0.8.jar and apache-rat-0.8.jar -->
     <!--  into your ant lib before running this target. -->
+
+    <!-- Run this tag by itself.  It will stage the source and then check it. -->
     <target name="rat-check" description="Report licenses in source kit">
     
         <!-- Stage the src kit files in the temp directory. -->

Modified: incubator/flex/trunk/frameworks/downloads.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/downloads.xml?rev=1352890&r1=1352889&r2=1352890&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/downloads.xml (original)
+++ incubator/flex/trunk/frameworks/downloads.xml Fri Jun 22 13:43:52 2012
@@ -64,11 +64,11 @@
     <target name="echo-mpl1.1-license">       
         <echo message="Mozilla Public License Version 1.1:
             ${line.separator}
-            ${line.separator}The contents of this file(s) are subject to the Mozilla Public License Version 1.1.
-            ${line.separator}You may not use this file(s) except in compliance with the License. 
+            ${line.separator}The contents of the file(s) are subject to the Mozilla Public License Version 1.1.
+            ${line.separator}You may not use the file(s) except in compliance with the License. 
             ${line.separator}You may obtain a copy of the License here:
             ${line.separator}    http://www.mozilla.org/MPL/. 
-            ${line.separator}By downloading, modifying, distributing, using and/or accessing this file(s), 
+            ${line.separator}By downloading, modifying, distributing, using and/or accessing the file(s), 
             ${line.separator}you agree to the terms and conditions of the applicable license agreement."/>
         
         <input