Repository: flex-utilities Updated Branches: refs/heads/develop fb9711ec8 -> 868e68ee2
Correctly locate SCRIPT_HOME even when scripts are invoked from symlink; add mxmlcnpm Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/ec2e3be1 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/ec2e3be1 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/ec2e3be1 Branch: refs/heads/develop Commit: ec2e3be1d4ca6359d6ddad5c962728f45877b7e1 Parents: fb9711e Author: Philip Kovac <[email protected]> Authored: Tue Jul 19 11:35:10 2016 -0400 Committer: Philip Kovac <[email protected]> Committed: Tue Jul 19 11:35:10 2016 -0400 ---------------------------------------------------------------------- npm-flexjs/js/bin/asjscnpm | 6 ++-- npm-flexjs/js/bin/asjscompcnpm | 8 ++--- npm-flexjs/js/bin/mxmlcnpm | 71 +++++++++++++++++++++++++++++++++++++ 3 files changed, 75 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ec2e3be1/npm-flexjs/js/bin/asjscnpm ---------------------------------------------------------------------- diff --git a/npm-flexjs/js/bin/asjscnpm b/npm-flexjs/js/bin/asjscnpm old mode 100644 new mode 100755 index 6481ed3..d4c99d6 --- a/npm-flexjs/js/bin/asjscnpm +++ b/npm-flexjs/js/bin/asjscnpm @@ -25,7 +25,8 @@ # In Windows Command Prompt, use mxmlc.bat instead. # -SCRIPT_HOME=`dirname $0` +SCRIPT_REAL_PATH=`readlink -f "$0"` +SCRIPT_HOME=`dirname "$SCRIPT_REAL_PATH"` FALCON_HOME=${SCRIPT_HOME}/../.. FLEX_HOME=${SCRIPT_HOME}/../.. @@ -53,9 +54,6 @@ elif [ $OS = "Unix" ]; then if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then D32='-d32' fi - FALCON_HOME="/usr/local/lib/node_modules/flexjs" - FLEX_HOME="/usr/local/lib/node_modules/flexjs" - SCRIPT_HOME="/usr/local/lib/node_modules/flexjs/js/bin" fi VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false " http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ec2e3be1/npm-flexjs/js/bin/asjscompcnpm ---------------------------------------------------------------------- diff --git a/npm-flexjs/js/bin/asjscompcnpm b/npm-flexjs/js/bin/asjscompcnpm old mode 100644 new mode 100755 index f2944a8..3b2a3de --- a/npm-flexjs/js/bin/asjscompcnpm +++ b/npm-flexjs/js/bin/asjscompcnpm @@ -25,8 +25,8 @@ # In Windows Command Prompt, use mxmlc.bat instead. # - -SCRIPT_HOME=`dirname $0` +SCRIPT_REAL_PATH=`readlink -f "$0"` +SCRIPT_HOME=`dirname "$SCRIPT_REAL_PATH"` FALCON_HOME=${SCRIPT_HOME}/../.. FLEX_HOME=${SCRIPT_HOME}/../.. @@ -54,10 +54,6 @@ elif [ $OS = "Unix" ]; then if [ "$isOSX" != "" -a "$HOSTTYPE" = "x86_64" -a "$check64" != "" -a "$javaVersion" = "1.6" ]; then D32='-d32' fi - - FALCON_HOME="/usr/local/lib/node_modules/flexjs" - FLEX_HOME="/usr/local/lib/node_modules/flexjs" - SCRIPT_HOME="/usr/local/lib/node_modules/flexjs/js/bin" fi VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false " http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/ec2e3be1/npm-flexjs/js/bin/mxmlcnpm ---------------------------------------------------------------------- diff --git a/npm-flexjs/js/bin/mxmlcnpm b/npm-flexjs/js/bin/mxmlcnpm new file mode 100755 index 0000000..5ef12d7 --- /dev/null +++ b/npm-flexjs/js/bin/mxmlcnpm @@ -0,0 +1,71 @@ +#!/bin/sh + +################################################################################ +## +## Licensed to the Apache Software Foundation (ASF) under one or more +## contributor license agreements. See the NOTICE file distributed with +## this work for additional information regarding copyright ownership. +## The ASF licenses this file to You under the Apache License, Version 2.0 +## (the "License"); you may not use this file except in compliance with +## the License. You may obtain a copy of the License at +## +## http://www.apache.org/licenses/LICENSE-2.0 +## +## Unless required by applicable law or agreed to in writing, software +## distributed under the License is distributed on an "AS IS" BASIS, +## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +## See the License for the specific language governing permissions and +## limitations under the License. +## +################################################################################ + + +# +# mxmlc shell script to launch falcon-mxmlc.jar on OSX, Unix, or Cygwin. +# In Windows Command Prompt, use mxmlc.bat instead. +# + +SCRIPT_REAL_PATH=`readlink -f "$0"` +SCRIPT_HOME=`dirname "$SCRIPT_REAL_PATH"` +if [ "x${FALCON_HOME}" = "x" ] +then + FALCON_HOME=${SCRIPT_HOME}/../.. +fi + +echo Using Falcon codebase: $FALCON_HOME + +if [ "x${FLEX_HOME}" = "x" ] +then + FLEX_HOME=${SCRIPT_HOME}/../.. +fi +echo Using Flex SDK: $FLEX_HOME + +case `uname` in + CYGWIN*) + OS="Windows" + ;; + *) + OS=Unix +esac + +D32='' + +if [ $OS = "Windows" ]; then + + FALCON_HOME=`cygpath -m $FALCON_HOME` + FLEX_HOME=`cygpath -m $FLEX_HOME` + +elif [ $OS = "Unix" ]; then + + 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 "$SCRIPT_HOME/../lib/mxmlc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=FLEXJS -sdk-js-lib="$FLEX_HOME/frameworks/js/FlexJS/src" "$@"
