flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erikdebr...@apache.org
Subject [04/13] git commit: [flex-sdk] [refs/heads/develop] - custom velocity NOTICE for Adobe fork
Date Sat, 03 Jan 2015 09:02:27 GMT
custom velocity NOTICE for Adobe fork


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

Branch: refs/heads/develop
Commit: 4b3740bd439a429eac4a5be5229f58280c82460a
Parents: 022d150
Author: Alex Harui <aharui@apache.org>
Authored: Sun Dec 28 08:13:55 2014 -0800
Committer: Erik de Bruin <erik@ixsoftware.nl>
Committed: Sat Jan 3 10:02:07 2015 +0100

----------------------------------------------------------------------
 modules/thirdparty/velocity/NOTICE          | 1 +
 modules/thirdparty/velocity/build/build.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b3740bd/modules/thirdparty/velocity/NOTICE
----------------------------------------------------------------------
diff --git a/modules/thirdparty/velocity/NOTICE b/modules/thirdparty/velocity/NOTICE
index 09e9ae4..482c54a 100644
--- a/modules/thirdparty/velocity/NOTICE
+++ b/modules/thirdparty/velocity/NOTICE
@@ -1,2 +1,3 @@
 This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
 
+Modifications to the source code were developed by Adobe Systems Inc.
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/4b3740bd/modules/thirdparty/velocity/build/build.xml
----------------------------------------------------------------------
diff --git a/modules/thirdparty/velocity/build/build.xml b/modules/thirdparty/velocity/build/build.xml
index 223e691..174e3b6 100644
--- a/modules/thirdparty/velocity/build/build.xml
+++ b/modules/thirdparty/velocity/build/build.xml
@@ -325,8 +325,8 @@
     <delete dir="${build.dest}/meta-inf" quiet="true"/>
     
     <mkdir dir="${build.dest}/META-INF"/>
-    <copy file="${FLEX_HOME}/LICENSE" todir="${build.dest}/META-INF"/>
-    <copy file="${FLEX_HOME}/NOTICE" todir="${build.dest}/META-INF"/>
+    <copy file="${basedir}/../LICENSE" todir="${build.dest}/META-INF"/>
+    <copy file="${basedir}/../NOTICE" todir="${build.dest}/META-INF"/>
 
     <jar jarfile="${FLEX_LIB}/velocity-dep-1.4-flex.jar">
       <fileset dir="${build.dest}">


Mime
View raw message