flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject [32/50] [abbrv] git commit: [flex-asjs] [refs/heads/master] - fix up approval script and other related files
Date Wed, 06 Apr 2016 15:06:30 GMT
fix up approval script and other related files


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/3cab6cfe
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/3cab6cfe
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/3cab6cfe

Branch: refs/heads/master
Commit: 3cab6cfe4e166dc9bb037df0a60c1bd245788e3c
Parents: e701358
Author: Alex Harui <aharui@apache.org>
Authored: Mon Mar 14 09:01:12 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Mar 14 09:01:12 2016 -0700

----------------------------------------------------------------------
 ApproveFlexJS.xml | 168 ++++++++++++++++++++++++++++++++++++++++++++++---
 NOTICE            |   2 +-
 RELEASE_NOTES     |  10 +++
 build.xml         |   1 +
 4 files changed, 170 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3cab6cfe/ApproveFlexJS.xml
----------------------------------------------------------------------
diff --git a/ApproveFlexJS.xml b/ApproveFlexJS.xml
index cdf3d85..b01029b 100644
--- a/ApproveFlexJS.xml
+++ b/ApproveFlexJS.xml
@@ -52,7 +52,8 @@
     </condition>
 	<property name="package.suffix" value="tar.gz" />
 	
-	<property name="rat.report" value="${basedir}/rat-report.txt"/>
+    <property name="src.rat.report" value="${basedir}/rat-report-src.txt"/>
+    <property name="bin.rat.report" value="${basedir}/rat-report-bin.txt"/>
 	<property name="apache.rat.jar" value="apache-rat-0.8.jar" />
 	<property name="apache.rat.tasks.jar" value="apache-rat-tasks-0.8.jar" />
 	<property name="apache.rat.url" value="http://people.apache.org/~aharui/rat" />
@@ -138,9 +139,17 @@
             <isset property="rc" />
         </not>
     </condition>
+    <condition property="bin.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"
/>
 	
     <condition property="zip.package">
         <equals arg1="zip" arg2="${package.suffix}" />
@@ -187,10 +196,10 @@
         classpathref="anttask.classpath"/>
     </target>
 
-    <target name="main" depends="install-rat,download,check-sigs,uncompress,rat-check,check-notices,build,approve"
description="Perform required release approval steps">
+    <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>
     
-    <target name="main-no-download" depends="install-rat,check-sigs,uncompress,rat-check,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,check-notices,build,approve"
description="Perform required release approval steps">
     </target>
 	
     <target name="test" >
@@ -215,12 +224,18 @@
             dest="${basedir}/${package.url.name}.${package.suffix}" />
         <get src="${package.url.path}/${package.url.name}.${package.suffix}.md5"
             dest="${basedir}/${package.url.name}.${package.suffix}.md5" />
+        <get src="${bin.package.url.path}/${bin.package.url.name}.${package.suffix}"
+            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" />
         <antcall target="get_asc" />
     </target>
 
     <target name="get_asc" if="rc" >
         <get src="${package.url.path}/${package.url.name}.${package.suffix}.asc"
         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" />
     </target>
     
     <target name="check-sigs" description="check md5 and gpg sigs">
@@ -233,6 +248,15 @@
 			</not>
         </condition>
         <fail message="MD5 checksum did not match" if="MD5Invalid" />
+        <replace file="${basedir}/${bin.package.url.name}.${package.suffix}.md5"
+        token=" " />
+        <checksum file="${basedir}/${bin.package.url.name}.${package.suffix}" algorithm="md5"
verifyproperty="bin.md5.ok" />
+        <condition property="BinaryMD5Invalid">
+            <not>
+                <equals arg1="${bin.md5.ok}" arg2="true" />
+            </not>
+        </condition>
+        <fail message="Binary Package MD5 checksum did not match" if="BinaryMD5Invalid"
/>
         <antcall target="gpg_check" />
     </target>
 
@@ -242,30 +266,40 @@
             <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
             <arg value="${basedir}/${package.url.name}.${package.suffix}" />
         </exec>
+        <exec executable="gpg" failonerror="true">
+            <arg value="--verify" />
+            <arg value="${basedir}/${bin.package.url.name}.${package.suffix}.asc" />
+            <arg value="${basedir}/${bin.package.url.name}.${package.suffix}" />
+        </exec>
     </target>
     
     <target name="uncompress" depends="pre-clean, untar-file, unzip-file" />
 
     <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" />
 	</target>
 	
     <target name="untar-file" unless="zip.package" description="Untars zipFile">
         <untar src="${basedir}/${package.url.name}.${package.suffix}"
                 dest="${basedir}" compression="gzip"/>
+        <untar src="${basedir}/${bin.package.url.name}.${package.suffix}"
+                dest="${basedir}" compression="gzip"/>
     </target>
 
     <target name="unzip-file" if="zip.package" description="Unzips zipFile">
         <unzip src="${basedir}/${package.url.name}.${package.suffix}"
                 dest="${basedir}/${package.url.name}"/>
