You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2014/04/17 08:20:59 UTC
[1/4] git commit: [flex-falcon] [refs/heads/develop] - handle Java 1.7
Repository: flex-falcon
Updated Branches:
refs/heads/develop 2263a876a -> 0797bba1b
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/develop
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 "
[2/4] git commit: [flex-falcon] [refs/heads/develop] - drop
certification paragraphs
Posted by ah...@apache.org.
drop certification paragraphs
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/dca894b2
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/dca894b2
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/dca894b2
Branch: refs/heads/develop
Commit: dca894b286eba0f5f1af26297868cbd460ec8583
Parents: 9a0a490
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 16 21:16:33 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 16 21:16:33 2014 -0700
----------------------------------------------------------------------
README | 10 ----------
1 file changed, 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/dca894b2/README
----------------------------------------------------------------------
diff --git a/README b/README
index 4725c20..1f55547 100644
--- a/README
+++ b/README
@@ -115,22 +115,12 @@ Install Prerequisites
The Adobe AIR integration kit for Linux can be downloaded from:
http://airdownload.adobe.com/air/lin/download/2.6/AdobeAIRSDK.tbz2
- This version of Apache Flex was certified for use with AIR 4.0, and
- should be compatible with other versions of AIR newer than 3.1. However
- it hasn't been fully tested on AIR 3.2, 3.3, 3.5, 3.6 or 3.7.
-
Download the AIR SDK for your platform and unzip it. Set AIR_HOME to the
absolute path of the AIR SDK directory.
*4) The Adobe Flash Player content debuggers can be found here:
http://www.adobe.com/support/flashplayer/downloads.html
- This version of Apache Flex was certified for use with Adobe Flash
- Player 11.1, and is compatible with versions 10.2 through 13.0. It has
- been tested with versions 11.1, 11.7, 11.8, 11.9 and 12.0 on Windows
- and Mac. It has been compiled against other Adobe Flash Player versions
- but has not been fully tested. It has not been fully tested on Linux.
-
On Windows, set FLASHPLAYER_DEBUGGER to the absolute path including the
filename of the FlashPlayerDebugger.exe. Note the filename of flash
player debugger maybe different.
[4/4] git commit: [flex-falcon] [refs/heads/develop] - try to get
compiler.jx scripts to be executable
Posted by ah...@apache.org.
try to get compiler.jx scripts to be executable
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/0797bba1
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/0797bba1
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/0797bba1
Branch: refs/heads/develop
Commit: 0797bba1b93ab8b86119846e1cc7306361cac15d
Parents: 1b0aa55
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 16 23:20:17 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 16 23:20:17 2014 -0700
----------------------------------------------------------------------
build.xml | 6 ++++++
compiler.jx/build.xml | 2 ++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0797bba1/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 70af1ee..6ce3256 100644
--- a/build.xml
+++ b/build.xml
@@ -356,6 +356,7 @@
<exclude name="compiler/generated/dist/sdk/bin/**"/>
<exclude name="compiler/generated/dist/sdk/bin-legacy/**"/>
<exclude name="compiler/commandline/**"/>
+ <exclude name="compiler.jx/bin/**"/>
<exclude name="**/assets/**"/>
<exclude name="**/*.fla"/>
<exclude name="**/*.flv"/>
@@ -371,6 +372,11 @@
<fixcrlf srcdir="${basedir}/temp/compiler/commandline" eol="crlf" fixlast="false">
<include name="**.bat"/>
</fixcrlf>
+ <fixcrlf srcdir="${basedir}/temp/compiler.jx/bin" eol="crlf" fixlast="false">
+ <include name="**.bat"/>
+ </fixcrlf>
+ <chmod dir="${basedir}/temp/compiler/commandline" excludes="**/*.bat" perm="+x" />
+ <chmod dir="${basedir}/temp/compiler.jx/bin" excludes="**/*.bat" perm="+x" />
<!--
Unix shell scripts need the correct line endings.
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/0797bba1/compiler.jx/build.xml
----------------------------------------------------------------------
diff --git a/compiler.jx/build.xml b/compiler.jx/build.xml
index 7d53854..e47c8e0 100644
--- a/compiler.jx/build.xml
+++ b/compiler.jx/build.xml
@@ -116,6 +116,8 @@
</filelist>
</copy>
+ <chmod dir="${basedir}/bin" excludes="**/*.bat" perm="+x" />
+
<antcall target="clean" />
</target>
[3/4] git commit: [flex-falcon] [refs/heads/develop] - fix version
strings
Posted by ah...@apache.org.
fix version strings
Project: http://git-wip-us.apache.org/repos/asf/flex-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-falcon/commit/1b0aa55c
Tree: http://git-wip-us.apache.org/repos/asf/flex-falcon/tree/1b0aa55c
Diff: http://git-wip-us.apache.org/repos/asf/flex-falcon/diff/1b0aa55c
Branch: refs/heads/develop
Commit: 1b0aa55c540e5754e938e2682a11315afb10c705
Parents: dca894b
Author: Alex Harui <ah...@apache.org>
Authored: Wed Apr 16 21:16:53 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Apr 16 21:16:53 2014 -0700
----------------------------------------------------------------------
compiler/build.xml | 2 +-
compiler/src/org/apache/flex/compiler/clients/COMPC.java | 2 +-
compiler/src/org/apache/flex/compiler/clients/MXMLC.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1b0aa55c/compiler/build.xml
----------------------------------------------------------------------
diff --git a/compiler/build.xml b/compiler/build.xml
index 6ead735..2b4d16d 100644
--- a/compiler/build.xml
+++ b/compiler/build.xml
@@ -79,7 +79,7 @@
<!-- JAR manifest entries -->
<property name="manifest.sealed" value="false"/>
<property name="manifest.Implementation-Title" value="Apache Flex Compiler"/>
- <property name="manifest.Implementation-Version" value="2.0.0"/>
+ <property name="manifest.Implementation-Version" value="0.0.1"/>
<property name="manifest.Implementation-Vendor" value="Apache Software Foundation"/>
<property name="compiler.ant.binaries" value="org/apache/flex/compiler/ant/**/*.class"/>
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1b0aa55c/compiler/src/org/apache/flex/compiler/clients/COMPC.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/clients/COMPC.java b/compiler/src/org/apache/flex/compiler/clients/COMPC.java
index 66738c9..988e8d8 100644
--- a/compiler/src/org/apache/flex/compiler/clients/COMPC.java
+++ b/compiler/src/org/apache/flex/compiler/clients/COMPC.java
@@ -110,7 +110,7 @@ public class COMPC extends MXMLC
protected String getStartMessage()
{
// This message should not be localized.
- String message = "Apache SWC Component Compiler (compc)" + NEWLINE +
+ String message = "Apache Flex SWC Component Compiler (compc)" + NEWLINE +
VersionInfo.buildMessage() + NEWLINE;
return message;
}
http://git-wip-us.apache.org/repos/asf/flex-falcon/blob/1b0aa55c/compiler/src/org/apache/flex/compiler/clients/MXMLC.java
----------------------------------------------------------------------
diff --git a/compiler/src/org/apache/flex/compiler/clients/MXMLC.java b/compiler/src/org/apache/flex/compiler/clients/MXMLC.java
index f019771..9181c82 100644
--- a/compiler/src/org/apache/flex/compiler/clients/MXMLC.java
+++ b/compiler/src/org/apache/flex/compiler/clients/MXMLC.java
@@ -1028,7 +1028,7 @@ public class MXMLC
protected String getStartMessage()
{
// This message should not be localized.
- String message = "Apache ActionScript Compiler (mxmlc)" + NEWLINE +
+ String message = "Apache Flex MXML and ActionScript Compiler (mxmlc)" + NEWLINE +
VersionInfo.buildMessage() + NEWLINE;
return message;
}