try release packaging based on if AIR_HOME is set or not

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

Branch: refs/heads/packaging
Commit: 5403f13db52367a263f592813c917e6dfd50baef
Parents: c4184c4
Author: Alex Harui <aha...@apache.org>
Authored: Sun Sep 17 20:17:47 2017 -0700
Committer: Alex Harui <aha...@apache.org>
Committed: Sun Sep 17 20:17:47 2017 -0700

----------------------------------------------------------------------
 build.xml | 458 ++++++++++-----------------------------------------------
 1 file changed, 80 insertions(+), 378 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/5403f13d/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 1ff393b..3c87a22 100644
--- a/build.xml
+++ b/build.xml
@@ -61,7 +61,18 @@
             </not>
         </and>
     </condition>
-      
+    <!-- turn off SWF portion of checkintest if no AIR_HOME -->
+    <condition property="runtime.setup">
+        <not>
+            <isset property="env.AIR_HOME" />
+        </not>
+    </condition>
+    <condition property="mxmlc.jar.exists">
+        <not>
+            <isset property="env.AIR_HOME" />
+        </not>
+    </condition>
+    
     <!--
         Optional jars but should be in place for a real release build.
         
@@ -126,12 +137,13 @@
         <echo>copying last flashlog.txt from ${FLASHLOG}</echo>
         <copy file="${FLASHLOG}" tofile="${basedir}/lastflashlog.txt" />
     </target>
-    <!-- 
-        Can set build.additional-packages to build additional-packages as part 
of a release.
-        This does not build the docs.  Use doc-packages or asdoc-packages.
-    -->    
-    <target name="release" 
-        
depends="check-compile-env,check-runtime-env,check-falcon-home,check-falconjx-home,source-release,binary-release,rat-check"
+    
+    <target name="block-flat-fonts">
+        <property name="flat.donot.ask" value="true" />
+    </target>
+    
+    <target name="release"
+        
depends="block-flat-fonts,check-compile-env,check-runtime-env,check-falcon-home,check-falconjx-home,source-release,binary-release,rat-check"
         description="Creates source and binary kits for Apache FlexJS."/>
         
     <target name="release-jenkins" 
@@ -143,11 +155,11 @@
         description="Packages the source release kit which is the official 
Apache release."/>
         
     <target name="binary-release" 
-        
depends="setup-binary-release,main,sample-themes,checkintests,doc,other.locales,check-goog-home,binary-package,additional-packages"
 
+        
depends="setup-binary-release,main,sample-themes,checkintests,check-goog-home,binary-package"
         description="Builds and packages the binary kit which is provided as a 
convenience."/>    
 
     <target name="binary-release-jenkins" 
-        
depends="setup-binary-release,main-jenkins,sample-themes,doc,other.locales,binary-package,additional-packages"
+        
depends="setup-binary-release,main-jenkins,sample-themes,binary-package"
         description="Builds and packages the binary kit which is provided as a 
convenience."/>    
 
     <target name="source-release-noclean" 
@@ -155,17 +167,13 @@
         description="Packages the source release kit which is the official 
Apache release."/>
         
     <target name="binary-release-noclean" 
-        
depends="main,sample-themes,checkintests,doc,other.locales,binary-package,additional-packages"
 
+        depends="main,sample-themes,checkintests,binary-package"
         description="Builds and packages the binary kit which is provided as a 
convenience."/>    
 
     <target name="doc-packages" 
         depends="asdoc-package,javadocs"
         description="Build and package the asdocs for the framework clases and 
the javadocs."/>
                 
-    <target name="additional-packages"
-        depends="ja-locale-samples" 
-        description="Package locale-samples and antTasks."/>
-
     <target name="help">
         <echo message="run ant -projecthelp to see the available targets"/>
     </target>
@@ -459,6 +467,10 @@
     
     <target name="super-clean" depends="thirdparty-clean,clean" 
description="Cleans everything including thirdparty downloads.">
         <delete dir="${basedir}/mustella/tests/basicTests/bin"/>
