Return-Path: 
 <commits-return-22277-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 1A96E107E2
	for <apmail-flex-commits-archive@www.apache.org>;
 Tue,  8 Sep 2015 06:34:47 +0000 (UTC)
Received: (qmail 57696 invoked by uid 500); 8 Sep 2015 06:34:46 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 57579 invoked by uid 500); 8 Sep 2015 06:34:46 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 57452 invoked by uid 99); 8 Sep 2015 06:34:46 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Sep 2015 06:34:46 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id AFF24E0568; Tue,  8 Sep 2015 06:34:46 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: aharui@apache.org
To: commits@flex.apache.org
Date: Tue, 08 Sep 2015 06:34:49 -0000
Message-Id: <1b206f05152f467f905c3af66acbd30b@git.apache.org>
In-Reply-To: <47c27c31d5144d979ac593b8e52e8e4e@git.apache.org>
References: <47c27c31d5144d979ac593b8e52e8e4e@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [4/4] git commit: [flex-falcon] [refs/heads/develop] - more fixes to
 scripts, readme, notice, approval script

more fixes to scripts, readme, notice, approval script


Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/5961345f
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/5961345f
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/5961345f

Branch: refs/heads/develop
Commit: 5961345fa986fd1db261f19b16f91f5f341478e9
Parents: 6913f90
Author: Alex Harui <aharui@apache.org>
Authored: Mon Sep 7 23:35:09 2015 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Sep 7 23:35:09 2015 -0700

----------------------------------------------------------------------
 ApproveFalcon.xml     | 42 ++++++++++++++++++------------------------
 NOTICE.base           |  9 +++++++++
 NOTICE.swfutils       |  2 +-
 README                | 34 ++++++++++++++++++++--------------
 build.xml             | 18 ++++++++++++++----
 compiler.jx/build.xml |  2 +-
 6 files changed, 63 insertions(+), 44 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5961345f/ApproveFalcon.xml
----------------------------------------------------------------------
diff --git a/ApproveFalcon.xml b/ApproveFalcon.xml
index ff8d4d0..bf6e810 100644
--- a/ApproveFalcon.xml
+++ b/ApproveFalcon.xml
@@ -129,9 +129,6 @@
     <fail message="The release version is not set.  Specify -Drelease.version=&lt;release version (e.g. 3.1, 3.2, etc)&gt;"
     unless="release.version"/>
 
-    <fail message="The release candidate number is not set.  Specify -Drc=&lt;rc number (e.g. 1, 2, 3, etc)&gt;"
-    unless="rc"/>
-        
 	<property name="package.url.path" value="https://dist.apache.org/repos/dist/dev/flex/falcon/${release.version}/rc${rc}" />
 	<property name="package.url.name" value="apache-flex-falconjx-${release.version}-src" />
 	
@@ -222,13 +219,18 @@
 			</not>
         </condition>
         <fail message="MD5 checksum did not match" if="MD5Invalid" />
-		<exec executable="gpg" failonerror="true">
-			<arg value="--verify" />
-			<arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
-			<arg value="${basedir}/${package.url.name}.${package.suffix}" />
-		</exec>
+        <echo>rc is ${rc}</echo>
+        <antcall target="gpg_check" />
     </target>
 
+    <target name="gpg_check" if="rc">
+        <exec executable="gpg" failonerror="true">
+            <arg value="--verify" />
+            <arg value="${basedir}/${package.url.name}.${package.suffix}.asc" />
+            <arg value="${basedir}/${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" >
@@ -259,10 +261,12 @@
                 <exclude name="**/*.mp3"/>
                 <exclude name="**/*.flv"/>
                 <exclude name="**/org.apache.flex.tools.FlexToolGroup"/>
+                <exclude name="debugger/META-INF/MANIFEST.MF"/>
                 <exclude name="RELEASE_NOTES_JX"/>
-                <exclude name="NOTICE_JX"/>
+                <exclude name="NOTICE.jx"/>
                 <exclude name="README_JX"/>
-                <exclude name="NOTICE.BASE"/>
+                <exclude name="NOTICE.base"/>
+                <exclude name="NOTICE.swfutils"/>
             </fileset>
         </rat:report>
 		<antcall target="display-text" >
@@ -275,7 +279,8 @@
         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="" byline="true"/>
