flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jmcl...@apache.org
Subject git commit: [flex-sdk] [refs/heads/develop] - added -Djava.util.Arrays.useLegacyMergeSort=true to stop errors when using java 1.7
Date Mon, 26 Aug 2013 23:09:48 GMT
Updated Branches:
  refs/heads/develop 20c22b2fc -> a7c6f9750


added -Djava.util.Arrays.useLegacyMergeSort=true to stop errors when using java 1.7


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

Branch: refs/heads/develop
Commit: a7c6f975097222a3103bbeff010196b5efb4bc95
Parents: 20c22b2
Author: Justin Mclean <jmclean@apache.org>
Authored: Tue Aug 27 09:09:30 2013 +1000
Committer: Justin Mclean <jmclean@apache.org>
Committed: Tue Aug 27 09:09:30 2013 +1000

----------------------------------------------------------------------
 bin/compc     | 2 +-
 bin/compc.bat | 2 +-
 bin/mxmlc     | 2 +-
 bin/mxmlc.bat | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7c6f975/bin/compc
----------------------------------------------------------------------
diff --git a/bin/compc b/bin/compc
index 5009701..476fd31 100755
--- a/bin/compc
+++ b/bin/compc
@@ -65,6 +65,6 @@ fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,
 # instead put it on the java args directly, with double-quotes around it
-VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false  "
+VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false -Djava.util.Arrays.useLegacyMergeSort=true
"
 
 java $VMARGS $D32 $SETUP_SH_VMARGS -jar "$FLEX_HOME/lib/compc.jar" +flexlib="$FLEX_HOME/frameworks"
"$@"

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7c6f975/bin/compc.bat
----------------------------------------------------------------------
diff --git a/bin/compc.bat b/bin/compc.bat
index f8e706f..ec5945f 100755
--- a/bin/compc.bat
+++ b/bin/compc.bat
@@ -22,4 +22,4 @@ rem
 
 if "%FLEX_HOME%"=="" set FLEX_HOME=%~dp0\..
 
-java -Xmx384m -Dsun.io.useCanonCaches=false -jar "%FLEX_HOME%\lib\compc.jar" +flexlib="%FLEX_HOME%\frameworks"
%*
+java -Xmx384m -Dsun.io.useCanonCaches=false -Djava.util.Arrays.useLegacyMergeSort=true -jar
"%FLEX_HOME%\lib\compc.jar" +flexlib="%FLEX_HOME%\frameworks" %*

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7c6f975/bin/mxmlc
----------------------------------------------------------------------
diff --git a/bin/mxmlc b/bin/mxmlc
index 791bbec..811a41e 100755
--- a/bin/mxmlc
+++ b/bin/mxmlc
@@ -64,6 +64,6 @@ fi
 
 # don't use $FLEX_HOME in this variable because it may contain spaces,
 # instead put it on the java args directly, with double-quotes around it
-VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
+VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false -Djava.util.Arrays.useLegacyMergeSort=true
"
 
 java $VMARGS $D32 $SETUP_SH_VMARGS -jar "$FLEX_HOME/lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks"
"$@"

http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/a7c6f975/bin/mxmlc.bat
----------------------------------------------------------------------
diff --git a/bin/mxmlc.bat b/bin/mxmlc.bat
index 3fe7982..e097c90 100755
--- a/bin/mxmlc.bat
+++ b/bin/mxmlc.bat
@@ -22,4 +22,4 @@ rem
 
 if "%FLEX_HOME%"=="" set FLEX_HOME=%~dp0\..
 
-java -Xmx384m -Dsun.io.useCanonCaches=false -jar "%FLEX_HOME%\lib\mxmlc.jar" +flexlib="%FLEX_HOME%\frameworks"
%*
+java -Xmx384m -Dsun.io.useCanonCaches=false -Djava.util.Arrays.useLegacyMergeSort=true -jar
"%FLEX_HOME%\lib\mxmlc.jar" +flexlib="%FLEX_HOME%\frameworks" %*


Mime
View raw message