+        <delete dir="${basedir}/bin" failonerror="false">
+            <include name="**"/>
+            <exclude name=".gitignore"/>
+        </delete>
         <delete dir="${basedir}/lib" failonerror="false" 
includeEmptyDirs="true"/>
         <delete dir="${basedir}/js/lib" failonerror="false" 
includeEmptyDirs="true"/>
         <delete dir="${FLEXJS_HOME}/frameworks/libs/player" 
failonerror="false" includeEmptyDirs="true"/>
@@ -548,10 +560,6 @@
         </ant>
     </target>
 
-    <target name="other.locales" description="Build resource SWCs for 
additional locales">
-        <!--<ant dir="${basedir}/frameworks" target="other.locales"/>-->
-    </target>
-    
     <target name="sample-themes" description="Build the sample themes">
         <!--<ant dir="${basedir}/samples/themes/zen" target="main" /> -->
     </target>
@@ -695,68 +703,62 @@
         <tar-gzip name="${source.kit}" />
     </target>
 
-    <target name="stage-source" depends="stage-source-no-scripts"
+    <target name="stage-source"
         description="Package source files required to build in zip file" >
-        <!-- scripts -->
-        <antcall target="stage-scripts"/>
-    </target>
-        
-    <target name="stage-source-no-scripts" depends="check-flex-home" >
         <antcall target="clean-temp"/>
         <sleep seconds="3" />
         <mkdir dir="${basedir}/temp"/>
        
         <copy todir="${basedir}/temp" includeEmptyDirs="false">
             <fileset dir="${basedir}">
-                <include name="build.xml"/>
-                <include name="build.properties"/>
-                <include name="cordova-build.xml"/>
-                               <include name="env-template.properties"/>
-                <include name="flex-sdk-description.xml"/>
-                <include name="installer.xml"/>
-                <include name="installer.properties/**"/>
-                <include name="READme"/>
-                <include name="RELEASE_NOTES"/>
-                <include name="LICENSE"/>
-                <include name="LICENSE.bin"/>
-                <include name="LICENSE.base"/>
-                <include name="NOTICE"/>
-                <include name="pom.xml"/>
-                <include name="settings-template.xml"/>
+                <include name="**"/>
+                <exclude name=".DS_Store"/>
+                <exclude name="**/.DS_Store"/>
+                <exclude name=".git"/>
+                <exclude name=".mvn"/>
+                <exclude name="in/**"/>
+                <exclude name="manualtests/**"/>
+                <exclude name="marmotinni/**"/>
+                <exclude name="mustella/**"/>
+                <exclude name="src/**"/>
+                <exclude name="testsuite/**"/>
+                <exclude name="vf2js/**"/>
+                <exclude name="**/FlexJSTest_again/**" />
+                <exclude name="**/VanillaSDK_POC/**" />
+                <exclude name="**/*.swc"/>
+                <exclude name="**/*.swf"/>
+                <exclude name="**/.plxarc"/>
+                <exclude name="**/.settings/**"/>
+                <exclude name="**/*.actionScriptProperties"/>
+                <exclude name="**/*.flexLibProperties"/>
+                <exclude name="frameworks/fb.properties"/>
+                <exclude name="frameworks/fonts/**"/>
+                <exclude name="frameworks/test*/**"/>
+                <exclude name="frameworks/js/VanillaSDK/**"/>
+                <exclude name="**/target/**"/>
+                <exclude name="**/*.iml"/>
             </fileset>
         </copy>
-         
-        <!-- frameworks -->
-        <antcall target="stage-framework-as"/>
         