+		<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"/>
 		<antcall target="display-text" >
             <param name="file" value="${rat.report}.bin.txt" />
         </antcall>
@@ -322,10 +327,10 @@
 				</not>
 			</condition>
         </fail>
-        <fail message="NOTICE_JX not in package">
+        <fail message="NOTICE.JX not in package">
 			<condition>
 				<not>
-					<available file="${basedir}/${package.url.name}/NOTICE_JX" />
+					<available file="${basedir}/${package.url.name}/NOTICE.JX" />
 				</not>
 			</condition>
         </fail>
@@ -380,15 +385,6 @@
         defaultvalue="y"
         addproperty="notice.ok"/>
 
-        <antcall target="display-text" >
-            <param name="file" value="${basedir}/${package.url.name}/NOTICE_JX" />
-        </antcall>
-        <input
-            message="Check the NOTICE_JX for required notices from third-parties. Is it ok?"
-            validargs="y,n"
-            defaultvalue="y"
-            addproperty="noticejx.ok"/>
-
 		<antcall target="display-text" >
             <param name="file" value="${basedir}/${package.url.name}/LICENSE" />
         </antcall>
@@ -424,7 +420,6 @@
 				<equals arg1="${notice.ok}" arg2="y" />
 				<equals arg1="${readmejx.ok}" arg2="y" />
 				<equals arg1="${releasenotesjx.ok}" arg2="y" />
-				<equals arg1="${noticejx.ok}" arg2="y" />
 				<equals arg1="${license.ok}" arg2="y" />
 			</and>
 		</condition>
@@ -441,7 +436,6 @@ README_JX is ok: ${readmejx.ok}
 RELEASE_NOTES is ok: ${releasenotes.ok}
 RELEASE_NOTES_JX is ok: ${releasenotesjx.ok}
 NOTICE is ok: ${notice.ok}
-NOTICE_JX is ok: ${noticejx.ok}
 LICENSE is ok: ${license.ok}
 No unapproved licenses or archives: ${rat.license.ok}
 No unapproved binaries: ${rat.binaries.ok}

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5961345f/NOTICE.base
----------------------------------------------------------------------
diff --git a/NOTICE.base b/NOTICE.base
new file mode 100644
index 0000000..f7f3c31
--- /dev/null
+++ b/NOTICE.base
@@ -0,0 +1,9 @@
+Apache Flex Compiler
+Copyright 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 ASC2.0, 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/5961345f/NOTICE.swfutils
----------------------------------------------------------------------
diff --git a/NOTICE.swfutils b/NOTICE.swfutils
index 91431e3..b82c141 100644
--- a/NOTICE.swfutils
+++ b/NOTICE.swfutils
@@ -1,4 +1,4 @@
-Apache Flex (swfutils.
+Apache Flex (swfutils)
 Copyright 2015 The Apache Software Foundation
 
 This product includes software developed at

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5961345f/README
----------------------------------------------------------------------
diff --git a/README b/README
index dd520e8..a1c18cb 100644
--- a/README
+++ b/README
@@ -89,6 +89,8 @@ Install Prerequisites
 
     Apache Flex TLF source (*6)                 TLF_HOME
 
+    Optional: Flex Messaging Common (* 7)       BLAZEDS_HOME
+
     ==================================================================================
 
     *1) The bin directories for ANT_HOME and JAVA_HOME should be added to your
@@ -138,9 +140,7 @@ Install Prerequisites
     *5) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
             http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
 
-        Use URL above to download playerglobal11_1.swc. Create the directory,
-        player/11.1 and copy playerglobal11_1.swc to
-        player/11.1/playerglobal.swc.
+        Use URL above to download playerglobal11_1.swc.
 
         Set PLAYERGLOBAL_HOME to the absolute path of the player directory (not
         including the version subdirectory). The target-player option controls
