incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1402596 - in /incubator/flex/sdk/branches/develop: ./ bin/ frameworks/ frameworks/themes/AeonGraphical/
Date Fri, 26 Oct 2012 17:49:38 GMT
Author: cframpton
Date: Fri Oct 26 17:49:37 2012
New Revision: 1402596

URL: http://svn.apache.org/viewvc?rev=1402596&view=rev
Log:
Completion of FLEX-33110.  Java 7 support on Mac and Windows.  Note that on a Mac, you will
need an Intel-based Mac running Mac OS X version 10.7.3 (Lion) as well as Ant 1.8 or higher.
 On a Mac, Java 7 only compiles in 64-bit mode so compilations are quite a bit slower than
they are with Java 6 in 32-bit mode.

Modified:
    incubator/flex/sdk/branches/develop/README
    incubator/flex/sdk/branches/develop/bin/asdoc
    incubator/flex/sdk/branches/develop/bin/compc
    incubator/flex/sdk/branches/develop/bin/copylocale
    incubator/flex/sdk/branches/develop/bin/digest
    incubator/flex/sdk/branches/develop/bin/fcsh
    incubator/flex/sdk/branches/develop/bin/fdb
    incubator/flex/sdk/branches/develop/bin/mxmlc
    incubator/flex/sdk/branches/develop/bin/optimizer
    incubator/flex/sdk/branches/develop/bin/swfdump
    incubator/flex/sdk/branches/develop/build.properties
    incubator/flex/sdk/branches/develop/build.xml
    incubator/flex/sdk/branches/develop/frameworks/build.xml
    incubator/flex/sdk/branches/develop/frameworks/flex-config.xml
    incubator/flex/sdk/branches/develop/frameworks/themes/AeonGraphical/build.xml

Modified: incubator/flex/sdk/branches/develop/README
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/README?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/README (original)
+++ incubator/flex/sdk/branches/develop/README Fri Oct 26 17:49:37 2012
@@ -76,25 +76,25 @@ Install Prerequisites
     SOFTWARE                                    ENVIRONMENT VARIABLE (absolute paths)
     ==================================================================================
     
-    Java SDK 1.5 (0_13 or greater)              JAVA_HOME
-    or Java SDK 1.6 (*1)
-     -- Java SDK 1.7 is not supported
-
+    Java SDK 1.6 or greater (*1)                JAVA_HOME
+        (for Java 1.7 see note at (*2))
+        
     Ant 1.7.0 or greater (*1)                   ANT_HOME
-    
+        (for Java 1.7 see note at (*2))
+        
     Cygwin, git bash 
     or other unix-like shell
     (if Windows)
     
-    Adobe AIR Integration Kit (*2)              AIR_HOME 
+    Adobe AIR Integration Kit (*3)              AIR_HOME 
     
-    Adobe Flash Player Content Debugger (*3)    FLASHPLAYER_DEBUGGER
+    Adobe Flash Player Content Debugger (*4)    FLASHPLAYER_DEBUGGER
         
-    Adobe Pixel Bender Toolkit (*4)             PIXELBENDER_HOME
+    Adobe Pixel Bender Toolkit (*5)             PIXELBENDER_HOME
     
-    Adobe Flash Player (*5)                     PLAYERGLOBAL_HOME
+    Adobe Flash Player (*6)                     PLAYERGLOBAL_HOME
 
-    Adobe Extension Manager CS5 (*6)            ADOBE_EXTENSION_MANAGER
+    Adobe Extension Manager CS5 (*7)            ADOBE_EXTENSION_MANAGER
 
     ==================================================================================
         
@@ -107,8 +107,13 @@ Install Prerequisites
         On the Mac (bash), set PATH to
             
             export PATH="$PATH:$ANT_HOME/bin:$JAVA_HOME/bin"
-    
-    *2) The Adobe AIR integration kit for Windows can be downloaded from:
+
+    *2)  If you are using Java SDK 1.7 or greater on a Mac you must use Ant 1.8 or 
+         greater. If you use Java 1.7 with Ant 1.7, ant reports the java version as 1.6 
+         so the JVM args for the data model (-d32/-d64) will not be set correctly and you
+         will get compile errors.
+        
+    *3) The Adobe AIR integration kit for Windows can be downloaded from:
                 http://airdownload.adobe.com/air/win/download/3.1/AdobeAIRSDK.zip
         
          The Adobe AIR integration kit for Mac can be downloaded from:
@@ -117,7 +122,7 @@ Install Prerequisites
         Download the AIR SDK for your platform and unzip it.  Set AIR_HOME to the absolute

         path of the AIR SDK directory.
                
-    *3) The Adobe Flash Player content debuggers can be found here:
+    *4) The Adobe Flash Player content debuggers can be found here:
             http://www.adobe.com/support/flashplayer/downloads.html
             
         On Windows, set FLASHPLAYER_DEBUGGER to the absolute path of FlashPlayerDebugger.exe
@@ -127,7 +132,7 @@ Install Prerequisites
         
         On Linux, set set FLASHPLAYER_DEBUGGER to the absolute path of flashplayerdebugger
             
-    *4) The Adobe Pixel Bender Toolkit for Windows can be downloaded from:
+    *5) The Adobe Pixel Bender Toolkit for Windows can be downloaded from:
             http://www.adobe.com/go/pixelbender_toolkit_zip/
         
          The Adobe Pixel Bender Toolkit for Mac can be downloaded from:
@@ -136,7 +141,7 @@ Install Prerequisites
         Download the Pixel Bender Toolkit for your platform and install or unzip it.
 	    Set PIXELBENDER_HOME to the absolute path of the Pixel Bender Toolkit directory.
 
-    *5) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
+    *6) The Adobe Flash Player playerglobal.swc for 11.1 can be downloaded from:
             http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc

         
         Use URL above to download playerglobal11_1.swc. Create the directory, player/11.1
@@ -146,7 +151,7 @@ Install Prerequisites
 		the version subdirectory). The target-version option controls which 
 		PLAYERGLOBAL_HOME subdirectory is used.
 
-    *6) The Adobe Extension Manager is only required for those creating release or testing
+    *7) The Adobe Extension Manager is only required for those creating release or testing
             changes to the flash-integration swc.  Not that if you change APIs on classes
             that flash-integration depends on, you may need to update flash-integration.
 

Modified: incubator/flex/sdk/branches/develop/bin/asdoc
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/asdoc?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/asdoc (original)
+++ incubator/flex/sdk/branches/develop/bin/asdoc Fri Oct 26 17:49:37 2012
@@ -30,35 +30,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to asdoc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to asdoc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to asdoc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to asdoc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

Modified: incubator/flex/sdk/branches/develop/bin/compc
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/compc?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/compc (original)
+++ incubator/flex/sdk/branches/develop/bin/compc Fri Oct 26 17:49:37 2012
@@ -30,36 +30,37 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to compc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to compc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to compc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-	
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
-	
+    # set FLEX_HOME relative to compc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+    
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
+    
 fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,

Modified: incubator/flex/sdk/branches/develop/bin/copylocale
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/copylocale?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/copylocale (original)
+++ incubator/flex/sdk/branches/develop/bin/copylocale Fri Oct 26 17:49:37 2012
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to copylocale if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to copylocale if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to copylocale if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to copylocale if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

Modified: incubator/flex/sdk/branches/develop/bin/digest
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/digest?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/digest (original)
+++ incubator/flex/sdk/branches/develop/bin/digest Fri Oct 26 17:49:37 2012
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to digest if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to digest if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to digest if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to digest if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

Modified: incubator/flex/sdk/branches/develop/bin/fcsh
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/fcsh?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/fcsh (original)
+++ incubator/flex/sdk/branches/develop/bin/fcsh Fri Oct 26 17:49:37 2012
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to fcsh if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname $0`/..
-		FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to fcsh if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to fcsh if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to fcsh if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

Modified: incubator/flex/sdk/branches/develop/bin/fdb
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/fdb?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/fdb (original)
+++ incubator/flex/sdk/branches/develop/bin/fdb Fri Oct 26 17:49:37 2012
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to fdb if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname $0`/..
-		FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to fdb if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to fdb if not set
-	test "$FLEX_HOME" = "" && {
-		FLEX_HOME=`dirname "$0"`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to fdb if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 
 fi
 

Modified: incubator/flex/sdk/branches/develop/bin/mxmlc
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/mxmlc?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/mxmlc (original)
+++ incubator/flex/sdk/branches/develop/bin/mxmlc Fri Oct 26 17:49:37 2012
@@ -30,35 +30,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to mxmlc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to mxmlc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to mxmlc if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-	
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to mxmlc if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname "$0"`/..
+    }
+    
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,

Modified: incubator/flex/sdk/branches/develop/bin/optimizer
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/optimizer?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/optimizer (original)
+++ incubator/flex/sdk/branches/develop/bin/optimizer Fri Oct 26 17:49:37 2012
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to optimizer if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to optimizer if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to optimizer if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname "$0"`/..
-	}
-	
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-		isOSX="`uname | grep -i Darwin`"
-		
-		if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-			D32='-d32'
-	fi
+    # set FLEX_HOME relative to optimizer if not set
+    test "$FLEX_HOME" = "" && {
+    FLEX_HOME=`dirname "$0"`/..
+    }
+    
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,