-        <!-- asdoc -->
-        <copy todir="${basedir}/temp/asdoc" includeEmptyDirs="false">
-            <fileset dir="${basedir}/asdoc">
-               <exclude name="test/**" />
-            </fileset>
-        </copy>
-
-        <!-- bundle the templates from the current Flex SDK -->
-        <copy todir="${basedir}/temp">
-            <fileset dir="${FLEX_SDK_HOME}" >
-                <include name="templates/swfobject/**"/>
-                <exclude name="templates/swfobject/index.template.html"/>
-                <exclude name="**/expressInstall.swf"/>
-                <exclude name="**/swfobject.js"/>
-            </fileset>
-        </copy>
-
-        <copy todir="${basedir}/temp/ide">
-            <fileset dir="${basedir}/ide" >
-               <include name="**"/>
-            </fileset>
-        </copy>
+        <tstamp>
+            <format property="build.number.date" pattern="yyyyMMdd" />
+        </tstamp>
+        <property name="build.version" 
value="${release.version}.${build.number.date}" />
+        
+        <!-- now that config xml files are in temp, fix them up for release. 
-->
+        <echo message="Updating config file air-config.xml with version 
${build.version}"/>
+        <fix-config-file 
file="${basedir}/temp/frameworks/air-config-template.xml" 
version="${build.version}" />
+        <echo message="Updating config file flex-config.xml with version 
${build.version}"/>
+        <fix-config-file 
file="${basedir}/temp/frameworks/flex-config-template.xml" 
version="${build.version}" />
+        <echo message="Updating config file js-config.xml with version 
${build.version}"/>
+        <fix-config-file 
file="${basedir}/temp/frameworks/js-config-template.xml" 
version="${build.version}" />
+        <echo message="Updating config file jquery-config.xml with version 
${build.version}"/>
+        <fix-config-file 
file="${basedir}/temp/frameworks/jquery-config-template.xml" 
version="${build.version}" />
+        <echo message="Updating config file createjs-config.xml with version 
${build.version}"/>
+        <fix-config-file 
file="${basedir}/temp/frameworks/createjs-config-template.xml" 
version="${build.version}" />
+        <echo message="Updating config file node-config.xml with version 
${build.version}"/>
+        <fix-config-file 
file="${basedir}/temp/frameworks/node-config-template.xml" 
version="${build.version}" />
         
-        <copy todir="${basedir}/temp/js/bin">
-            <fileset dir="${basedir}/js/bin" >
-               <include name="**"/>
-            </fileset>
-        </copy>
         
         <fixcrlf srcdir="${basedir}/temp/js/bin" eol="crlf" fixlast="false">
             <include name="**/*.bat"/>
@@ -769,29 +771,7 @@
         
         <chmod dir="${basedir}/temp/js/bin" excludes="**/*.bat" perm="+x" />
         
-        <!-- samples -->
-        <copy todir="${basedir}/temp/examples">
-            <fileset dir="${basedir}/examples" >
-                <exclude name="**/FlexJSTest_again/**" />
-                <exclude name="**/VanillaSDK_POC/**" />
-                <exclude name="**/*.swc"/>
-                <exclude name="**/*.swf"/>
-                <exclude name="**/.plxarc"/>
-            </fileset>
-        </copy>
-        
-        <!-- templates -->
-        <copy todir="${basedir}/temp/templates">
-            <fileset dir="${basedir}/templates" >
-                <include name="swfobject/**"/>
-                <exclude name="**/*.swf"/>
-                <exclude name="**/swfobject.js"/>
-            </fileset>
-        </copy>
-
-        <antcall target="copy-maven-archetypes"/>
-        <antcall target="copy-maven-distribution"/>
-        <!-- 
+        <!--
              Source files have Windows line endings.  Most UNIX editors can 
handle
              either type of line endings but the converse is often not true.   
          
         -->
@@ -819,98 +799,6 @@
         </fixcrlf>
     </target>
 
