flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [18/36] git commit: [flex-asjs] [refs/heads/develop] - update LICENSE and add LICENSE.bin
Date Tue, 28 Jul 2015 18:40:44 GMT
update LICENSE and add LICENSE.bin


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/c204976d
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c204976d
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c204976d

Branch: refs/heads/develop
Commit: c204976d51c47f2412ed70efb135b1b2895e55ae
Parents: 4e6524c
Author: Alex Harui <aharui@apache.org>
Authored: Fri Jul 17 16:15:42 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Fri Jul 17 16:15:42 2015 -0700

----------------------------------------------------------------------
 LICENSE     | 12 ++++++++++++
 LICENSE.bin | 13 +++++++++++++
 build.xml   | 15 ++++++++++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c204976d/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index 6b0b127..e45744e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -201,3 +201,15 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 
+--------------------------------------------------------------------------------
+
+APACHE FLEXJS SUBCOMPONENTS:
+
+The Apache FlexJS SDK includes a number of subcomponents with
+separate copyright notices and license terms. Your use of the source
+code for the these subcomponents is subject to the terms and
+conditions of the following licenses. 
+
+Portions of frameworks/projects/HTML/src/defaults.css is based on
+designmodo’s (http://designmodo.com/flat-free/) Flat UI which is 
+available under an MIT license.  

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c204976d/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
new file mode 100644
index 0000000..95ea89f
--- /dev/null
+++ b/LICENSE.bin
@@ -0,0 +1,13 @@
+Below are the licenses for components included in the binary distribution.
+
+------------------------------------------------------------------------------------------
+
+frameworks/fonts/flat-ui-icons-regular.eot
+frameworks/fonts/flat-ui-icons-regular.ttf
+frameworks/fonts/flat-ui-icons-regular.svg
+frameworks/fonts/flat-ui-icons-regular.woff
+
+This product bundles designmodo’s (http://designmodo.com/flat-free/)
+Flat UI glyph fonts available under an MIT license. For details, see 
+
+frameworks/fonts/README.md

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/c204976d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index c324177..88098d7 100644
--- a/build.xml
+++ b/build.xml
@@ -511,6 +511,7 @@
                 <include name="READme"/>
                 <include name="RELEASE_NOTES"/>
                 <include name="LICENSE"/>
+                <include name="LICENSE.bin"/>
                 <include name="NOTICE"/>
             </fileset>
         </copy>
@@ -617,6 +618,7 @@
                 <exclude name="**/*.pbj"/>
                 <exclude name="**/*.swf"/>
                 <exclude name="**/*.mxp"/>
+                <exclude name="fonts/**"/>
                 <exclude name="test*/**"/>
                 <exclude name="js/VanillaSDK/**"/>
                 <exclude name="projects/air/**"/>
@@ -683,9 +685,9 @@
         <!-- these files are in addition to the remaining source files -->
         
         <!-- concat the license file with the binary license file for the 3rd party deps
-->
-        <!--concat destfile="${basedir}/temp/LICENSE">
-            <filelist dir="${FLEX_SDK_HOME}" files="LICENSE,LICENSE.bin"/>
-        </concat-->
+        <concat destfile="${basedir}/temp/LICENSE">
+            <filelist dir="${basedir}" files="LICENSE,LICENSE.bin"/>
+        </concat>
         
         <!-- frameworks/libs -->
         <copy todir="${basedir}/temp/frameworks/libs">
@@ -1217,6 +1219,12 @@
                 <include name="frameworks/locale/en_US/framework_rb.swc"/>
             </library-path>
         </mxmlc>
+        <mkdir dir="${basedir}/mustella/tests/basicTests/fonts" />
+        <copy todir="${basedir}/mustella/tests/basicTests/fonts" >
+            <fileset dir="${FLEX_HOME}/frameworks/fonts">
+                <include name="**/*.swf" />
+            </fileset>
+        </copy>
         <!-- compile supporting swfs for basic tests
         <mxmlc fork="true"
                file="${basedir}/frameworks/tests/basicTests/basicLoader.as">
@@ -1297,6 +1305,7 @@
              
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
             <fileset dir="${rat.dir}">
+                <exclude name="LICENSE.bin"/>
                 <!--          Start of binary files           -->
                 <!-- exclude media (png, gif, jpg, mp3, flv) -->
                 <exclude name="**/*.png"/>


Mime
View raw message