+        <unzip src="${basedir}/${bin.package.url.name}.${package.suffix}"
+                dest="${basedir}/${bin.package.url.name}"/>
     </target>
 
     <target name="rat-check" >
 
-        <echo message="Checking files at ${basedir}/${package.url.name}, report is ${rat.report}"/>
+        <echo message="Checking files at ${basedir}/${package.url.name}, report is ${src.rat.report}"/>
 
         <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
-            reportFile="${rat.report}">
+            reportFile="${src.rat.report}">
             <fileset dir="${basedir}/${package.url.name}">
                 <!-- exclude media (png, gif, jpg, mp3, flv) -->
                 <exclude name="**/*.png"/>
@@ -283,7 +317,7 @@
             </fileset>
         </rat:report>
 		<antcall target="display-text" >
-            <param name="file" value="${rat.report}" />
+            <param name="file" value="${src.rat.report}" />
         </antcall>
         <input
 			message="Check that there are no unknown or unapproved licenses or archives. Is it ok?"
@@ -291,11 +325,11 @@
         defaultvalue="y"
         addproperty="rat.license.ok"/>
 		<echo>filtering out AL files to make it easier to see binary files</echo>
-		<copy file="${rat.report}" tofile="${rat.report}.bin.txt" />
-        <replaceregexp file="${rat.report}.bin.txt" match="..AL.*" replace="__AL" byline="true"/>
-        <replaceregexp file="${rat.report}.bin.txt" flags="gs" match="__AL." replace=""
byline="false"/>
+		<copy file="${src.rat.report}" tofile="${src.rat.report}.bin.txt" />
+        <replaceregexp file="${src.rat.report}.bin.txt" match="..AL.*" replace="__AL"
byline="true"/>
+        <replaceregexp file="${src.rat.report}.bin.txt" flags="gs" match="__AL." replace=""
byline="false"/>
 		<antcall target="display-text" >
-            <param name="file" value="${rat.report}.bin.txt" />
+            <param name="file" value="${src.rat.report}.bin.txt" />
         </antcall>
         <input
 			message="Check that there are no unexpected binaries.  Is it ok?"
@@ -304,6 +338,92 @@
         addproperty="rat.binaries.ok"/>
     </target>
 
+    <target name="binary-rat" >
+        <echo message="Checking files at ${basedir}/${bin.package.url.name}, report is
${bin.rat.report}"/>
+        <rat:report xmlns:rat="antlib:org.apache.rat.anttasks"
+            reportFile="${bin.rat.report}">
+            <fileset dir="${basedir}/${bin.package.url.name}">
+                <!-- exclude media (png, gif, jpg, mp3, flv) -->
+                <exclude name="**/*.png"/>
+                <exclude name="**/*.gif"/>
+                <exclude name="**/*.jpg"/>
+                <exclude name="**/*.mp3"/>
+                <exclude name="**/*.flv"/>
+                <!--          JSON doesn't really have a comment format     -->
+                <exclude name="**/*.json"/>
+                <!--          JSHint properties file           -->
+                <exclude name="frameworks/js/jshint.properties"/>
+                <exclude name="frameworks/js/.jshintrc"/>
+                <!--          fragments           -->
+                <exclude name="LICENSE.bin"/>
+                <!--          Google Closure Library     -->
+                <exclude name="js/lib/google/**"/>
+                <!--          compiled output     -->
+                <exclude name="frameworks/projects/*/target/**"/>
+                <!--          fonts     -->
+                <exclude name="frameworks/fonts/**"/>
+                <!--          swcs     -->
+                <exclude name="frameworks/libs/Binding.swc"/>
+                <exclude name="frameworks/libs/Charts.swc"/>
+                <exclude name="frameworks/libs/Collections.swc"/>
+                <exclude name="frameworks/libs/Core.swc"/>
+                <exclude name="frameworks/libs/CreateJS.swc"/>
+                <exclude name="frameworks/libs/DragDrop.swc"/>
+                <exclude name="frameworks/libs/Effects.swc"/>
+                <exclude name="frameworks/libs/Flat.swc"/>
+                <exclude name="frameworks/libs/Formatters.swc"/>
+                <exclude name="frameworks/libs/GoogleMaps.swc"/>
+                <exclude name="frameworks/libs/Graphics.swc"/>
+                <exclude name="frameworks/libs/HTML.swc"/>
+                <exclude name="frameworks/libs/HTML5.swc"/>
+                <exclude name="frameworks/libs/JQuery.swc"/>
+                <exclude name="frameworks/libs/Mobile.swc"/>
+                <exclude name="frameworks/libs/Network.swc"/>
+                <exclude name="frameworks/libs/Reflection.swc"/>
+                <exclude name="frameworks/libs/Storage.swc"/>
+                <exclude name="frameworks/externs/Binding.swc"/>
+                <exclude name="frameworks/externs/Charts.swc"/>
+                <exclude name="frameworks/externs/Collections.swc"/>
+                <exclude name="frameworks/externs/Core.swc"/>
+                <exclude name="frameworks/externs/CreateJS.swc"/>
+                <exclude name="frameworks/externs/DragDrop.swc"/>
+                <exclude name="frameworks/externs/Effects.swc"/>
+                <exclude name="frameworks/externs/Flat.swc"/>
+                <exclude name="frameworks/externs/Formatters.swc"/>
+                <exclude name="frameworks/externs/GoogleMaps.swc"/>
+                <exclude name="frameworks/externs/Graphics.swc"/>
+                <exclude name="frameworks/externs/HTML.swc"/>
+                <exclude name="frameworks/externs/HTML5.swc"/>
+                <exclude name="frameworks/externs/JQuery.swc"/>
+                <exclude name="frameworks/externs/Mobile.swc"/>
+                <exclude name="frameworks/externs/Network.swc"/>
+                <exclude name="frameworks/externs/Reflection.swc"/>
+                <exclude name="frameworks/externs/Storage.swc"/>
+            </fileset>
+        </rat:report>
+        
+        <antcall target="display-text" >
+            <param name="file" value="${bin.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.bin.license.ok"/>
+        <echo>filtering out AL files to make it easier to see binary files</echo>
+        <copy file="${bin.rat.report}" tofile="${bin.rat.report}.bin.txt" />
+        <replaceregexp file="${bin.rat.report}.bin.txt" match="..AL.*" replace="__AL"
byline="true"/>
+        <replaceregexp file="${bin.rat.report}.bin.txt" flags="gs" match="__AL." replace=""
byline="false"/>
+        <antcall target="display-text" >
+            <param name="file" value="${bin.rat.report}.bin.txt" />
+        </antcall>
+        <input
+        message="Check that there are no unexpected binaries.  Is it ok?"
+        validargs="y,n"
+        defaultvalue="n"
+        addproperty="rat.bin.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>
@@ -368,6 +488,23 @@
             validargs="y,n"
         defaultvalue="y"
         addproperty="license.ok"/>