-    <!-- frameworks -->
-    <!-- javascript and test directories follow -->
-    <target name="stage-framework-as">
-        <copy todir="${basedir}/temp/frameworks" includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks">
-                <include name="**"/>
-                <exclude name="**/libs/**"/>
-                <exclude name="**/out/**"/>
-                <exclude name="**/*.swc"/>
-                <exclude name="**/*.pbj"/>
-                <exclude name="**/*.swf"/>
-                <exclude name="**/*.mxp"/>
-                <exclude name="fb.properties"/>
-                <exclude name="fonts/**"/>
-                <exclude name="test*/**"/>
-                <exclude name="js/VanillaSDK/**"/>
-                <exclude name="projects/air/**"/>
-                <exclude name="projects/spark/manifest.xml"/>
-                <exclude name="projects/*/bundles.properties"/>
-                <exclude name="**/.settings/**"/>
-                <exclude name="**/*.actionScriptProperties"/>
-                <exclude name="**/*.flexLibProperties"/>
-                <exclude name="**/.plxarc"/>
-                <exclude name="projects/**/*.DS_Store"/>
-            </fileset>
-        </copy>
-        <copy todir="${basedir}/temp/frameworks" includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks">
-                <include name="air-config-template.xml"/>
-                <include name="flex-config-template.xml"/>
-                <include name="js-config-template.xml"/>
-                <include name="jquery-config-template.xml"/>
-                <include name="createjs-config-template.xml"/>
-                <include name="node-config-template.xml"/>
-            </fileset>
-        </copy>
-
-        <tstamp>
-               <format property="build.number.date" pattern="yyyyMMdd" />
-        </tstamp>
-        <property name="build.version" 
value="${release.version}.${build.number.date}" />
-
-        <!-- now that config xml files are in temp, fix them up for release. 
-->
-        <echo message="Updating config file air-config.xml with version 
${build.version}"/>
-        <fix-config-file 
file="${basedir}/temp/frameworks/air-config-template.xml" 
version="${build.version}" />
-        <echo message="Updating config file flex-config.xml with version 
${build.version}"/>
-        <fix-config-file 
file="${basedir}/temp/frameworks/flex-config-template.xml" 
version="${build.version}" />
-        <echo message="Updating config file js-config.xml with version 
${build.version}"/>
-        <fix-config-file 
file="${basedir}/temp/frameworks/js-config-template.xml" 
version="${build.version}" />
-        <echo message="Updating config file jquery-config.xml with version 
${build.version}"/>
-        <fix-config-file 
file="${basedir}/temp/frameworks/jquery-config-template.xml" 
version="${build.version}" />
-        <echo message="Updating config file createjs-config.xml with version 
${build.version}"/>
-        <fix-config-file 
file="${basedir}/temp/frameworks/createjs-config-template.xml" 
version="${build.version}" />
-        <echo message="Updating config file node-config.xml with version 
${build.version}"/>
-        <fix-config-file 
file="${basedir}/temp/frameworks/node-config-template.xml" 
version="${build.version}" />
-        
-        <!-- Update all Version.as files in the kit frameworks directory with 
build.number -->
-        <!--<antcall target="version-update"/>-->
-    </target>
-
-    <target name="stage-scripts" description="package ide conversion scripts">
-        <!-- deploy scripts -->
-        <copy todir="${basedir}/temp/scripts">
-            <fileset dir="${basedir}/scripts" >
-                <include name="**/*"/>
-            </fileset>
-        </copy>
-    </target>
-    
-    <target name="stage-nightly" if="nightly" description="add 
nightly.properties if nightly build">
-        <copy todir="${basedir}/temp" file="${basedir}/nightly.properties" />
-    </target>
-
-    <target name="copy-maven-distribution" description="copying maven 
distribution folder for binary-package">
-        <echo message="Copying Maven distribution folder" />
-        <copy todir="${basedir}/temp/distribution">
-           <fileset dir="${basedir}/distribution">
-                <exclude name="**/target/**"/>
-           </fileset>
-        </copy>
-    </target>
-
-    <target name="copy-maven-archetypes" description="copying maven archetypes 
folder for binary-package">
-        <echo message="Copying Maven archetypes folder" />
-        <copy todir="${basedir}/temp/archetypes">
-            <fileset dir="${basedir}/archetypes">
-                <exclude name="**/target/**"/>
-                <exclude name="**/*.iml"/>
-            </fileset>
-        </copy>
-    </target>
-
     <target name="binary-package"
         description="Package binary files in zip and tar-gzip file.">
 
@@ -926,78 +814,11 @@
             </fileset>
         </delete>
 
