flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aha...@apache.org
Subject git commit: [flex-asjs] [refs/heads/develop] - need these js/bin files in scm, but continue to block others
Date Sun, 06 Apr 2014 06:45:10 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 08f937007 -> fc9532b21


need these js/bin files in scm, but continue to block others


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fc9532b2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fc9532b2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fc9532b2

Branch: refs/heads/develop
Commit: fc9532b218a23b9553a93c456fb76106cd4c9014
Parents: 08f9370
Author: Alex Harui <aharui@apache.org>
Authored: Sat Apr 5 23:44:18 2014 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Sat Apr 5 23:44:18 2014 -0700

----------------------------------------------------------------------
 .gitignore       |  4 ++-
 js/bin/compc     | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
 js/bin/compc.bat | 29 +++++++++++++++++++++
 js/bin/mxmlc     | 70 +++++++++++++++++++++++++++++++++++++++++++++++++++
 js/bin/mxmlc.bat | 29 +++++++++++++++++++++
 5 files changed, 201 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc9532b2/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 5eaeec6..47d210a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,6 +32,9 @@ bin-release
 binjs-debug
 binjs-release
 examples/FlexJSTest_again/html-template
+examples/FlexJSTest_again/bin
+rat.report
+mustella/tests/bin
 
 #Apache Flex Projects
 lib/
@@ -85,7 +88,6 @@ flex-sdk-description.xml
 *.sdf
 ipch/
 obj/
-[Bb]in
 [Dd]ebug*/
 [Rr]elease*/
 Ankh.NoLoad

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc9532b2/js/bin/compc
----------------------------------------------------------------------
diff --git a/js/bin/compc b/js/bin/compc
new file mode 100644
index 0000000..a0c712e
--- /dev/null
+++ b/js/bin/compc
@@ -0,0 +1,70 @@
+#!/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	
+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=FLEXJS
-sdk-js-lib="$FLEX_HOME/frameworks/js/FlexJS/src" "$@"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc9532b2/js/bin/compc.bat
----------------------------------------------------------------------
diff --git a/js/bin/compc.bat b/js/bin/compc.bat
new file mode 100644
index 0000000..909381a
--- /dev/null
+++ b/js/bin/compc.bat
@@ -0,0 +1,29 @@
+@echo off
+
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License.  You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+rem
+rem mxmlc.bat script to launch falcon-mxmlc.jar in Windows Command Prompt.
+rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
+rem
+
+if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..\..) else echo Using Falcon codebase: %FALCON_HOME%
+
+if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..\..) else echo Using Flex SDK: %FLEX_HOME%
+
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks"
-jar "%FALCON_HOME%\lib\mxmlc.jar" -js-output-type=FLEXJS -sdk-js-lib="%FLEX_HOME%\frameworks\js\FlexJS\src"
%*
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc9532b2/js/bin/mxmlc
----------------------------------------------------------------------
diff --git a/js/bin/mxmlc b/js/bin/mxmlc
new file mode 100755
index 0000000..9609620
--- /dev/null
+++ b/js/bin/mxmlc
@@ -0,0 +1,70 @@
+#!/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	
+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" "$@"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc9532b2/js/bin/mxmlc.bat
----------------------------------------------------------------------
diff --git a/js/bin/mxmlc.bat b/js/bin/mxmlc.bat
new file mode 100644
index 0000000..909381a
--- /dev/null
+++ b/js/bin/mxmlc.bat
@@ -0,0 +1,29 @@
+@echo off
+
+rem
+rem Licensed to the Apache Software Foundation (ASF) under one or more
+rem contributor license agreements.  See the NOTICE file distributed with
+rem this work for additional information regarding copyright ownership.
+rem The ASF licenses this file to You under the Apache License, Version 2.0
+rem (the "License"); you may not use this file except in compliance with
+rem the License.  You may obtain a copy of the License at
+rem
+rem     http://www.apache.org/licenses/LICENSE-2.0
+rem
+rem Unless required by applicable law or agreed to in writing, software
+rem distributed under the License is distributed on an "AS IS" BASIS,
+rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+rem See the License for the specific language governing permissions and
+rem limitations under the License.
+rem
+
+rem
+rem mxmlc.bat script to launch falcon-mxmlc.jar in Windows Command Prompt.
+rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
+rem
+
+if "x%FALCON_HOME%"=="x"  (set FALCON_HOME=%~dp0..\..) else echo Using Falcon codebase: %FALCON_HOME%
+
+if "x%FLEX_HOME%"=="x" (set FLEX_HOME=%~dp0..\..) else echo Using Flex SDK: %FLEX_HOME%
+
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Dflexcompiler="%FALCON_HOME%" -Dflexlib="%FLEX_HOME%\frameworks"
-jar "%FALCON_HOME%\lib\mxmlc.jar" -js-output-type=FLEXJS -sdk-js-lib="%FLEX_HOME%\frameworks\js\FlexJS\src"
%*
\ No newline at end of file


Mime
View raw message