You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cd...@apache.org on 2016/04/18 15:26:31 UTC
[08/50] git commit: [flex-asjs] [refs/heads/feature/maven-migration]
- fix issues with release packaging, installation and approval
fix issues with release packaging, installation and approval
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/4c94b551
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/4c94b551
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/4c94b551
Branch: refs/heads/feature/maven-migration
Commit: 4c94b5519f00cdda6410ec62ef268d40cd1c0a01
Parents: fcb2372
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 17:39:13 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 17:39:13 2016 -0700
----------------------------------------------------------------------
ApproveFlexJS.xml | 116 ++++++++++++++-
LICENSE.base | 203 +++++++++++++++++++++++++++
LICENSE.bin | 4 -
apache-flex-flexjs-installer-config.xml | 2 +-
build.xml | 12 +-
installer.xml | 18 ++-
6 files changed, 334 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index 727d6c3..2c2a436 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -54,6 +54,7 @@
<property name="src.rat.report" value="${basedir}/rat-report-src.txt"/>
<property name="bin.rat.report" value="${basedir}/rat-report-bin.txt"/>
+ <property name="doc.rat.report" value="${basedir}/rat-report-doc.txt"/>
<property name="apache.rat.jar" value="apache-rat-0.11.jar" />
<property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.11.jar" />
<property name="apache.rat.url" value="http://search.maven.org/remotecontent?filepath=org/apache/rat/apache-rat/0.11" />
@@ -146,11 +147,19 @@
<isset property="rc" />
</not>
</condition>
+ <condition property="doc.package.url.path"
+ value="${package.url.path}">
+ <not>
+ <isset property="rc" />
+ </not>
+ </condition>
<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/flexjs/${release.version}/rc${rc}" />
<property name="package.url.name" value="apache-flex-flexjs-${release.version}-src" />
<property name="bin.package.url.path" value="${package.url.path}/binaries" />
<property name="bin.package.url.name" value="apache-flex-flexjs-${release.version}-bin" />
+ <property name="doc.package.url.path" value="${package.url.path}/doc" />
+ <property name="doc.package.url.name" value="apache-flex-flexjs-${release.version}-asdocs" />
<condition property="zip.package">
<equals arg1="zip" arg2="${package.suffix}" />
@@ -197,10 +206,10 @@
classpathref="anttask.classpath"/>
</target>
- <target name="main" depends="install-rat,download,check-sigs,uncompress,rat-check,binary-rat,check-notices,build,approve" description="Perform required release approval steps">
+ <target name="main" depends="install-rat,download,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,build,approve" description="Perform required release approval steps">
</target>
- <target name="main-no-download" depends="install-rat,check-sigs,uncompress,rat-check,binary-rat,check-notices,build,approve" description="Perform required release approval steps">
+ <target name="main-no-download" depends="install-rat,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,build,approve" description="Perform required release approval steps">
</target>
<target name="test" >
@@ -229,6 +238,10 @@
dest="${basedir}/${bin.package.url.name}.${package.suffix}" />
<get src="${bin.package.url.path}/${bin.package.url.name}.${package.suffix}.md5"
dest="${basedir}/${bin.package.url.name}.${package.suffix}.md5" />
+ <get src="${doc.package.url.path}/${doc.package.url.name}.zip"
+ dest="${basedir}/${doc.package.url.name}.zip" />
+ <get src="${doc.package.url.path}/${doc.package.url.name}.zip.md5"
+ dest="${basedir}/${doc.package.url.name}.zip.md5" />
<antcall target="get_asc" />
</target>
@@ -237,6 +250,8 @@
dest="${basedir}/${package.url.name}.${package.suffix}.asc" />
<get src="${bin.package.url.path}/${bin.package.url.name}.${package.suffix}.asc"
dest="${basedir}/${bin.package.url.name}.${package.suffix}.asc" />
+ <get src="${doc.package.url.path}/${doc.package.url.name}.zip.asc"
+ dest="${basedir}/${doc.package.url.name}.zip.asc" />
</target>
<target name="check-sigs" description="check md5 and gpg sigs">
@@ -258,6 +273,15 @@
</not>
</condition>
<fail message="Binary Package MD5 checksum did not match" if="BinaryMD5Invalid" />
+ <replace file="${basedir}/${doc.package.url.name}.zip.md5"
+ token=" " />
+ <checksum file="${basedir}/${doc.package.url.name}.zip" algorithm="md5" verifyproperty="doc.md5.ok" />
+ <condition property="DocMD5Invalid">
+ <not>
+ <equals arg1="${doc.md5.ok}" arg2="true" />
+ </not>
+ </condition>
+ <fail message="Doc Package MD5 checksum did not match" if="DocMD5Invalid" />
<antcall target="gpg_check" />
</target>
@@ -272,6 +296,11 @@
<arg value="${basedir}/${bin.package.url.name}.${package.suffix}.asc" />
<arg value="${basedir}/${bin.package.url.name}.${package.suffix}" />
</exec>
+ <exec executable="gpg" failonerror="true">
+ <arg value="--verify" />
+ <arg value="${basedir}/${doc.package.url.name}.${package.suffix}.asc" />
+ <arg value="${basedir}/${doc.package.url.name}.${package.suffix}" />
+ </exec>
</target>
<target name="uncompress" depends="pre-clean, untar-file, unzip-file" />
@@ -279,6 +308,7 @@
<target name="pre-clean" description="remove old uncompressed package" >
<delete dir="${basedir}/${package.url.name}" failonerror="false" />
<delete dir="${basedir}/${bin.package.url.name}" failonerror="false" />
+ <delete dir="${basedir}/${doc.package.url.name}" failonerror="false" />
</target>
<target name="untar-file" unless="zip.package" description="Untars zipFile">
@@ -286,6 +316,8 @@
dest="${basedir}" compression="gzip"/>
<untar src="${basedir}/${bin.package.url.name}.${package.suffix}"
dest="${basedir}" compression="gzip"/>
+ <unzip src="${basedir}/${doc.package.url.name}.zip"
+ dest="${basedir}/${doc.package.url.name}"/>
</target>
<target name="unzip-file" if="zip.package" description="Unzips zipFile">
@@ -293,6 +325,8 @@
dest="${basedir}/${package.url.name}"/>
<unzip src="${basedir}/${bin.package.url.name}.${package.suffix}"
dest="${basedir}/${bin.package.url.name}"/>
+ <unzip src="${basedir}/${doc.package.url.name}.${package.suffix}"
+ dest="${basedir}/${doc.package.url.name}"/>
</target>
<target name="rat-check" >
@@ -315,6 +349,7 @@
<exclude name="frameworks/js/.jshintrc"/>
<!-- fragments -->
<exclude name="LICENSE.bin"/>
+ <exclude name="LICENSE.base"/>
</fileset>
</rat:report>
<antcall target="display-text" >
@@ -357,6 +392,7 @@
<exclude name="frameworks/js/.jshintrc"/>
<!-- fragments -->
<exclude name="LICENSE.bin"/>
+ <exclude name="LICENSE.base"/>
<!-- Google Closure Library -->
<exclude name="js/lib/google/**"/>
<!-- compiled output -->
@@ -423,6 +459,50 @@
addproperty="rat.bin.binaries.ok"/>
</target>
+ <target name="doc-rat" >
+ <echo message="Checking files at ${basedir}/${doc.package.url.name}, report is ${doc.rat.report}"/>
+ <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+ reportFile="${doc.rat.report}">
+ <fileset dir="${basedir}/${doc.package.url.name}">
+ <!-- exclude generated html -->
+ <exclude name="asdoc/index.html"/>
+ <exclude name="asdoc/index-*.html"/>
+ <exclude name="asdoc/google/maps/**/*.html"/>
+ <exclude name="asdoc/org/**/*.html"/>
+ <exclude name="asdoc/package*.html"/>
+ <exclude name="asdoc/all-classes.html"/>
+ <exclude name="asdoc/all-index*.html"/>
+ <exclude name="asdoc/class-*.html"/>
+ <exclude name="asdoc/title-bar.html"/>
+ <exclude name="asdoc/Namespace.html"/>
+ <exclude name="asdoc/QName.html"/>
+ <!-- exclude log -->
+ <exclude name="asdoc/validation_errors.log"/>
+ </fileset>
+ </rat:report>
+
+ <antcall target="display-text" >
+ <param name="file" value="${doc.rat.report}" />
+ </antcall>
+ <input
+ message="Check that there are no unknown or unapproved licenses or archives. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="rat.doc.license.ok"/>
+ <echo>filtering out AL files to make it easier to see binary files</echo>
+ <copy file="${doc.rat.report}" tofile="${doc.rat.report}.bin.txt" />
+ <replaceregexp file="${doc.rat.report}.bin.txt" match="..AL.*" replace="__AL" byline="true"/>
+ <replaceregexp file="${doc.rat.report}.bin.txt" flags="gs" match="__AL." replace="" byline="false"/>
+ <antcall target="display-text" >
+ <param name="file" value="${doc.rat.report}.bin.txt" />
+ </antcall>
+ <input
+ message="Check that there are no unexpected binaries. Is it ok?"
+ validargs="y,n"
+ defaultvalue="n"
+ addproperty="rat.doc.binaries.ok"/>
+ </target>
+
<target name="check-notices" description="open each notice file for review, grep for a few things" >
<fail message="README not in package">
<condition>
@@ -487,6 +567,7 @@
validargs="y,n"
defaultvalue="y"
addproperty="license.ok"/>
+
<antcall target="display-text" >
<param name="file" value="${basedir}/${bin.package.url.name}/NOTICE" />
</antcall>
@@ -504,6 +585,24 @@
validargs="y,n"
defaultvalue="y"
addproperty="bin.license.ok"/>
+
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/${doc.package.url.name}/asdoc/NOTICE" />
+ </antcall>
+ <input
+ message="Check the doc package NOTICE for required notices from third-parties. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="doc.notice.ok"/>
+
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/${doc.package.url.name}/asdoc/LICENSE" />
+ </antcall>
+ <input
+ message="Check the doc package LICENSE for the Apache License and third-party licenses. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="doc.license.ok"/>
</target>
<target name="ask.build">
@@ -678,12 +777,16 @@
<equals arg1="${rat.binaries.ok}" arg2="y" />
<equals arg1="${rat.bin.license.ok}" arg2="y" />
<equals arg1="${rat.bin.binaries.ok}" arg2="y" />
+ <equals arg1="${rat.doc.license.ok}" arg2="y" />
+ <equals arg1="${rat.doc.binaries.ok}" arg2="y" />
<equals arg1="${readme.ok}" arg2="y" />
<equals arg1="${releasenotes.ok}" arg2="y" />
<equals arg1="${notice.ok}" arg2="y" />
<equals arg1="${license.ok}" arg2="y" />
<equals arg1="${bin.notice.ok}" arg2="y" />
<equals arg1="${bin.license.ok}" arg2="y" />
+ <equals arg1="${doc.notice.ok}" arg2="y" />
+ <equals arg1="${doc.license.ok}" arg2="y" />
</and>
</condition>
<property name="vote" value="-1" />
@@ -707,7 +810,14 @@ NOTICE is ok: ${bin.notice.ok}
LICENSE is ok: ${bin.license.ok}
No unapproved licenses or archives in binary package: ${rat.bin.license.ok}
No unapproved binaries in binary package: ${rat.bin.binaries.ok}
- </echo>
+
+Package ${doc.package.url.path}/${doc.package.url.name}.zip
+Doc kit signatures match: y
+NOTICE is ok: ${doc.notice.ok}
+LICENSE is ok: ${doc.license.ok}
+No unapproved licenses or archives in doc package: ${rat.doc.license.ok}
+No unapproved binaries in doc package: ${rat.doc.binaries.ok}
+ </echo>
<fail>
<condition>
<equals arg1="-1" arg2="${vote}"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/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-asjs/blob/4c94b551/LICENSE.bin
----------------------------------------------------------------------
diff --git a/LICENSE.bin b/LICENSE.bin
index 2c5e7a2..6ffda73 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -2,10 +2,6 @@ Below are the licenses for components included in the binary distribution.
------------------------------------------------------------------------------------------
-This product bundles designmodo’s (http://designmodo.com/flat-free/)
-Flat UI glyph fonts available under an MIT license. For details, see
-frameworks/fonts/README.md
-
This product bundles Google Closure Library available under Apache License 2.0.
For details see https://developers.google.com/closure/library/
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
index 7807a0c..42813bf 100755
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -239,7 +239,7 @@
<license>Adobe Flex SDK 授權合約</license>
</zh_TW>
</component>
- <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="true" property="do.flat.install">
+ <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="false" property="do.flat.install">
<el_GR>
<label>designmodo fonts (Προαιρετικό)</label>
<message>Για το designmodo fonts ισχύει η συμφωνία χρήσης του CC-BY-NC-ND License. Θέλετε να εγκαταστήσετε το designmodo fonts;</message>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 9bda287..8047641 100644
--- a/build.xml
+++ b/build.xml
@@ -531,6 +531,7 @@
<include name="RELEASE_NOTES"/>
<include name="LICENSE"/>
<include name="LICENSE.bin"/>
+ <include name="LICENSE.base"/>
<include name="NOTICE"/>
</fileset>
</copy>
@@ -742,7 +743,7 @@
<!-- fonts
<copy todir="${basedir}/temp/frameworks/fonts">
<fileset dir="${basedir}/frameworks/fonts" >
- <include name="**/**"/>
+ <include name="**/*.swf"/>
</fileset>
</copy>
-->
@@ -1006,12 +1007,8 @@
<copy todir="${basedir}/temp/asdoc">
<fileset dir="${basedir}/asdoc-output"/>
</copy>
- <copy todir="${basedir}/temp/asdoc">
- <fileset dir="${basedir}">
- <include name="LICENSE" />
- <include name="NOTICE" />
- </fileset>
- </copy>
+ <copy todir="${basedir}/temp/asdoc" file="${basedir}/NOTICE" />
+ <copy tofile="${basedir}/temp/asdoc/LICENSE" file="${basedir}/LICENSE.base" />
<zip file="${basedir}/out/${kit.prefix}-asdocs.zip" basedir="${basedir}/temp"/>
<antcall target="clean-temp"/>
</target>
@@ -1378,6 +1375,7 @@
<rat:report xmlns:rat="antlib:org.apache.rat.anttasks" reportFile="${rat.report}">
<fileset dir="${rat.dir}">
<exclude name="LICENSE.bin"/>
+ <exclude name="LICENSE.base"/>
<!-- Start of binary files -->
<!-- exclude media (png, gif, jpg, mp3, flv) -->
<exclude name="**/*.png"/>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/4c94b551/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index f0806d1..50b213b 100644
--- a/installer.xml
+++ b/installer.xml
@@ -692,6 +692,8 @@
<!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
<target name="flat-check" description="Checks if Flat fonts has been downloaded.">
+ <!-- make this folder anyway so example scripts don't fail -->
+ <mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
<available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.woff" property="skip.flat.install"/>
<condition property="skip.flat.install" value="true">
<not>
@@ -709,19 +711,23 @@
dest="${download.dir}/flat-ui_2_2.zip"
verbose="false"/>
- <mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
<mkdir dir="${download.dir}/flat/fonts"/>
<unzip src="${download.dir}/flat-ui_2_2.zip" dest="${download.dir}/flat/fonts" />
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.eot"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.svg"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.woff"/>
<copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/README.md"
- todir="${FLEXJS_HOME}/frameworks/fonts"/>
+ tofile="${FLEXJS_HOME}/frameworks/fonts/README.md"/>
+
+ <get src="http://apacheflexbuild.cloudapp.net:8080/job/flat-ui-icons-regular.swf/lastSuccessfulBuild/artifact/frameworks/fonts/flat-ui-icons-regular.swf"
+ dest="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.swf"
+ verbose="false"/>
+
</target>
<!-- swfobject.js (Version 2.2) -->