Modified: incubator/flex/sdk/branches/develop/bin/swfdump
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/bin/swfdump?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/bin/swfdump (original)
+++ incubator/flex/sdk/branches/develop/bin/swfdump Fri Oct 26 17:49:37 2012
@@ -24,35 +24,36 @@
 #
 
 case `uname` in
-		CYGWIN*)
-			OS="Windows"
-		;;
-		*)
-			OS=Unix
+        CYGWIN*)
+            OS="Windows"
+        ;;
+        *)
+            OS=Unix
 esac
 
 D32=''
 
 if [ $OS = "Windows" ]; then
-	# set FLEX_HOME relative to swfdump if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-    	FLEX_HOME=`cygpath -m $FLEX_HOME`
-	}
+    # set FLEX_HOME relative to swfdump if not set
+    test "$FLEX_HOME" = "" && {
+        FLEX_HOME=`dirname $0`/..
+        FLEX_HOME=`cygpath -m $FLEX_HOME`
+    }
 
 elif [ $OS = "Unix" ]; then
 
-	# set FLEX_HOME relative to swfdump if not set
-	test "$FLEX_HOME" = "" && {
-	FLEX_HOME=`dirname $0`/..
-	}
-
-	check64="`java -version 2>&1 | grep -i 64-Bit`"
-	isOSX="`uname | grep -i Darwin`"
-	
-	if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" ]; then
-		D32='-d32'
-	fi
+    # set FLEX_HOME relative to swfdump if not set
+    test "$FLEX_HOME" = "" && {
+    FLEX_HOME=`dirname $0`/..
+    }
+
+    check64="`java -version 2>&1 | grep -i 64-Bit`"
+    isOSX="`uname | grep -i Darwin`"
+    javaVersion="`java -version 2>&1 | awk -F '[ ".]+' 'NR==1 {print $3 "." $4}'`"
+    
+    if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" =
"1.6" ]; then
+        D32='-d32'
+    fi
 fi
 
 VMARGS="-ea -Dapplication.home=$FLEX_HOME -Xms32m -Xmx384m "

Modified: incubator/flex/sdk/branches/develop/build.properties
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.properties?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.properties (original)
+++ incubator/flex/sdk/branches/develop/build.properties Fri Oct 26 17:49:37 2012
@@ -31,12 +31,18 @@ locale = en_US
 qa.dir = ${basedir}/../qa
 asc = ${basedir}/bin/asc
 
-local.d32 = 
+# For Java 7 on Mac OS X, you need an Intel-based Mac running Mac OS X version 10.7.3 
+# (Lion) and above.  Only the 64-bit data model is available so leave this blank.
+# Since ant properties are immutable, if this property is set in the build file before
+# this file is included, setting it to nothing here is a no-op.
+local.d32 =
+
 src.depend = true
 src.debug = on
 
 # JVM options for <compc> and <mxmlc> tasks
 jvm.args = ${local.d32} -Xms64m -Xmx384m -ea -Dapple.awt.UIElement=true
+    # -d32/-d64 for 32-bit/64-bit code model (or don't specify for the default)
 	# -Xms64m: start out with a 64 MB heap
 	# -Xmx384m: allow the heap to grow to 384 MB
 	# -ea: enable Java assertions
@@ -47,5 +53,5 @@ mxmlc.jvm.args = ${jvm.args}
 manifest.sealed=false
 manifest.Implementation-Title=Apache Flex SDK
 manifest.Implementation-Version=${release.version}
