flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [4/5] git commit: [flex-falcon] [refs/heads/develop] - custom NOTICE for flex-compiler-oem
Date Tue, 10 Nov 2015 00:54:11 GMT
custom NOTICE for flex-compiler-oem


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

Branch: refs/heads/develop
Commit: 26e032ac70ed41a6190b989532f77607713d0160
Parents: f2585c3
Author: Alex Harui <aharui@apache.org>
Authored: Mon Nov 9 16:37:51 2015 -0800
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Nov 9 16:37:51 2015 -0800

----------------------------------------------------------------------
 NOTICE.oem                  | 13 +++++++++++++
 flex-compiler-oem/build.xml |  4 ++--
 2 files changed, 15 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/26e032ac/NOTICE.oem
----------------------------------------------------------------------
diff --git a/NOTICE.oem b/NOTICE.oem
new file mode 100644
index 0000000..41dc4cd
--- /dev/null
+++ b/NOTICE.oem
@@ -0,0 +1,13 @@
+Apache Flex Compiler
+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.
+
+The flex-compiler-oem compiler contains code written by Jeff Dyer at: 
+    Copyright Mountain View Compiler Company (1998-2003).
+

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/26e032ac/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index 8ec1fbe..f6a03c7 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -119,7 +119,7 @@
 
     <target name="compc.jar" depends="oem.jar,set.compc.jar.uptodate" unless="compc.jar.uptodate">
         <mkdir dir="${sdk}/lib"/>
-        <jar file="${sdk}/lib/compc.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
+        <jar file="${sdk}/lib/compc.jar" basedir="${oem}/bin" whenmanifestonly="create">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>
             <manifest>
@@ -148,7 +148,7 @@
         <mkdir dir="${sdk}/lib"/>
         <mkdir dir="${oem}/bin/META-INF"/>
         <copy file="${basedir}/../LICENSE.base" tofile="${oem}/bin/META-INF/LICENSE"/>
-        <copy file="${basedir}/../NOTICE.base" tofile="${oem}/bin/META-INF/NOTICE"/>
+        <copy file="${basedir}/../NOTICE.oem" tofile="${oem}/bin/META-INF/NOTICE"/>
         <jar file="${sdk}/lib/flex-compiler-oem.jar" basedir="${oem}/bin" includes="**/*.properties,**/*">
             <include name="META-INF/LICENSE"/>
             <include name="META-INF/NOTICE"/>


Mime
View raw message