You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2017/12/11 19:59:22 UTC
[royale-asjs] branch develop updated: more tuning of release
artifacts
This is an automated email from the ASF dual-hosted git repository.
aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/develop by this push:
new 26acf9c more tuning of release artifacts
26acf9c is described below
commit 26acf9c487a1bd05d45447863b53e249ff0b7819
Author: Alex Harui <ah...@apache.org>
AuthorDate: Mon Dec 11 11:58:50 2017 -0800
more tuning of release artifacts
---
ApproveRoyale.xml | 145 ++++++++++++++++++++++++++++++++----
LICENSE | 3 +-
LICENSE.bin | 2 +-
build.xml | 5 +-
releasemgr/LICENSE | 215 -----------------------------------------------------
5 files changed, 138 insertions(+), 232 deletions(-)
diff --git a/ApproveRoyale.xml b/ApproveRoyale.xml
index 71388e7..a6fdeea 100644
--- a/ApproveRoyale.xml
+++ b/ApproveRoyale.xml
@@ -192,10 +192,10 @@
classpathref="anttask.classpath"/>
</target>
- <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 name="main" depends="write-out-jars-list,install-rat,download,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve" description="Perform required release approval steps">
</target>
- <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 name="main-no-download" depends="write-out-jars-list,install-rat,check-sigs,uncompress,rat-check,binary-rat,doc-rat,check-notices,examine-jars,build,approve" description="Perform required release approval steps">
</target>
<target name="test" >
@@ -203,6 +203,16 @@
<replaceregexp file="${rat.report}.bin.txt" match="..AL.*" replace="" byline="true"/>
</target>
+ <target name="write-out-jars-list" >
+ <delete file="jars.txt" />
+ <!-- this is a comma-delimited, no spaces, no-line-breaks list used to decide which jars
+ to skip in the rat-check of the binaries and which jars to examine before approval -->
+ <property name="jars-list" value="lib/compc.jar,lib/compiler.jar,lib/compiler-asc.jar,lib/compiler-common.jar,lib/compiler-compc.jar,lib/compiler-mxmlc.jar,lib/compiler-optimizer.jar,lib/compiler-swfdump.jar,lib/swfutils.jar,lib/fdb.jar,lib/flex-compiler-oem.jar,js/lib/asdoc.jar,js/lib/compiler-royaleTasks.jar,js/lib/compc.jar,js/lib/externc.jar,js/lib/jsc.jar,js/lib/mxmlc.jar"/>
+ <echo file="${basedir}/jars.txt" message="${jars-list}"/>
+ <echo file="${basedir}/jarexcludes.txt" message="${jars-list}"/>
+ <replaceregexp file="${basedir}/jarexcludes.txt" match="," flags="g" replace="${line.separator}" />
+ </target>
+
<target name="display-text" >
<antcall target="display-text-mac" />
<antcall target="display-text-win" />
@@ -480,7 +490,11 @@
<exclude name="royale-asjs/frameworks/js/libs/TestingJS.swc"/>
<exclude name="royale-asjs/frameworks/js/libs/TextJS.swc"/>
<exclude name="royale-asjs/frameworks/js/libs/XMLJS.swc"/>
- <exclude name="royale-asjs/frameworks/themes/Halo.swc"/>
+ <exclude name="royale-asjs/frameworks/themes/Halo/Halo.swc"/>
+
+ <exclude name="royale-asjs/frameworks/projects/Graphics/src/main/royale/org/apache/royale/graphics/utils/shaderClasses/*.pbj"/>
+ <exclude name="royale-asjs/frameworks/projects/Basic/src/test/royale/FlexUnitRoyaleApplication.swf"/>
+ <exclude name="royale-asjs/frameworks/projects/Core/src/test/royale/FlexUnitRoyaleApplication.swf"/>
<exclude name="royale-asjs/frameworks/localfonts.ser"/>
<exclude name="royale-asjs/frameworks/macfonts.ser"/>
@@ -536,6 +550,7 @@
<exclude name="royale-asjs/lib/external/lzma-sdk.jar"/>
<exclude name="royale-asjs/templates/swfobject/swfobject.js"/>
+ <exclude name="royale-asjs/templates/swfobject/expressInstall.swf"/>
</fileset>
</rat:report>
@@ -712,15 +727,15 @@
<target name="ask.build">
<input
- message="The final step is to run the build and any tests the build script runs. This can take several minutes. You will be asked to accept the Adobe license for the font jars. Press y to start the build."
+ message="The final step is to run the build and any tests the build script runs. This can take several minutes. Press y to start the build."
validargs="y"
defaultvalue="y" />
</target>
<target name="build" depends="ask.build,ask-font,get.dependencies,copy.downloads">
<property name="no.lint" value="true" />
- <ant dir="${basedir}/${package.url.name}" target="main" />
- <ant dir="${basedir}/${package.url.name}" target="examples" />
+ <ant dir="${basedir}/${package.url.name}/royale-asjs" target="all" />
+ <ant dir="${basedir}/${package.url.name}/royale-asjs" target="examples" />
</target>
<target name="copy.downloads" if="${do.copy.downloads}" description="instead of actually downloading all of the dependencies, you can save lots of time by just copying from some other folder in some other SDK.">
@@ -732,25 +747,26 @@
<!-- Prompt before downloading. -->
<target name="ask-font" unless="font.donot.ask"
- description="Prompt the user before downloading BlaseDS">
+ description="Prompt the user before downloading Flat Fonts">
<property name="font.prompt.text"
- value="Apache Royale can optionally integrate with Adobe's embedded font support.
- ${line.separator}This feature requires a few font jars from the Adobe Flex SDK.
- ${line.separator}The Adobe SDK license agreement for Adobe Flex 4.6 applies to these jars.
+ value="Apache Royale includes an optional component set that
+ ${line.separator}uses fonts from designmodo.com.
+ ${line.separator}The font files are subject to and governed by the
+ ${line.separator}Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported license:
+ ${line.separator}http://creativecommons.org/licenses/by-nc-nd/3.0/
${line.separator}This license is not compatible with the Apache v2 license.
- ${adobe.flex.license}
- ${line.separator}Do you want to install these jars from the Adobe Flex SDK?"/>
+ ${line.separator}Do you want to install the designmodo fonts?"/>
<input
message="${font.prompt.text}"
validargs="y,n"
defaultvalue="n"
addproperty="input.font.download"/>
- <condition property="do.font.install">
+ <condition property="do.flat.install">
<equals arg1="y" arg2="${input.font.download}"/>
</condition>
<!-- Only ask once per ant run. -->
- <property name="font.donot.ask" value="set"/>
+ <property name="flat.donot.ask" value="set"/>
</target>
<!--<target name="get.dependencies" depends="set.compiler.flags,get.compiler.if.needed,get.sdk.if.needed,get.flexunit.if.needed" />-->
@@ -852,6 +868,107 @@
</target>
-->
+ <!-- how to do tar and sort on Windows? -->
+ <target name="examine-jars" if="isMac">
+ <!-- comma delimited list, no spaces, not one file per line -->
+ <copy file="jars.txt" tofile="loop.txt" />
+ <ant antfile="ApproveRoyale.xml" target="loopOnce" inheritAll="false" />
+ </target>
+ <target name="loopOnce" >
+ <!-- make a copy of the list so we can munge it to
+ get the first item in the list -->
+ <delete file="loop1.txt" />
+ <copy file="loop.txt" tofile="loop1.txt" />
+ <loadfile srcFile="loop.txt" property="checkiflast" />
+ <condition property="islast" value="true">
+ <not>
+ <contains string="${checkiflast}" substring="," />
+ </not>
+ </condition>
+ <antcall target="notlast" />
+ <antcall target="lastone" />
+ </target>
+ <target name="notlast" unless="islast">
+ <loadfile srcFile="loop1.txt" property="echoFile" />
+ <replaceregexp file="loop1.txt" match="^(.*),(.*)" replace="\2" />
+ <loadfile srcFile="loop1.txt" property="thisFile" />
+ <antcall target="jar-check" />
+ <replaceregexp file="loop.txt" match="^(.*),(.*)" replace="\1" />
+ <ant antfile="ApproveRoyale.xml" target="loopOnce" inheritAll="false"/>
+ </target>
+ <target name="lastone" if="islast">
+ <loadfile srcFile="loop1.txt" property="thisFile" />
+ <antcall target="jar-check" />
+ <delete file="loop.txt" />
+ <delete file="loop1.txt" />
+ </target>
+
+ <target name="jar-check" >
+ <delete dir="${basedir}/jar" failonerror="false" />
+ <mkdir dir="${basedir}/jar" />
+ <unjar src="${basedir}/${bin.package.url.name}/royale-asjs/${thisFile}" dest="${basedir}/jar" />
+ <exec executable="tar" output="${basedir}/jarclasses.txt">
+ <arg value="tf" />
+ <arg value="${basedir}/${bin.package.url.name}//royale-asjs/${thisFile}" />
+ </exec>
+ <replaceregexp file="${basedir}/jarclasses.txt" match="(.*)/(.*)" replace="\1" flags="m" byline="true"/>
+ <exec executable="sort" output="${basedir}/jarpaths.txt">
+ <arg value="-u" />
+ <arg value="${basedir}/jarclasses.txt" />
+ </exec>
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/jarpaths.txt" />
+ </antcall>
+ <input
+ message="Above is the list of folders in this ${thisFile}.
Folder names can sometimes indicate presence of third-party content that needs to be in LICENSE and/or NOTICE files.
Press the Enter key to see the LICENSE for this jar."/>
+
+ <fail message="LICENSE not in ${basedir}/${bin.package.url.name}/royale-asjs/${thisFile}">
+ <condition>
+ <not>
+ <available file="${basedir}/jar/META-INF/LICENSE" />
+ </not>
+ </condition>
+ </fail>
+ <fail message="NOTICE not in ${basedir}/${bin.package.url.name}/royale-asjs/${thisFile}">
+ <condition>
+ <not>
+ <available file="${basedir}/jar/META-INF/NOTICE" />
+ </not>
+ </condition>
+ </fail>
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/jar/META-INF/LICENSE" />
+ </antcall>
+ <input
+ message="Check the LICENSE for the Apache License and third-party licenses. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="jar.license.ok"/>
+ <fail message="LICENSE for ${basedir}/${bin.package.url.name}/royale-asjs/${thisFile} not correct">
+ <condition>
+ <not>
+ <equals arg1="${jar.license.ok}" arg2="y" />
+ </not>
+ </condition>
+ </fail>
+ <antcall target="display-text" >
+ <param name="file" value="${basedir}/jar/META-INF/NOTICE" />
+ </antcall>
+ <input
+ message="Check the NOTICE for required notices from third-parties. Is it ok?"
+ validargs="y,n"
+ defaultvalue="y"
+ addproperty="jar.notice.ok"/>
+ <fail message="NOTICE for ${basedir}/${bin.package.url.name}/royale-asjs/${thisFile} not correct">
+ <condition>
+ <not>
+ <equals arg1="${jar.notice.ok}" arg2="y" />
+ </not>
+ </condition>
+ </fail>
+
+ </target>
+
<target name="approve" >
<condition property="vote" value="+1">
<and>
diff --git a/LICENSE b/LICENSE
index 5fae794..46a7091 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,7 +208,8 @@ APACHE ROYALE SUBCOMPONENTS:
The Apache Royale SDK includes a number of subcomponents with
separate copyright notices and license terms. Your use of the source
code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
+conditions of the following licenses. Paths are relative to the royale-asjs
+folder.
Portions of frameworks/projects/Flat/src/main/resources/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
diff --git a/LICENSE.bin b/LICENSE.bin
index bf9d5c2..4ac87b1 100644
--- a/LICENSE.bin
+++ b/LICENSE.bin
@@ -11,7 +11,7 @@ This product bundles SWFObject under the MIT License. For details see
royale-asjs/templates/swfobject/swfobject.js
-flex-typedefs/js/target/downloads/svg.js
+royale-typedefs/js/target/downloads/svg.js
This product bundles svg.js from closureidl.googlecode.com available
under the BSD 3-Clause license.
diff --git a/build.xml b/build.xml
index 64e3682..f225662 100644
--- a/build.xml
+++ b/build.xml
@@ -714,6 +714,9 @@
<copy todir="${basedir}/temp" includeEmptyDirs="false">
<fileset dir="${basedir}/releasemgr" includes="**" />
</copy>
+ <!-- use royale-asjs LICENSE at top-level as well for now
+ since it doesn't really need to be different -->
+ <copy file="${basedir}/LICENSE" todir="${basedir}/temp" />
</target>
<!--
@@ -916,7 +919,7 @@
<antcall target="stage-source"/>
<!-- concat the license file with the binary license file for the 3rd party deps -->
- <concat destfile="${staging-dir}/LICENSE">
+ <concat destfile="${basedir}/temp/LICENSE">
<filelist dir="${basedir}" files="LICENSE,LICENSE.bin"/>
</concat>
diff --git a/releasemgr/LICENSE b/releasemgr/LICENSE
deleted file mode 100644
index 25a48d6..0000000
--- a/releasemgr/LICENSE
+++ /dev/null
@@ -1,215 +0,0 @@
-
- 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.
-
---------------------------------------------------------------------------------
-
-APACHE ROYALE SUBCOMPONENTS:
-
-The Apache Royale SDK includes a number of subcomponents with
-separate copyright notices and license terms. Your use of the source
-code for the these subcomponents is subject to the terms and
-conditions of the following licenses.
-
-This LICENSE file is used for the top-level source and binary packages. The
-individual folders (royale-compiler, royals-typedefs, royale-asjs) each have their own
-LICENSE file specific to the contents of those folders.
--
To stop receiving notification emails like this one, please contact
['"commits@royale.apache.org" <co...@royale.apache.org>'].