-        <antcall target="stage-nightly" />
-        
-        <!-- these files are in addition to the remaining source files -->
-        
         <!-- concat the license file with the binary license file for the 3rd 
party deps -->
         <concat destfile="${basedir}/temp/LICENSE">
             <filelist dir="${basedir}" files="LICENSE,LICENSE.bin"/>
         </concat>
         
-        <!-- frameworks/libs -->
-        <copy todir="${basedir}/temp/frameworks">
-            <fileset dir="${basedir}/frameworks">
-                <include name="**/*.swc"/>
-            </fileset>
-        </copy>
-
-        <!-- copy all js again to pick up cross-compiled files -->
-        <copy todir="${basedir}/temp/frameworks">
-            <fileset dir="${basedir}/frameworks">
-                <include name="**/**.js"/>
-                <exclude name="js/VanillaSDK/**" />
-            </fileset>
-        </copy>
-
-        <!-- falcon
-        <antcall target="stage-falcon"/>
-         -->
-         
-        <!-- falconjx
-        <antcall target="stage-falconjx"/>
-         -->
-         
-        <!-- ide
-        <copy todir="${basedir}/temp/ide">
-            <fileset dir="${basedir}/ide" >
-                <include name="flashbuilder/config"/>
-            </fileset>
-        </copy>
-         -->
-         
-         <!-- fonts
-          <copy todir="${basedir}/temp/frameworks/fonts">
-              <fileset dir="${basedir}/frameworks/fonts" >
-                  <include name="**/*.swf"/>
-              </fileset>
-          </copy>
-          -->
-         
-        <!-- examples -->
-        <copy todir="${basedir}/temp/examples">
-            <fileset dir="${basedir}/examples" >
-                <exclude name="**/FlexJSTest_again/**" />
-                <exclude name="**/VanillaSDK_POC/**" />
-                <include name="**/build.xml"/>
-                <include name="**/*.swc"/>
-                <include name="**/*.swf"/>
-            </fileset>
-        </copy>
-
-               <antcall target="copy-maven-distribution"/>
-        <antcall target="copy-maven-archetypes"/>
-        <!-- swfobject templates except for downloaded files
-        <copy todir="${basedir}/temp/templates/swfobject">
-            <fileset dir="${basedir}/templates/swfobject">
-                <exclude name="**/expressInstall.swf"/>
-                <exclude name="**/swfobject.js"/>
-            </fileset>
-        </copy>
-         -->
-       
-       <!-- Google Closure Library -->
-       <!-- If GOOG_HOME is set, copy GCL from there, else copy from the 
downloaded folder -->
        <antcall target="copy-gcl-from-goog-home"/>
        <antcall target="copy-gcl-from-downloaded"/>
         
@@ -1163,110 +984,7 @@
         <echo message="Version files not updated."/>
         <echo message="AntelopeTasks_*.jar not found in anttask.classpath"/>
     </target>   
