Return-Path: X-Original-To: apmail-incubator-flex-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-flex-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 80AE9DFCB for ; Tue, 27 Nov 2012 16:06:15 +0000 (UTC) Received: (qmail 39564 invoked by uid 500); 27 Nov 2012 16:06:15 -0000 Delivered-To: apmail-incubator-flex-commits-archive@incubator.apache.org Received: (qmail 39363 invoked by uid 500); 27 Nov 2012 16:06:14 -0000 Mailing-List: contact flex-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: flex-dev@incubator.apache.org Delivered-To: mailing list flex-commits@incubator.apache.org Received: (qmail 39341 invoked by uid 99); 27 Nov 2012 16:06:14 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2012 16:06:14 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 27 Nov 2012 16:06:13 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E42922388A91; Tue, 27 Nov 2012 16:05:52 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1414240 - /incubator/flex/falcon/trunk/compiler.js/bin/mxmlc Date: Tue, 27 Nov 2012 16:05:52 -0000 To: flex-commits@incubator.apache.org From: cframpton@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121127160552.E42922388A91@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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" "$@"