You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jm...@apache.org on 2014/04/09 23:58:10 UTC

[1/4] git commit: [flex-flexunit] [refs/heads/release4.2.0] - Removed dependancy on PMD (while useful not every one has it and it's in the process of being donated) and added ASDocs target

Repository: flex-flexunit
Updated Branches:
  refs/heads/release4.2.0 09a1a4994 -> 7e31195c9


Removed dependancy on PMD (while useful not every one has it and it's in the process of being donated) and added ASDocs target


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

Branch: refs/heads/release4.2.0
Commit: ac33050049c17bf03dbc5f0311c6c4ced0e6f168
Parents: 09a1a49
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Apr 10 07:47:15 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Apr 10 07:47:15 2014 +1000

----------------------------------------------------------------------
 FlexUnit4/build.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/ac330500/FlexUnit4/build.xml
----------------------------------------------------------------------
diff --git a/FlexUnit4/build.xml b/FlexUnit4/build.xml
index d5d8d4d..c5dc53e 100644
--- a/FlexUnit4/build.xml
+++ b/FlexUnit4/build.xml
@@ -161,6 +161,22 @@
       </java>
    </target>
    
+   <target name="asdocs" description="AS docs">
+      <!-- Pull in class file list to use with asdoc -->
+      <property file="${bin.loc}/flexLib.properties" />
+
+      <!-- Generate asdocs -->
+      <java jar="${FLEX_HOME}/lib/asdoc.jar" fork="true" failonerror="true">
+         <jvmarg value="-Xmx256M" />
+         <arg line="+flexlib '${FLEX_HOME}/frameworks'" />
+         <arg line="-doc-classes ${src.class-list}" />
+         <arg line="-source-path+='${src.loc}'" />
+         <arg line="-output '${doc.loc}'" />
+         <arg line="-library-path+='${lib.loc}'" />
+         <arg line="-define=CONFIG::useFlexClasses,true" />
+      </java>
+   </target>
+	
    <target name="pmdReport" if="build.pmd">
       <taskdef name="pmd" classname="com.adobe.ac.pmd.ant.FlexPmdAntTask" />
       <taskdef name="cpd" classname="com.adobe.ac.cpd.ant.FlexCpdAntTask" />
@@ -179,7 +195,7 @@
       <metrics sourcedirectory="${src.loc}" outputfile="${report.loc}/javancss.xml" />
    </target>
 
-   <target name="package" depends="package-default,package-instrument,report" />
+   <target name="package" depends="package-default,package-instrument,asdocs" />
 
    <target name="package-default" depends="compile">
       <copy file="${bin.loc}/${build.finalName.as3}.${build.packaging}" todir="${dist.loc}" />


[4/4] git commit: [flex-flexunit] [refs/heads/release4.2.0] - update build number

Posted by jm...@apache.org.
update build number


Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/7e31195c
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/7e31195c
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/7e31195c

Branch: refs/heads/release4.2.0
Commit: 7e31195c9b4f76c6587bbd6e060773d4a30cbedf
Parents: c8a68d6
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Apr 10 07:57:55 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Apr 10 07:57:55 2014 +1000

----------------------------------------------------------------------
 version.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/7e31195c/version.properties
----------------------------------------------------------------------
diff --git a/version.properties b/version.properties
index 83ada49..56c494a 100644
--- a/version.properties
+++ b/version.properties
@@ -15,5 +15,5 @@
 
 build.groupId=org.flexunit
 build.version=4.2.0
-build.number=20140331
+build.number=20140410
 build.sdk=4.12.0


[2/4] git commit: [flex-flexunit] [refs/heads/release4.2.0] - Added MIT and BSD licenses

Posted by jm...@apache.org.
Added MIT and BSD licenses


Project: http://git-wip-us.apache.org/repos/asf/flex-flexunit/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-flexunit/commit/71fdd974
Tree: http://git-wip-us.apache.org/repos/asf/flex-flexunit/tree/71fdd974
Diff: http://git-wip-us.apache.org/repos/asf/flex-flexunit/diff/71fdd974

Branch: refs/heads/release4.2.0
Commit: 71fdd974fbac520017a5f3be538a97a52bf89471
Parents: ac33050
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Apr 10 07:47:38 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Apr 10 07:47:38 2014 +1000

----------------------------------------------------------------------
 LICENSE | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/71fdd974/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index d645695..c2234cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -200,3 +200,17 @@
    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.
+   
+   
+   Some of the code in the directories FlexUnit4UIListener and
+   FlexUnit4CIListener of FLexUnit is based on Flex Unit 1. This code is
+   licensed under the BSD 3-clause license and copyright (c) 2003-2010 by
+   Adobe Systems Incorporated. See the file headers for the full license text.
+   
+   
+   The file PromptingTextInput.as is licensed under the MIT license and
+   copyright (c) 2007 FlexLib Contributors. See the file header for
+   the full license text.
+   
+   
+   


[3/4] git commit: [flex-flexunit] [refs/heads/release4.2.0] - Ignore the 2 Adobe BSD licensed files

Posted by jm...@apache.org.
Ignore the 2 Adobe BSD licensed files


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

Branch: refs/heads/release4.2.0
Commit: c8a68d6dc14469c2b738c4a36697dd0163e9241c
Parents: 71fdd97
Author: Justin Mclean <jm...@apache.org>
Authored: Thu Apr 10 07:57:39 2014 +1000
Committer: Justin Mclean <jm...@apache.org>
Committed: Thu Apr 10 07:57:39 2014 +1000

----------------------------------------------------------------------
 build.xml | 3 +++
 1 file changed, 3 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-flexunit/blob/c8a68d6d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 8389fd9..a10100a 100644
--- a/build.xml
+++ b/build.xml
@@ -418,8 +418,11 @@ to contribute to our CI process.
                 <exclude name="**/.idea/**"/>
                 <exclude name="**/*.iml"/>
             	<exclude name="**/flexUnit1/**/*.as" />
+		<!--- BSD/MIT licences -->
             	<exclude name="**/FlexUnit4UIListener/**/*.as" />
                 <exclude name="**/FlexUnit4UIListener/**/*.mxml" />
+                <exclude name="**/FlexUnit4CIListener/**/TestCaseReport.as" />
+                <exclude name="**/FlexUnit4CIListener/**/TestSuiteReport.as" />
             	
 				<!-- NOTICE and LICENSE files -->
             	<exclude name="**/*LICENSE*"/>