Skip to content
Permalink
Browse files
Merge pull request #8 from WeaveTeam/develop
  • Loading branch information
adufilie committed Jul 22, 2016
2 parents fb9711e + a215b46 commit 868e68ee232fc4e604809e11d5d795f6a80a8cdf
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 10 deletions.
8 npm-flexjs/js/bin/asjscnpm 100644 → 100755
@@ -25,7 +25,10 @@
# In Windows Command Prompt, use mxmlc.bat instead.
#

SCRIPT_HOME=`dirname $0`
function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; }
SCRIPT_REAL_FILE=`readlink "$0" || echo "$0"`;
SCRIPT_ABS_PATH=`abspath "$SCRIPT_REAL_FILE"`
SCRIPT_HOME=`dirname "$SCRIPT_ABS_PATH"`
FALCON_HOME=${SCRIPT_HOME}/../..
FLEX_HOME=${SCRIPT_HOME}/../..

@@ -53,9 +56,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 "
10 npm-flexjs/js/bin/asjscompcnpm 100644 → 100755
@@ -25,8 +25,10 @@
# In Windows Command Prompt, use mxmlc.bat instead.
#


SCRIPT_HOME=`dirname $0`
function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; }
SCRIPT_REAL_FILE=`readlink "$0" || echo "$0"`;
SCRIPT_ABS_PATH=`abspath "$SCRIPT_REAL_FILE"`
SCRIPT_HOME=`dirname "$SCRIPT_ABS_PATH"`
FALCON_HOME=${SCRIPT_HOME}/../..
FLEX_HOME=${SCRIPT_HOME}/../..

@@ -54,10 +56,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 "
@@ -0,0 +1,73 @@
#!/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.
#

function abspath() { pushd . > /dev/null; if [ -d "$1" ]; then cd "$1"; dirs -l +0; else cd "`dirname \"$1\"`"; cur_dir=`dirs -l +0`; if [ "$cur_dir" == "/" ]; then echo "$cur_dir`basename \"$1\"`"; else echo "$cur_dir/`basename \"$1\"`"; fi; fi; popd > /dev/null; }
SCRIPT_REAL_FILE=`readlink "$0" || echo "$0"`;
SCRIPT_ABS_PATH=`abspath "$SCRIPT_REAL_FILE"`
SCRIPT_HOME=`dirname "$SCRIPT_ABS_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" "$@"

0 comments on commit 868e68e

Please sign in to comment.