You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by jo...@apache.org on 2014/04/24 18:06:04 UTC
[32/50] [abbrv] git commit: [flex-falcon] [refs/heads/maven] - handle
Java 1.7
handle Java 1.7
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/9a0a490e
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/9a0a490e
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/9a0a490e
Branch: refs/heads/maven
Commit: 9a0a490e3d630c3ba7acc479721dada5d2351b3b
Parents: 2263a87
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 16 20:27:06 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 16 20:27:06 2014 -0700
----------------------------------------------------------------------
compiler/commandline/compc | 13 +++++++------
compiler/commandline/mxmlc | 13 +++++++------
compiler/commandline/optimizer | 13 +++++++------
compiler/commandline/swcdepends | 13 +++++++------
compiler/commandline/swfdump | 13 +++++++------
5 files changed, 35 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a0a490e/compiler/commandline/compc
----------------------------------------------------------------------
diff --git a/compiler/commandline/compc b/compiler/commandline/compc
index 4a28bc0..9f0846a 100755
--- a/compiler/commandline/compc
+++ b/compiler/commandline/compc
@@ -57,12 +57,13 @@ 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 "
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a0a490e/compiler/commandline/mxmlc
----------------------------------------------------------------------
diff --git a/compiler/commandline/mxmlc b/compiler/commandline/mxmlc
index 730cff0..883b42d 100755
--- a/compiler/commandline/mxmlc
+++ b/compiler/commandline/mxmlc
@@ -57,12 +57,13 @@ 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 "
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a0a490e/compiler/commandline/optimizer
----------------------------------------------------------------------
diff --git a/compiler/commandline/optimizer b/compiler/commandline/optimizer
index bfc10ad..475fffc 100755
--- a/compiler/commandline/optimizer
+++ b/compiler/commandline/optimizer
@@ -48,12 +48,13 @@ 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="-Xms32m -Xmx512m -Dsun.io.useCanonCaches=false "
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a0a490e/compiler/commandline/swcdepends
----------------------------------------------------------------------
diff --git a/compiler/commandline/swcdepends b/compiler/commandline/swcdepends
index 3abf487..8808d74 100755
--- a/compiler/commandline/swcdepends
+++ b/compiler/commandline/swcdepends
@@ -57,12 +57,13 @@ 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 "
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/9a0a490e/compiler/commandline/swfdump
----------------------------------------------------------------------
diff --git a/compiler/commandline/swfdump b/compiler/commandline/swfdump
index aba4728..eeb18dc 100755
--- a/compiler/commandline/swfdump
+++ b/compiler/commandline/swfdump
@@ -48,12 +48,13 @@ 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 "