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/04/25 00:25:28 UTC
[3/3] git commit: [flex-falcon] [refs/heads/develop] - bundle
swfutils and add L & N to jars
bundle swfutils and add L & N to jars
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/124d2299
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/124d2299
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/124d2299
Branch: refs/heads/develop
Commit: 124d2299f9e2ef54dbfd2aa395dc8291d176ea2b
Parents: 6f27837
Author: Alex Harui <ah...@apache.org>
Authored: Fri Apr 24 15:25:07 2015 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Fri Apr 24 15:25:07 2015 -0700
----------------------------------------------------------------------
ApproveFalcon.xml | 2 +
LICENSE.base | 203 +++++++++++++++++++++++++++++++++++++++
NOTICE.base | 9 ++
build.xml | 78 ++++++++++++++-
compiler.jx/build.xml | 14 ++-
compiler/build.xml | 28 ++++--
flex-compiler-oem/build.xml | 4 +-
7 files changed, 325 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/124d2299/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index 1632222..ff8d4d0 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -258,9 +258,11 @@
<exclude name="**/*.jpg"/>
<exclude name="**/*.mp3"/>
<exclude name="**/*.flv"/>
+ <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
<exclude name="RELEASE_NOTES_JX"/>
<exclude name="NOTICE_JX"/>
<exclude name="README_JX"/>
+ <exclude name="NOTICE.BASE"/>
</fileset>
</rat:report>
<antcall target="display-text" >
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/124d2299/LICENSE.base
----------------------------------------------------------------------
diff --git a/LICENSE.base b/LICENSE.base
new file mode 100644
index 0000000..6b0b127
--- /dev/null
+++ b/LICENSE.base
@@ -0,0 +1,203 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/124d2299/NOTICE.base
----------------------------------------------------------------------
diff --git a/NOTICE.base b/NOTICE.base
new file mode 100644
index 0000000..8b91f51
--- /dev/null
+++ b/NOTICE.base
@@ -0,0 +1,9 @@
+Apache Flex
+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/124d2299/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 3851d8b..bdbbabb 100644
--- a/build.xml
+++ b/build.xml
@@ -72,7 +72,7 @@
<target name="jx" depends="compiler.jx, compiler.jx.tests" description="Builds FalconJX" />
- <target name="oem" depends="compiler.oem" description="Builds FB Integration JAR" />
+ <target name="oem" depends="check-flex-home, compiler.oem" description="Builds FB Integration JAR" />
<target name="compiler.binary.release" >
<ant dir="compiler" target="release-binaries" />
@@ -82,10 +82,63 @@
<ant dir="compiler.tests" target="main"/>
</target>
- <target name="compiler.oem" description="Builds FB Integration JAR">
+ <target name="compiler.oem" depends="swfutils" description="Builds FB Integration JAR">
<ant dir="flex-compiler-oem" target="main"/>
</target>
+ <target name="swfutils" depends="swfutils_check" unless="swfutils.bundled"
+ description="Cppies a subset of files from swfutils.jar into the swfutils folder so flex-compiler-oem can use them">
+ <mkdir dir="swfutils" />
+ <mkdir dir="swfutils/src" />
+ <copy todir="swfutils/src" >
+ <fileset dir="${FLEX_SDK_HOME}/modules/swfutils/src">
+ <include name="java/flash/swf/Movie.java"/>
+ <include name="java/flash/swf/actions/**"/>
+ <include name="java/flash/swf/Action.java"/>
+ <include name="java/flash/swf/ActionConstants.java"/>
+ <include name="java/flash/swf/ActionFactory.java"/>
+ <include name="java/flash/swf/ActionHandler.java"/>
+ <include name="java/flash/swf/CompressionLevel.java"/>
+ <include name="java/flash/swf/debug/**"/>
+ <include name="java/flash/swf/DebugHandler.java"/>
+ <include name="java/flash/swf/DebugTags.java"/>
+ <include name="java/flash/swf/Dictionary.java"/>
+ <include name="java/flash/swf/Frame.java"/>
+ <include name="java/flash/swf/Header.java"/>
+ <include name="java/flash/swf/RandomAccessBuffer.java"/>
+ <include name="java/flash/swf/SwfEncoder.java"/>
+ <include name="java/flash/swf/Tag.java"/>
+ <include name="java/flash/swf/TagHandler.java"/>
+ <include name="java/flash/swf/TagValues.java"/>
+ <include name="java/flash/swf/tags/**"/>
+<!-- <include name="java/flash/swf/tags/EnableDebugger.java"/>
+ <include name="java/flash/swf/tags/DefineShape.java"/>
+ <include name="java/flash/swf/tags/DefineTag.java"/>
+ <include name="java/flash/swf/tags/GenericTag.java"/>
+ <include name="java/flash/swf/tags/ScriptLimits.java"/>
+ <include name="java/flash/swf/tags/SetBackgroundColor.java"/>
+ <include name="java/flash/swf/tags/ShowFrame.java"/>
+ <include name="java/flash/swf/tags/FileAttributes.java"/>
+ <include name="java/flash/swf/tags/EnableTelemetry.java"/>
+ <include name="java/flash/swf/tags/ProductInfo.java"/>
+ <include name="java/flash/swf/tags/Metadata.java"/>
+ <include name="java/flash/swf/tags/DefineSceneAndFrameLabelData.java"/>
+ <include name="java/flash/swf/types/FlashUUID.java"/>
+ <include name="java/flash/swf/types/Rect.java"/>
+ -->
+ <include name="java/flash/swf/types/**"/>
+ <include name="java/flash/util/IntMap.java"/>
+ </fileset>
+ </copy>
+ </target>
+
+ <target name="swfutils_check" description="determine if we have bundled swfutils source">
+ <available file="swfutils"
+ type="dir"
+ property="swfutils.bundled"
+ value="true" />
+ </target>
+
<target name="compiler.jx" description="Builds FalconJX.">
<ant dir="compiler.jx" target="main"/>
</target>
@@ -216,7 +269,9 @@
<include name="env-template.properties"/>
<include name="README"/>
<include name="LICENSE"/>
+ <include name="LICENSE.base"/>
<include name="NOTICE"/>
+ <include name="NOTICE.base"/>
<include name="RELEASE_NOTES"/>
<include name="installer.xml"/>
<include name="installer.properties/**"/>
@@ -299,6 +354,21 @@
<exclude name="bin/**"/>
</fileset>
</copy>
+ <mkdir dir="${basedir}/temp/swfutils" />
+ <copy todir="${basedir}/temp/swfutils" includeEmptyDirs="false">
+ <fileset dir="${basedir}/swfutils">
+ <include name="**"/>
+ <exclude name=".classpath" />
+ <exclude name=".project" />
+ <exclude name=".settings/**" />
+ <exclude name="unittest.properties" />
+ <exclude name="classes/**"/>
+ <exclude name="lib/**"/>
+ <exclude name="results/**"/>
+ <exclude name="temp/**"/>
+ <exclude name="test/classes/**"/>
+ </fileset>
+ </copy>
</target>
<target name="stage-compiler.tests">
@@ -352,7 +422,7 @@
<exclude name="temp/**"/>
</fileset>
</copy>
-
+
<!--
Source files have Windows line endings. Most UNIX editors can handle
either type of line endings but the converse is often not true.
@@ -580,9 +650,11 @@
<exclude name="**/*.jpg"/>
<exclude name="**/*.mp3"/>
<exclude name="**/*.flv"/>
+ <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
<exclude name="README_JX"/>
<exclude name="RELEASE_NOTES_JX"/>
<exclude name="NOTICE_JX"/>
+ <exclude name="NOTICE.base"/>
</fileset>
</rat:report>
</target>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/124d2299/compiler.jx/build.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/build.xml b/compiler.jx/build.xml
index 82ccde8..13deeff 100644
--- a/compiler.jx/build.xml
+++ b/compiler.jx/build.xml
@@ -83,6 +83,7 @@
<target name="prebuild">
<mkdir dir="${classes.dir}" />
+ <mkdir dir="${classes.dir}/META-INF" />
<mkdir dir="${lib}/google/closure-compiler" />
<ant antfile="${basedir}/downloads.xml" dir="${basedir}" />
</target>
@@ -91,17 +92,24 @@
<property name="jar.classpath" value="commons-io.jar ../../lib/external/guava.jar ../../lib/external/antlr.jar ../../lib/external/flex-tool-api.jar google/closure-compiler/compiler.jar ../../compiler/generated/dist/sdk/lib/compiler.jar ../../lib/compiler.jar" />
+ <copy file="${basedir}/../LICENSE.base" tofile="${classes.dir}/META-INF/LICENSE"/>
+ <copy file="${basedir}/../NOTICE.base" tofile="${classes.dir}/META-INF/NOTICE"/>
+
<echo message="Building ${jsc.jar}" />
<jar file="${jsc.jar}" basedir="${classes.dir}"
includes="**/*.properties,org/apache/**/*,com/google/**/*,META-INF/**/*"
excludes="**/JSDriver*,**/IASNodeAdapter*,org/apache/flex/compiler/internal/parsing/abc/*" >
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Class-Path" value="${jar.classpath}" />
</manifest>
</jar>
<echo message="Building ${mxmlc.jar}" />
- <jar file="${mxmlc.jar}" >
+ <jar file="${mxmlc.jar}" basedir="${classes.dir}">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Main-Class" value="org.apache.flex.compiler.clients.MXMLJSC" />
<attribute name="Class-Path" value="args4j.jar org.json.jar jsc.jar" />
@@ -109,7 +117,9 @@
</jar>
<echo message="Building ${compc.jar}" />
- <jar file="${compc.jar}" >
+ <jar file="${compc.jar}" basedir="${classes.dir}">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Main-Class" value="org.apache.flex.compiler.clients.COMPJSC" />
<attribute name="Class-Path" value="jsc.jar" />
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/124d2299/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index ad5c132..f77801f 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -602,7 +602,11 @@
<target name="compiler.jar" depends="compile, localization, version-info, set.compiler.jar.uptodate" unless="compiler.jar.uptodate"
description="Builds compiler.jar">
<mkdir dir="${sdk}/lib"/>
+ <copy file="${basedir}/../LICENSE.base" tofile="${compiler}/generated/classes/META-INF/LICENSE"/>
+ <copy file="${basedir}/../NOTICE.base" tofile="${compiler}/generated/classes/META-INF/NOTICE"/>
<jar file="${sdk}/lib/compiler.jar" basedir="${compiler}/generated/classes" includes="**/*.properties,org/apache/**/*,META-INF/**/*" excludes="${compiler.ant.binaries},${compiler.font.binaries}">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
@@ -626,7 +630,9 @@
<target name="falcon.asc.jar" depends="compiler.jar, set.falcon.asc.jar.uptodate" unless="falcon.asc.jar.uptodate">
<mkdir dir="${sdk}/lib"/>
- <jar file="${sdk}/lib/falcon-asc.jar" whenmanifestonly="create">
+ <jar file="${sdk}/lib/falcon-asc.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - ASC Command Line Compiler"/>
@@ -650,7 +656,9 @@
<target name="falcon.mxmlc.jar" depends="compiler.jar, set.falcon.mxmlc.jar.uptodate" unless="falcon.mxmlc.jar.uptodate">
<mkdir dir="${sdk}/lib"/>
- <jar file="${sdk}/lib/falcon-mxmlc.jar" whenmanifestonly="create">
+ <jar file="${sdk}/lib/falcon-mxmlc.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - MXMLC Command Line Compiler"/>
@@ -674,7 +682,9 @@
<target name="falcon.compc.jar" depends="compiler.jar, set.falcon.compc.jar.uptodate" unless="falcon.compc.jar.uptodate">
<mkdir dir="${sdk}/lib"/>
- <jar file="${sdk}/lib/falcon-compc.jar" whenmanifestonly="create">
+ <jar file="${sdk}/lib/falcon-compc.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - COMPC Command Line Compiler"/>
@@ -698,7 +708,9 @@
<target name="falcon.optimizer.jar" depends="compiler.jar, set.falcon.optimizer.jar.uptodate" unless="falcon.optimizer.jar.uptodate">
<mkdir dir="${sdk}/lib"/>
- <jar file="${sdk}/lib/falcon-optimizer.jar" whenmanifestonly="create">
+ <jar file="${sdk}/lib/falcon-optimizer.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - Apache SWF Optimizer"/>
@@ -722,7 +734,9 @@
<target name="falcon.swfdump.jar" depends="compiler.jar, set.falcon.swfdump.jar.uptodate" unless="falcon.swfdump.jar.uptodate">
<mkdir dir="${sdk}/lib"/>
- <jar file="${sdk}/lib/falcon-swfdump.jar" whenmanifestonly="create">
+ <jar file="${sdk}/lib/falcon-swfdump.jar" basedir="${compiler}/generated/classes" whenmanifestonly="create">
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - SWF Dump Command Line utility"/>
@@ -746,7 +760,9 @@
<target name="falcon.flextasks.jar" depends="compiler.jar, set.falcon.flextasks.jar.uptodate" unless="falcon.flextasks.jar.uptodate">
<mkdir dir="${sdk}/lib"/>
- <jar file="${sdk}/lib/falcon-flexTasks.jar">
+ <jar file="${sdk}/lib/falcon-flexTasks.jar" basedir="${compiler}/generated/classes" >
+ <include name="META-INF/LICENSE"/>
+ <include name="META-INF/NOTICE"/>
<manifest>
<attribute name="Sealed" value="${manifest.sealed}"/>
<attribute name="Implementation-Title" value="${manifest.Implementation-Title} - ant Tasks"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/124d2299/flex-compiler-oem/build.xml
----------------------------------------------------------------------
diff --git a/flex-compiler-oem/build.xml b/flex-compiler-oem/build.xml
index 566a4a1..cded834 100644
--- a/flex-compiler-oem/build.xml
+++ b/flex-compiler-oem/build.xml
@@ -78,7 +78,6 @@
-->
<path id="classpath">
- <fileset dir="${FLEX_HOME}/lib" includes="swfutils.jar"/>
<fileset dir="${sdk}/lib" includes="**/*.jar"/>
</path>
@@ -99,6 +98,7 @@
source="${javac.src}" target="${javac.src}"
includes="**/*.java" destdir="${oem}/bin" classpathref="classpath" includeAntRuntime="true">
<src path="${oem}/src"/>
+ <src path="${basedir}/../swfutils/src"/>
</javac>
<!--
<copy todir="${compiler}/generated/classes">
@@ -126,7 +126,7 @@
<attribute name="Implementation-Title" value="${manifest.Implementation-Title}"/>
<attribute name="Implementation-Version" value="${manifest.Implementation-Version}.${build.number}"/>
<attribute name="Implementation-Vendor" value="${manifest.Implementation-Vendor}"/>
- <attribute name="Class-Path" value="falcon-mxmlc.jar falcon-compc.jar ../lib-legacy/swfutils.jar"/>
+ <attribute name="Class-Path" value="falcon-mxmlc.jar falcon-compc.jar swfutils.jar"/>
</manifest>
</jar>
</target>