You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by bi...@apache.org on 2016/01/03 03:31:58 UTC
git commit: [flex-utilities] [refs/heads/feature-npm-install] -
Create asjscnpm and asjscompcnpm and fix the paths in Mac
Repository: flex-utilities
Updated Branches:
refs/heads/feature-npm-install 2218dbf03 -> dcd627bb2
Create asjscnpm and asjscompcnpm and fix the paths in Mac
Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/dcd627bb
Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/dcd627bb
Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/dcd627bb
Branch: refs/heads/feature-npm-install
Commit: dcd627bb20e8c415cfd1895d0956412e39766688
Parents: 2218dbf
Author: OmPrakash Muppirala <bi...@gmail.com>
Authored: Sat Jan 2 18:31:40 2016 -0800
Committer: OmPrakash Muppirala <bi...@gmail.com>
Committed: Sat Jan 2 18:31:40 2016 -0800
----------------------------------------------------------------------
npm-flexjs/js/bin/asjsc | 0
npm-flexjs/js/bin/asjscnpm | 73 ++++++++++++++++++++++++++++++++++++
npm-flexjs/js/bin/asjscompc | 0
npm-flexjs/js/bin/asjscompcnpm | 74 +++++++++++++++++++++++++++++++++++++
npm-flexjs/package.json | 4 +-
5 files changed, 149 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dcd627bb/npm-flexjs/js/bin/asjsc
----------------------------------------------------------------------
diff --git a/npm-flexjs/js/bin/asjsc b/npm-flexjs/js/bin/asjsc
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dcd627bb/npm-flexjs/js/bin/asjscnpm
----------------------------------------------------------------------
diff --git a/npm-flexjs/js/bin/asjscnpm b/npm-flexjs/js/bin/asjscnpm
new file mode 100644
index 0000000..65ea3a9
--- /dev/null
+++ b/npm-flexjs/js/bin/asjscnpm
@@ -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.
+#
+
+SCRIPT_HOME=`dirname $0`
+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
+ 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 "
+
+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=jsc -external-library-path="$SCRIPT_HOME/../libs/js.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dcd627bb/npm-flexjs/js/bin/asjscompc
----------------------------------------------------------------------
diff --git a/npm-flexjs/js/bin/asjscompc b/npm-flexjs/js/bin/asjscompc
deleted file mode 100644
index e69de29..0000000
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dcd627bb/npm-flexjs/js/bin/asjscompcnpm
----------------------------------------------------------------------
diff --git a/npm-flexjs/js/bin/asjscompcnpm b/npm-flexjs/js/bin/asjscompcnpm
new file mode 100644
index 0000000..7df2b89
--- /dev/null
+++ b/npm-flexjs/js/bin/asjscompcnpm
@@ -0,0 +1,74 @@
+#!/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.
+#
+
+if [ "x${FALCON_HOME}" = "x" ]
+then
+ SCRIPT_HOME=`dirname $0`
+ 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
+
+ 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 "
+
+java $VMARGS $D32 $SETUP_SH_VMARGS -Dflexcompiler="$FALCON_HOME" -Dflexlib="$FLEX_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +flexlib="$FLEX_HOME/frameworks" -js-output-type=jsc -external-library-path="$SCRIPT_HOME/../libs/js.swc" "$@"
http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/dcd627bb/npm-flexjs/package.json
----------------------------------------------------------------------
diff --git a/npm-flexjs/package.json b/npm-flexjs/package.json
index 96386d5..acc5c54 100644
--- a/npm-flexjs/package.json
+++ b/npm-flexjs/package.json
@@ -28,7 +28,7 @@
"postinstall": "node dependencies/download_dependencies.js"
},
"bin": {
- "asjsc": "./js/bin/asjsc",
- "asjscompc": "./js/bin/asjscompc"
+ "asjsc": "./js/bin/asjscnpm",
+ "asjscompc": "./js/bin/asjscompcnpm"
}
}