You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2015/11/11 08:16:28 UTC
[3/3] git commit: [flex-falcon] [refs/heads/develop] - switch fdb to
its own NOTICE since swfutils notice says 'swfutils' in it
switch fdb to its own NOTICE since swfutils notice says 'swfutils' in it
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/cc85f503
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/cc85f503
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/cc85f503
Branch: refs/heads/develop
Commit: cc85f5032cd29042092b5f78fb4b28bef86b6e30
Parents: c91e992
Author: Alex Harui <ah...@apache.org>
Authored: Tue Nov 10 22:37:47 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Nov 10 22:37:47 2015 -0800
----------------------------------------------------------------------
ApproveFalcon.xml | 4 ++++
NOTICE.fdb | 9 +++++++++
build.xml | 2 ++
debugger/build.xml | 2 +-
4 files changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cc85f503/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index 788b158..f7c9122 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -301,6 +301,8 @@
<exclude name="NOTICE.jx"/>
<exclude name="README_JX"/>
<exclude name="NOTICE.base"/>
+ <exclude name="NOTICE.fdb"/>
+ <exclude name="NOTICE.oem"/>
<exclude name="NOTICE.swfutils"/>
</fileset>
</rat:report>
@@ -367,6 +369,8 @@
<exclude name="NOTICE.jx"/>
<exclude name="README_JX"/>
<exclude name="NOTICE.base"/>
+ <exclude name="NOTICE.fdb"/>
+ <exclude name="NOTICE.oem"/>
<exclude name="NOTICE.swfutils"/>
<exclude name="externs/js/externs/svg.js" />
<exclude name="js/libs/GCL.swc"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cc85f503/NOTICE.fdb
----------------------------------------------------------------------
diff --git a/NOTICE.fdb b/NOTICE.fdb
new file mode 100644
index 0000000..943d598
--- /dev/null
+++ b/NOTICE.fdb
@@ -0,0 +1,9 @@
+Apache Flex Debugger
+Copyright 2012-2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+The Initial Developer of the Original Code, known as Adobe Flex, is Adobe
+Systems Incorporated (http://www.adobe.com/).
+ Copyright 2003 - 2012 Adobe Systems Incorporated. All Rights Reserved.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cc85f503/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index ac9159c..b26600e 100644
--- a/build.xml
+++ b/build.xml
@@ -333,6 +333,7 @@
<include name="LICENSE.base"/>
<include name="NOTICE"/>
<include name="NOTICE.base"/>
+ <include name="NOTICE.fdb"/>
<include name="NOTICE.oem"/>
<include name="NOTICE.swfutils"/>
<include name="RELEASE_NOTES"/>
@@ -921,6 +922,7 @@
<exclude name="RELEASE_NOTES_JX"/>
<exclude name="NOTICE.jx"/>
<exclude name="NOTICE.base"/>
+ <include name="NOTICE.fdb"/>
<exclude name="NOTICE.oem"/>
<exclude name="NOTICE.swfutils"/>
</fileset>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/cc85f503/debugger/build.xml
----------------------------------------------------------------------
diff --git a/debugger/build.xml b/debugger/build.xml
index ea1ac4a..2537d63 100644
--- a/debugger/build.xml
+++ b/debugger/build.xml
@@ -31,7 +31,7 @@
<mkdir dir="${dist}" />
<mkdir dir="${basedir}/swfutils/classes/META-INF"/>
<copy file="${basedir}/../LICENSE.base" tofile="${basedir.bin}/META-INF/LICENSE"/>
- <copy file="${basedir}/../NOTICE.swfutils" tofile="${basedir.bin}/META-INF/NOTICE"/>
+ <copy file="${basedir}/../NOTICE.fdb" tofile="${basedir.bin}/META-INF/NOTICE"/>
<jar destfile="${dist}/${jar}" basedir="${basedir.bin}" includes="**/*.class **/*.properties **/*.txt">
<include name="META-INF/LICENSE"/>
<include name="META-INF/NOTICE"/>