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/10 01:54:08 UTC
[1/5] git commit: [flex-falcon] [refs/heads/develop] - add
attribution for Jeff Dyer
Repository: flex-falcon
Updated Branches:
refs/heads/develop 026cada63 -> 2d59d436d
add attribution for Jeff Dyer
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/82a3ae36
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/82a3ae36
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/82a3ae36
Branch: refs/heads/develop
Commit: 82a3ae368e73ef6fc1b53543f99ed07131007078
Parents: 026cada
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 9 16:03:40 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 9 16:03:40 2015 -0800
----------------------------------------------------------------------
NOTICE | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/82a3ae36/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index e80c771..187472a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -7,3 +7,7 @@ The Apache Software Foundation (http://www.apache.org/).
The Initial Developer of the Original Code, known as Adobe ASC 2.0,
is Adobe Systems Incorporated (http://www.adobe.com/).
Copyright 2003 - 2012 Adobe Systems Incorporated. All Rights Reserved.
+
+The flex-compiler-oem compiler contain code written by Jeff Dyer at:
+ Copyright Mountain View Compiler Company (1998-2003).
+
[4/5] git commit: [flex-falcon] [refs/heads/develop] - custom NOTICE
for flex-compiler-oem
Posted by ah...@apache.org.
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 <ah...@apache.org>
Authored: Mon Nov 9 16:37:51 2015 -0800
Committer: Alex Harui <ah...@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"/>
[2/5] git commit: [flex-falcon] [refs/heads/develop] - use default
notice for falconjx packages
Posted by ah...@apache.org.
use default notice for falconjx packages
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/66ab35af
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/66ab35af
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/66ab35af
Branch: refs/heads/develop
Commit: 66ab35afd718cfe8d86e9805b8b84c3377c334ff
Parents: 82a3ae3
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 9 16:04:21 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 9 16:04:21 2015 -0800
----------------------------------------------------------------------
build.xml | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/66ab35af/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 7c8b77c..f854a2e 100644
--- a/build.xml
+++ b/build.xml
@@ -484,7 +484,6 @@
<target name="stage-source-jx"
description="Package jx source files with other falcon files required to build in zip file" >
- <copy tofile="${basedir}/temp/NOTICE" file="${basedir}/NOTICE.jx" overwrite="true" />
<copy tofile="${basedir}/temp/LICENSE" file="${basedir}/LICENSE.jx" overwrite="true"/>
<copy todir="${basedir}/temp" >
<fileset dir="${basedir}">
[3/5] git commit: [flex-falcon] [refs/heads/develop] - more tweaks to
NOTICE
Posted by ah...@apache.org.
more tweaks to NOTICE
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/f2585c30
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/f2585c30
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/f2585c30
Branch: refs/heads/develop
Commit: f2585c30d4d312a6cba4de74a2d4676a682b914a
Parents: 66ab35a
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 9 16:37:32 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 9 16:37:32 2015 -0800
----------------------------------------------------------------------
NOTICE | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/f2585c30/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 187472a..d301d27 100644
--- a/NOTICE
+++ b/NOTICE
@@ -4,10 +4,10 @@ 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 ASC 2.0,
-is Adobe Systems Incorporated (http://www.adobe.com/).
+The Initial Developer of the Original Code, known as Adobe Flex
+and Adobe ASC 2.0, is Adobe Systems Incorporated (http://www.adobe.com/).
Copyright 2003 - 2012 Adobe Systems Incorporated. All Rights Reserved.
-The flex-compiler-oem compiler contain code written by Jeff Dyer at:
+The flex-compiler-oem compiler contains code written by Jeff Dyer at:
Copyright Mountain View Compiler Company (1998-2003).
[5/5] git commit: [flex-falcon] [refs/heads/develop] - go back to
default falcon NOTICE for compc
Posted by ah...@apache.org.
go back to default falcon NOTICE for compc
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/2d59d436
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/2d59d436
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/2d59d436
Branch: refs/heads/develop
Commit: 2d59d436daaa579814d2d3096c5599b2b21e7f2b
Parents: 26e032a
Author: Alex Harui <ah...@apache.org>
Authored: Mon Nov 9 16:46:34 2015 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Nov 9 16:46:34 2015 -0800
----------------------------------------------------------------------
flex-compiler-oem/build.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/2d59d436/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index f6a03c7..ec3442d 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="${oem}/bin" whenmanifestonly="create">
+ <jar file="${sdk}/lib/compc.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
<include name="META-INF/LICENSE"/>
<include name="META-INF/NOTICE"/>
<manifest>