You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/05/25 00:28:05 UTC
svn commit: r1342463 - in /incubator/flex/trunk: frameworks/build.xml
frameworks/projects/mobiletheme/build.xml
frameworks/projects/spark_dmv/build.xml
frameworks/projects/wireframe/build.xml modules/build.xml
Author: cframpton
Date: Thu May 24 22:28:04 2012
New Revision: 1342463
URL: http://svn.apache.org/viewvc?rev=1342463&view=rev
Log:
Remove osmf from build files where it isn't actually needed in preparation for making it an optional component. Also don't add textLayout src to frameworks/projects/textLayout which was there only for debugging convenience since we use the downloaded textLayout.swc.
Modified:
incubator/flex/trunk/frameworks/build.xml
incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml
incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml
incubator/flex/trunk/frameworks/projects/wireframe/build.xml
incubator/flex/trunk/modules/build.xml
Modified: incubator/flex/trunk/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/build.xml?rev=1342463&r1=1342462&r2=1342463&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/build.xml (original)
+++ incubator/flex/trunk/frameworks/build.xml Thu May 24 22:28:04 2012
@@ -306,7 +306,7 @@ tar -xjf "AIR Integration Kit.tbz2"
<target name="thirdparty-downloads"
depends="osmf-download,swfobject-download,textLayout-download"
description="Copies third-party software into place for build">
- <echo message="Use the thirdparty-clean target to remove these."/>
+ <echo message="Use thirdparty-clean or super-clean to remove these."/>
</target>
<target name="airsdk-check" description="Checks if the Air SDK has been downloaded.">
@@ -394,14 +394,14 @@ tar -xjf "AIR Integration Kit.tbz2"
verbose="false"/>
<unzip dest="${FLEX_HOME}/in/downloads/textLayout_build" src="${FLEX_HOME}/in/downloads/textLayout_build.zip" />
<copy file="${FLEX_HOME}/in/downloads/textLayout_build/libs/textLayout.swc" todir="${basedir}/libs"/>
- <copy todir="${basedir}/projects/textLayout">
+ <!--copy todir="${basedir}/projects/textLayout">
<fileset dir="${FLEX_HOME}/in/downloads/textLayout_build">
<include name="**/**"/>
<exclude name="textLayout_build.zip"/>
<exclude name="build.xml"/>
<exclude name="libs/**"/>
</fileset>
- </copy>
+ </copy-->
<delete dir="${FLEX_HOME}/in/downloads/textLayout_build" failonerror="false"/>
</target>
Modified: incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml?rev=1342463&r1=1342462&r2=1342463&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/mobiletheme/build.xml Thu May 24 22:28:04 2012
@@ -73,7 +73,6 @@
<include name="framework.swc"/>
<include name="spark.swc"/>
<include name="textLayout.swc"/>
- <include name="osmf.swc"/>
</external-library-path>
<external-library-path dir="${FLEX_HOME}/frameworks/libs/mobile">
<include name="mobilecomponents.swc" />
Modified: incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml?rev=1342463&r1=1342462&r2=1342463&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/spark_dmv/build.xml Thu May 24 22:28:04 2012
@@ -76,7 +76,6 @@
<include name="spark.swc"/>
<include name="mx/mx.swc"/>
<include name="advancedgrids.swc"/>
- <include name="osmf.swc"/>
<include name="textLayout.swc"/>
</external-library-path>
<include-file name="version.properties" path="${FLEX_HOME}/frameworks/version.properties"/>
Modified: incubator/flex/trunk/frameworks/projects/wireframe/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/frameworks/projects/wireframe/build.xml?rev=1342463&r1=1342462&r2=1342463&view=diff
==============================================================================
--- incubator/flex/trunk/frameworks/projects/wireframe/build.xml (original)
+++ incubator/flex/trunk/frameworks/projects/wireframe/build.xml Thu May 24 22:28:04 2012
@@ -75,7 +75,6 @@
<include name="spark.swc"/>
<include name="airspark.swc"/>
<include name="textLayout.swc"/>
- <include name="osmf.swc"/>
</external-library-path>
<include-file name="defaults.css" path="${basedir}/defaults.css"/>
<include-file name="assets/Tree_folderClosedIcon.png" path="${basedir}/assets/Tree_folderClosedIcon.png"/>
Modified: incubator/flex/trunk/modules/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/modules/build.xml?rev=1342463&r1=1342462&r2=1342463&view=diff
==============================================================================
--- incubator/flex/trunk/modules/build.xml (original)
+++ incubator/flex/trunk/modules/build.xml Thu May 24 22:28:04 2012
@@ -62,7 +62,7 @@
<target name="thirdparty-downloads" unless="downloads.jar.done"
description="Downloads all the required thirdparty JARs.">
<ant antfile="${basedir}/downloads.xml" target="main" dir="${basedir}"/>
- <echo message="Use the thirdparty-clean target to remove these."/>
+ <echo message="Use thirdparty-clean or super-clean to remove these."/>
<property name="downloads.jar.done" value="true"/>
</target>