You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2012/07/06 21:05:59 UTC
svn commit: r1358354 - in /incubator/flex/trunk: LICENSE build.xml
ide/flashbuilder/build.xml
Author: aharui
Date: Fri Jul 6 19:05:59 2012
New Revision: 1358354
URL: http://svn.apache.org/viewvc?rev=1358354&view=rev
Log:
Fixes recommend by Bertrand, and a problem with RSL configs
Modified:
incubator/flex/trunk/LICENSE
incubator/flex/trunk/build.xml
incubator/flex/trunk/ide/flashbuilder/build.xml
Modified: incubator/flex/trunk/LICENSE
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/LICENSE?rev=1358354&r1=1358353&r2=1358354&view=diff
==============================================================================
--- incubator/flex/trunk/LICENSE (original)
+++ incubator/flex/trunk/LICENSE Fri Jul 6 19:05:59 2012
@@ -237,16 +237,6 @@ on what was used in this product.
------------------------------------------------------------------------------------------
-For the asc compiler in modules/asc:
-
-/*
- * Written by Jeff Dyer
- * Copyright (c) 1998-2003 Mountain View Compiler Company
- * All rights reserved.
- */
-
-------------------------------------------------------------------------------------------
-
For all directories except for the asc compiler in modules/asc, and modules/thirdparty
directories:
Modified: incubator/flex/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/build.xml?rev=1358354&r1=1358353&r2=1358354&view=diff
==============================================================================
--- incubator/flex/trunk/build.xml (original)
+++ incubator/flex/trunk/build.xml Fri Jul 6 19:05:59 2012
@@ -501,7 +501,6 @@
<include name="build.properties"/>
<include name="env-template.properties"/>
<include name="flex-sdk-description.xml"/>
- <include name="KEYS"/>
<include name="CHANGES"/>
<include name="DISCLAIMER"/>
<include name="LICENSE"/>
@@ -1181,6 +1180,13 @@
<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" />
+ <include name="DISCLAIMER" />
+ </fileset>
+ </copy>
<zip file="${basedir}/out/${kit.prefix}-asdocs.zip" basedir="${basedir}/temp"/>
<antcall target="clean-temp"/>
</target>
Modified: incubator/flex/trunk/ide/flashbuilder/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/build.xml?rev=1358354&r1=1358353&r2=1358354&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/build.xml (original)
+++ incubator/flex/trunk/ide/flashbuilder/build.xml Fri Jul 6 19:05:59 2012
@@ -96,6 +96,9 @@
<replacefilter
token="{playerglobalHome}"
value="libs/player"/>
+ <replacefilter
+ token="$${build.number}"
+ value="${release.version}.${build.number}"/>
</replace>
</sequential>
</macrodef>