-
-    <target name="stage-locales"
-        description="Stage all the locale swc's built">
-        
-        <copy todir="${basedir}/temp/frameworks/locale" 
includeEmptyDirs="false">
-            <fileset dir="${basedir}/frameworks/locale">
-                <include name="**/*.swc"/>
-            </fileset>
-        </copy>
-
-        <!-- frameworks/projects -->
-        <!--
-            Remove these files from the binary kit.
-            
-            copylocale looks for bundles and then uses default locale so if 
there is
-            not a locale sub-directory don't include the bundles directory.
-        -->
-        <delete dir="${basedir}/temp/frameworks/projects" 
includeEmptyDirs="false">
-            <include name="airspark/bundles/**"/>
-            <include name="automation_air/bundles/**"/>
-            <include name="automation_dmv/bundles/**"/>
-            <include name="automation_flashflexkit/bundles/**"/>
-            <include name="automation_spark/bundles/**"/>
-            <include name="*/bundles/**/empty.properties"/>
-            <include name="*/bundles/**/docs/**"/>
-            <include name="*/bundles/*/*.xml"/>
-            <include name="*/bundles/*/packages.dita"/>
-            <exclude name="*/bundles/${locale}"/>
-        </delete>
-        
-
-        <!-- lib -->
-        <!-- these are built when the compiler is built with localized.jars 
set -->
-        <copy todir="${basedir}/temp/lib">
-            <fileset dir="${basedir}/lib">
-                <include name="mxmlc_da.jar"/>
-                <include name="mxmlc_de.jar"/>
-                <include name="mxmlc_es.jar"/>
-                <include name="mxmlc_fi.jar"/>
-                <include name="mxmlc_fr.jar"/>
-                <include name="mxmlc_it.jar"/>
-                <include name="mxmlc_ja.jar"/>
-                <include name="mxmlc_ko.jar"/>
-                <include name="mxmlc_nb.jar"/>
-                <include name="mxmlc_nl.jar"/>
-                <include name="mxmlc_pt.jar"/>
-                <include name="mxmlc_ru.jar"/>
-                <include name="mxmlc_sv.jar"/>
-                <include name="mxmlc_zh_CN.jar"/>
-                <include name="mxmlc_zh_TW.jar"/>
-            </fileset>
-        </copy>
-        
-        <!-- FixMe: Apache is missing all these language jars. -->
-        <copy todir="${basedir}/temp/lib">
-            <fileset dir="${basedir}/lib">
-                <include name="batik_da.jar"/>
-                <include name="batik_de.jar"/>
-                <include name="batik_es.jar"/>
-                <include name="batik_fi.jar"/>
-                <include name="batik_fr.jar"/>
-                <include name="batik_it.jar"/>
-                <include name="batik_ko.jar"/>
-                <include name="batik_ja.jar"/>
-                <include name="batik_nb.jar"/>
-                <include name="batik_nl.jar"/>
-                <include name="batik_pt.jar"/>
-                <include name="batik_ru.jar"/>
-                <include name="batik_sv.jar"/>
-                <include name="batik_zh_CN.jar"/>
-                <include name="batik_zh_TW.jar"/>
-                <include name="xercesImpl_da.jar"/>
-                <include name="xercesImpl_de.jar"/>
-                <include name="xercesImpl_es.jar"/>
-                <include name="xercesImpl_fi.jar"/>
-                <include name="xercesImpl_fr.jar"/>
-                <include name="xercesImpl_it.jar"/>
-                <include name="xercesImpl_ko.jar"/>
-                <include name="xercesImpl_ja.jar"/>
-                <include name="xercesImpl_nb.jar"/>
-                <include name="xercesImpl_nl.jar"/>
-                <include name="xercesImpl_pt.jar"/>
-                <include name="xercesImpl_ru.jar"/>
-                <include name="xercesImpl_sv.jar"/>
-                <include name="xercesImpl_zh_CN.jar"/>
-                <include name="xercesImpl_zh_TW.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="ja-locale-samples" if="build.additional-packages">
-        <antcall target="clean-temp"/>
-        <!--
-        <copy todir="${basedir}/temp/samples_ja">
-            <fileset dir="${basedir}/samples/ja_JP">
-                <include name="README_ja.txt"/>
-                <include name="explorer/**"/>
-            </fileset>
-        </copy>
-        <mkdir dir="${basedir}/out"/>
-        <zip file="${basedir}/out/${kit.prefix}-locales.zip" 
basedir="${basedir}/temp" includes="**"/>
-        -->
-    </target>
-     
+    
     <target name="asdoc-package" description="Package the asdocs">      
         <antcall target="clean-temp"/>
         <antcall target="asdoc"/>
@@ -1280,24 +998,10 @@
         <antcall target="clean-temp"/>
     </target>
 
-    
-    <target name="air-installers" description="Copy AIR runtime installers 
from sdk/in to sdk/out">
-        <mkdir dir="${basedir}/out"/>
-        <copy todir="${basedir}/out">
-            <fileset file="${basedir}/in/air/mac/Adobe AIR.dmg"/>
-            <fileset file="${basedir}/in/air/win/Adobe AIR Installer.exe"/>
-        </copy>
-    </target>
-
     <target name="clean-temp" unless="noclean.temp">
         <delete dir="${basedir}/temp" failonerror="false" 
