incubator-flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cframp...@apache.org
Subject svn commit: r1414240 - /incubator/flex/falcon/trunk/compiler.js/bin/mxmlc
Date Tue, 27 Nov 2012 16:05:52 GMT
Author: cframpton
Date: Tue Nov 27 16:05:51 2012
New Revision: 1414240

URL: http://svn.apache.org/viewvc?rev=1414240&view=rev
Log:
Fix script so it has correct path to mxmlc.jar and so that it works with Java 1.7.

Modified:
    incubator/flex/falcon/trunk/compiler.js/bin/mxmlc

Modified: incubator/flex/falcon/trunk/compiler.js/bin/mxmlc
URL: http://svn.apache.org/viewvc/incubator/flex/falcon/trunk/compiler.js/bin/mxmlc?rev=1414240&r1=1414239&r2=1414240&view=diff
==============================================================================
--- incubator/flex/falcon/trunk/compiler.js/bin/mxmlc (original)
+++ incubator/flex/falcon/trunk/compiler.js/bin/mxmlc Tue Nov 27 16:05:51 2012
@@ -56,14 +56,15 @@ if [ $OS = "Windows" ]; then
 
 elif [ $OS = "Unix" ]; then
 
-	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
+    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="-Xmx384m -Dsun.io.useCanonCaches=false "
 
-java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks"
-jar "../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks"
-jar "$FLEX_HOME/lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" "$@"



Mime
View raw message