-manifest.Implementation-Vendor=The Apache Software Foundation (http://incubator.apache.org/flex/)
+manifest.Implementation-Vendor=The Apache Software Foundation
 manifest.Implementation-Vendor-Id=org.apache

Modified: incubator/flex/sdk/branches/develop/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/build.xml?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/build.xml (original)
+++ incubator/flex/sdk/branches/develop/build.xml Fri Oct 26 17:49:37 2012
@@ -22,12 +22,15 @@
 
     <property name="FLEX_HOME" location="${basedir}"/>
     
-    <!-- Required for OSX 10.6 / Snow Leopard Performance -->
-    <condition property="local.d32" value="-d32" >
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
         <and>
+            <os family="windows"/>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
-            <os family="mac"/>
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
         </and>
     </condition>
 
@@ -121,7 +124,12 @@
         description="Stuff that needs to be done before any builds." />
 
     <target name="check-compile-env" depends="check-playerglobal-home,check-air-home,check-pixelbender-home"
-        description="Check for the required environment variables for compilation."/>
+        description="Check for the required environment variables for compilation.">
+            <echo>OS: ${os.name} / ${os.version} / ${os.arch}</echo>
+            <echo>VM: ${java.vm.name} / ${java.vm.version}</echo>
+            <echo>Java: ${java.version}</echo>
+            <echo>Ant: ${ant.version} Ant Java Version: ${ant.java.version}</echo>
+    </target>
 
     <target name="check-playerglobal-home" unless="playerglobal.swc.exists"
         description="Check PLAYERGLOBAL_HOME for both a directory and a swc file">

Modified: incubator/flex/sdk/branches/develop/frameworks/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/build.xml?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/build.xml Fri Oct 26 17:49:37 2012
@@ -26,16 +26,19 @@
 <project name="frameworks" default="main" basedir=".">
 
     <property name="FLEX_HOME" location=".."/>
-    
-    <!-- Required for OSX 10.6 / Snow Leopard Performance -->
-    <condition property="local.d32" value="-d32" >
+
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
         <and>
+            <os family="mac"/>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
-            <os family="mac"/>
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
         </and>
     </condition>
-    
+
     <!-- Property for the platform.  -->
     <condition property="isMac" value="true">
         <os family="mac"/>

Modified: incubator/flex/sdk/branches/develop/frameworks/flex-config.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/flex-config.xml?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/flex-config.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/flex-config.xml Fri Oct 26 17:49:37 2012
@@ -361,6 +361,10 @@
 	</runtime-shared-library-path>
 	  
 	  <!-- TextLayout SWC -->
+	<!-- 
+	    Even though there is no textLayout rsl leave this in so that in a FlashBuilder
+	    Flex Library project, FlashBuilder will allow "Link Type" to be external.
+    -->
     <runtime-shared-library-path>
 		<path-element>libs/textLayout.swc</path-element>
 		<rsl-url>textLayout_${build.number}.swf</rsl-url>

Modified: incubator/flex/sdk/branches/develop/frameworks/themes/AeonGraphical/build.xml
URL: http://svn.apache.org/viewvc/incubator/flex/sdk/branches/develop/frameworks/themes/AeonGraphical/build.xml?rev=1402596&r1=1402595&r2=1402596&view=diff
==============================================================================
--- incubator/flex/sdk/branches/develop/frameworks/themes/AeonGraphical/build.xml (original)
+++ incubator/flex/sdk/branches/develop/frameworks/themes/AeonGraphical/build.xml Fri Oct
26 17:49:37 2012
@@ -22,12 +22,15 @@
 
     <property name="FLEX_HOME" location="${basedir}/../../.."/>
     
-    <!-- Required for OSX 10.6 / Snow Leopard Performance -->
-    <condition property="local.d32" value="-d32" >
+    <!-- Required for OSX 10.6 / Snow Leopard Performance. -->
+    <!-- Java 7 on Mac requires OSX 10.7.3 or higher and is 64-bit only -->
+    <!-- local.d32 is set/used in build.properties so this needs to be done first. -->
+    <condition property="local.d32" value="-d32">
         <and>
+            <os family="windows"/>
             <equals arg1="${sun.arch.data.model}" arg2="64"/>
             <equals arg1="${os.arch}" arg2="x86_64"/>
-                <os family="mac"/>
+            <equals arg1="${ant.java.version}" arg2="1.6"/>
         </and>
     </condition>
 



Mime
View raw message