includeEmptyDirs="true"/>
     </target>
 
-    <!-- Builds fat swcs. -->
-    <target name="doc">
-        <!--<ant dir="${basedir}/frameworks" target="doc" />-->
-    </target>
-
     <!--
         Tests: The current checkintests that must be run before every checkin
     -->
@@ -1390,8 +1094,7 @@
 
     </target>
     
-    <target name="basictests-compile-js">
-        <!-- now built by dual mode
+    <target name="basictests-compile-js" unless="env.AIR_HOME">
         <property name="FLEX_HOME" value="${FLEXJS_HOME}"/>
         <property name="FALCONJX_REPO" value="${env.FALCONJX_REPO}"/>
         <property name="GOOG_HOME" value="${env.GOOG_HOME}"/>
@@ -1404,6 +1107,7 @@
             <jvmarg line="${mxmlc.jvm.args}"/>
             <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
             <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+            <arg value="-targets=JSFlex" />
             <arg value="-debug" />
             <arg value="-compiler.mxml.children-as-data" />
             <arg 
value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent"
 />
@@ -1412,7 +1116,6 @@
             <arg value="+playerglobal.version=${playerglobal.version}" />
             <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
             <arg value="-library-path+=${FLEX_SDK_HOME}/mustella/mustella.swc" 
/>
-            <arg value="-js-output-type=FLEXJS" />
             <arg value="-closure-lib=${GOOG_HOME}" />
             <arg value="-sdk-js-lib=${FLEXJS_HOME}/mustella/js" />
             <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" 
/>
@@ -1428,7 +1131,6 @@
                 </not>
             </condition>
         </fail>
-         -->
     </target>
     
     <target name="basictests-compile-java" >
@@ -1496,9 +1198,9 @@
         Tests: Mustella checkintests
     -->
 
-    <target name="basictests-mustella" depends="mustella-setup,basictests"/>
+    <target name="basictests-mustella" depends="mustella-setup,basictests" 
if="env.AIR_HOME"/>
 
-    <target name="mustella-setup" depends="prebuild,runtime-setup" 
description="compile mustella java file">
+    <target name="mustella-setup" depends="prebuild,runtime-setup" 
description="compile mustella java file"  if="env.AIR_HOME">
     <!--
         <ant dir="${basedir}/mustella" target="makemustellaswc">
             <property name="use_mustella_framework_dir" value="false"/>
@@ -1511,7 +1213,7 @@
     <!-- To run the checkintests as well as any mustella tests need AIR for 
the adl and
          a flash player content debugger.
     -->
-    <target name="check-runtime-env" depends="check-air-home"
+    <target name="check-runtime-env" depends="check-air-home" if="env.AIR_HOME"
         description="Check for the required runtime environment variables for 
the checkintests">
         
         <available file="${env.FLASHPLAYER_DEBUGGER}" 
property="FLASHPLAYER_DEBUGGER.set"/>
@@ -1542,13 +1244,13 @@
         <property name="runtime.setup" value="done"/>
     </target>
 
-    <target name="load-task" depends="runtime-setup">
+    <target name="load-task" depends="runtime-setup" if="env.AIR_HOME">
         <!-- load the <mxmlc> task; we can't do this at the <project> level -->
         <!-- because targets that run before flexTasks.jar gets built would 
fail -->
         <taskdef resource="flexTasks.tasks" 
classpath="${basedir}/lib/falcon-flexTasks.jar"/>
     </target>
 
-    <target name="basictests" depends="check-flex-home,load-task" 
description="run basic tests using mustella">
+    <target name="basictests" depends="check-flex-home,load-task" 
description="run basic tests using mustella"  if="env.AIR_HOME">
 
         <property name="FLEX_HOME" value="${basedir}" />
         <mxmlc fork="true" debug="true"

Reply via email to