incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1383445 - in /incubator/flex/utilities/trunk/installer: README build.xml
Date Tue, 11 Sep 2012 15:17:19 GMT
Author: cframpton
Date: Tue Sep 11 15:17:18 2012
New Revision: 1383445

URL: http://svn.apache.org/viewvc?rev=1383445&view=rev
Log:
Allow FLEX_HOME to be set via an environment variable.

        If FLEX_HOME is not set with -DFLEX_HOME=/path/to/flex/sdk on the ant command line

        use the environment variable, if it exists. Else if windows, use FLEX_HOME_WIN 
        else use FLEX_HOME_MAC, which are both defined in build.properties.

Modified:
    incubator/flex/utilities/trunk/installer/README
    incubator/flex/utilities/trunk/installer/build.xml

Modified: incubator/flex/utilities/trunk/installer/README
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/README?rev=1383445&r1=1383444&r2=1383445&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/README (original)
+++ incubator/flex/utilities/trunk/installer/README Tue Sep 11 15:17:18 2012
@@ -69,11 +69,12 @@ How to build the installer using ANT (no
         ant build [-DFLEX_HOME=/path/to/apache/flex/sdk] [-DAIR_HOME=/path/to/air/sdk]
         
     FLEX_HOME is the absolute path to the Apache Flex SDK
-        If you omit this argument, the FLEX_HOME_MAC or FLEX_HOME_WIN property in 
+        If you omit this argument, and the system environment variable, FLEX_HOME exists,
+        it is used.  Otherwise, the FLEX_HOME_MAC or FLEX_HOME_WIN property in 
         installer/build.properties is used.
         
     AIR_HOME is the absolute path to the Adobe AIR SDK
-        If you omit this argument, and the system environment variable, AIR_HOME, exists,
+        If you omit this argument, and the system environment variable, AIR_HOME exists,
         it is used.  Otherwise, the AIR_HOME_MAC or AIR_HOME_WIN property in 
         installer/build.properties is used.
           	

Modified: incubator/flex/utilities/trunk/installer/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/utilities/trunk/installer/build.xml?rev=1383445&r1=1383444&r2=1383445&view=diff
==============================================================================
--- incubator/flex/utilities/trunk/installer/build.xml (original)
+++ incubator/flex/utilities/trunk/installer/build.xml Tue Sep 11 15:17:18 2012
@@ -33,16 +33,33 @@
     <property name="source.kit" value="${kit.prefix}-src"/>
     <property name="binary.kit" value="${kit.prefix}-bin"/>
 
-    <!-- properties are immutable so value frozen first time property is set -->
+    <!-- 
+        Properties are immutable so value frozen first time property is set.
+        If FLEX_HOME is not set with -DFLEX_HOME=/path/to/flex/sdk on the ant command line

+        use the environment variable, if it exists. Else if windows, use FLEX_HOME_WIN 
+        else use FLEX_HOME_MAC, which are both defined in build.properties.
+    -->
+    <condition property="FLEX_HOME" value="${env.FLEX_HOME}">
+        <isset property="env.FLEX_HOME" />
+    </condition>
     <condition property="FLEX_HOME" value="${FLEX_HOME_WIN}">
         <os family="windows"/>
     </condition>
     <property name="FLEX_HOME" value="${FLEX_HOME_MAC}"/>
 
-    <condition property="env.AIR_HOME" value="${AIR_HOME_WIN}">
+    <!-- 
+        Properties are immutable so value frozen first time property is set.
+        If AIR_HOME is not set on the command line with -DAIR_HOME=/path/to/air/sdk on the

+        ant command line use the environment variable, if it exists. Else if windows, use

+        AIR_HOME_WIN else use AIR_HOME_MAC, which are both defined in build.properties.
+    -->
+    <condition property="AIR_HOME" value="${env.AIR_HOME}">
+        <isset property="env.AIR_HOME" />
+    </condition>
+    <condition property="AIR_HOME" value="${AIR_HOME_WIN}">
         <os family="windows"/> 
     </condition>
-    <property name="env.AIR_HOME" value="${AIR_HOME_MAC}"/>
+    <property name="AIR_HOME" value="${AIR_HOME_MAC}"/>
 	
     <condition property="cert_pwd_not_found" >
 		<not>
@@ -67,8 +84,8 @@
     </condition>
 	
     <!-- compilers -->
-    <property name="ADL" value="${env.AIR_HOME}/bin/adl"/>
-    <property name="ADT" value="${env.AIR_HOME}/lib/adt.jar"/>
+    <property name="ADL" value="${AIR_HOME}/bin/adl"/>
+    <property name="ADT" value="${AIR_HOME}/lib/adt.jar"/>
 
     <!-- additional tasks - mxmlc tag -->
     <path id="flexTasks.path">
@@ -237,7 +254,7 @@
             maxmemory="512m">
             <source-path path-element="${SOURCE_DIR}"/>
             <source-path path-element="${COMMON_SOURCE_DIR}"/>
-            <external-library-path file="${env.AIR_HOME}/frameworks/libs/air/airglobal.swc"
append="true"/>
+            <external-library-path file="${AIR_HOME}/frameworks/libs/air/airglobal.swc"
append="true"/>
             <library-path dir="${LIBRARY_DIR}" includes="*.swc" append="true"/>
             <define name="INSTALLER::releaseVersion" value="${release.version}"/> 
             <define name="INSTALLER::buildNumber" value="${build.number}"/> 



Mime
View raw message