@@ -148,17 +148,15 @@ Install Prerequisites
 
         Other more recent versions of Adobe Flash Player playerglobal.swc can be
         downloaded from:
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_2.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_3.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_4.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_5.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_6.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_7.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_8.swc
-            http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_9.swc
-            http://download.macromedia.com/get/flashplayer/updaters/12/playerglobal12_0.swc
-
-        These can be used with Apache Flex but not all have not been fully
+            http://download.macromedia.com/get/flashplayer/updaters/<version.major>/playerglobal<version.major>_<version.minor>.swc
+
+        (e.g. http://download.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc)
+
+        Copy the target playerglobal.swc to the directory:
+
+           frameworks/libs/player/<version.major>.<version.minor>/playerglobal.swc
+    
+        These can be used with the Apache Flex Compiler but not all have not been fully
         tested.
 
     *6) The TLF_HOME variable should point to a folder containing a folder
@@ -166,6 +164,14 @@ Install Prerequisites
         This should be the root of the flex-tlf repository, or can be
         the frameworks/projects folder of an IDE compatible Flex SDK.
 
+    *7) The build scripts assume that the root folder containing the source code 
+        for Apache Flex BlazeDS ('flex-blazeds') is at the same level as the 
+        SDK root folder ('flex-sdk'). See 'Getting the source code', below. If this 
+        is not the case on your system, then you must set the BLAZEDS_HOME environment
+        variable to point to your BLAZEDS root folder. If you are using a released
+        artifact, the source should be included in the artifact, so setting 
+        BLAZEDS_HOME is not required.
+
 Software Dependencies
 ---------------------
 

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5961345f/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index fee0483..1c50922 100644
--- a/build.xml
+++ b/build.xml
@@ -90,7 +90,7 @@
         <ant dir="debugger" target="jar"/>
     </target>
 
-    <target name="swfutils" depends="check-flex-home,swfutils_check" unless="swfutils.bundled"
+    <target name="swfutils_copy" unless="swfutils.bundled"
         description="Copies a subset of files from swfutils.jar into the swfutils folder so flex-compiler-oem and the debugger can use them">
         <mkdir dir="swfutils" />
         <mkdir dir="swfutils/src" />
@@ -147,6 +147,13 @@
                 <include name="java/flash/util/Trace.java"/>
             </fileset>
         </copy>
+    </target>
+    
+    <target name="swfutils" depends="check-flex-home,swfutils_check,swfutils_copy"
+        description="Builds swfutils.jar">
+        <mkdir dir="swfutils" />
+        <mkdir dir="swfutils/src" />
+        <mkdir dir="swfutils/classes" />
         <property name="javac.src" value="1.6"/>
         <javac includes="**/*.java" destdir="${basedir}/swfutils/classes"
             source="${javac.src}" target="${javac.src}">
@@ -315,6 +322,7 @@
                 <include name="LICENSE"/>
                 <include name="LICENSE.base"/>
                 <include name="NOTICE"/>
+                <include name="NOTICE.base"/>
                 <include name="NOTICE.swfutils"/>
                 <include name="RELEASE_NOTES"/>
                 <include name="installer.xml"/>
@@ -454,12 +462,14 @@
     <target name="stage-source-jx"
         description="Package jx source files with other falcon files required to build in zip file" >
         
-        <copy tofile="${basedir}/temp/NOTICE" file="${basedir}/NOTICE.jx" />
-        <copy tofile="${basedir}/temp/LICENSE" file="${basedir}/LICENSE.jx" />
-        <copy todir="${basedir}/temp" file="${basedir}/NOTICE.jx" />
+        <copy tofile="${basedir}/temp/NOTICE" file="${basedir}/NOTICE.jx" overwrite="true" />
+        <copy tofile="${basedir}/temp/LICENSE" file="${basedir}/LICENSE.jx" overwrite="true"/>
+        <copy todir="${basedir}/temp" >
             <fileset dir="${basedir}">
                 <include name="README_JX"/>
                 <include name="RELEASE_NOTES_JX"/>
+                <include name="LICENSE.jx"/>
+                <include name="NOTICE.jx"/>
             </fileset>
         </copy>
         

http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/5961345f/compiler.jx/build.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/build.xml b/compiler.jx/build.xml
index bcc0286..219cc28 100644
--- a/compiler.jx/build.xml
+++ b/compiler.jx/build.xml
@@ -94,7 +94,7 @@
         <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"/>
+        <copy file="${basedir}/../NOTICE.jx" tofile="${classes.dir}/META-INF/NOTICE"/>
         
 		<echo message="Building ${jsc.jar}" />
 		<jar file="${jsc.jar}" basedir="${classes.dir}"