+        <antcall target="display-text" >
+            <param name="file" value="${basedir}/${bin.package.url.name}/NOTICE" />
+        </antcall>
+        <input
+        message="Check the binary package NOTICE for required notices from third-parties.
Is it ok?"
+        validargs="y,n"
+        defaultvalue="y"
+        addproperty="bin.notice.ok"/>
+        
+        <antcall target="display-text" >
+            <param name="file" value="${basedir}/${bin.package.url.name}/LICENSE" />
+        </antcall>
+        <input
+        message="Check the binary package LICENSE for the Apache License and third-party
licenses. Is it ok?"
+        validargs="y,n"
+        defaultvalue="y"
+        addproperty="bin.license.ok"/>
     </target>
 
     <target name="ask.build">
@@ -540,10 +677,14 @@
 			<and>
 				<equals arg1="${rat.license.ok}" arg2="y" />
 				<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="${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" />
 			</and>
 		</condition>
 		<property name="vote" value="-1" />
@@ -560,6 +701,13 @@ NOTICE is ok: ${notice.ok}
 LICENSE is ok: ${license.ok}
 No unapproved licenses or archives: ${rat.license.ok}
 No unapproved binaries: ${rat.binaries.ok}
+
+Package ${bin.package.url.path}/${bin.package.url.name}.${package.suffix}
+Binary kit signatures match: y
+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>
 		<fail>
 			<condition>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3cab6cfe/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
index 57ccb0c..21cb1dc 100644
--- a/NOTICE
+++ b/NOTICE
@@ -1,5 +1,5 @@
 Apache FlexJS
-Copyright 2012-2015 The Apache Software Foundation
+Copyright 2012-2016 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3cab6cfe/RELEASE_NOTES
----------------------------------------------------------------------
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 898ec3a..94858bb 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -1,3 +1,13 @@
+Apache FlexJS 0.6.0
+=================
+
+Apache FlexJS is a next-generation Flex SDK that provides the capability
+to cross-compile MXML and AS applications to HTML/JS/CSS so they can run
+in a browser without Flash.
+
+This is the fourth release of Apache FlexJS.  It is an ‘beta’ type of release.
+Expect to find lots of bugs and missing features.
+
 Apache FlexJS 0.5.0
 =================
 

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/3cab6cfe/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 465b13a..5548c14 100644
--- a/build.xml
+++ b/build.xml
@@ -627,6 +627,7 @@
                 <exclude name="**/*.pbj"/>
                 <exclude name="**/*.swf"/>
                 <exclude name="**/*.mxp"/>
+                <exclude name="fb.properties"/>
                 <exclude name="fonts/**"/>
                 <exclude name="test*/**"/>
                 <exclude name="js/VanillaSDK/**"/>


Mime
View raw message