You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2019/11/21 17:44:43 UTC
[royale-compiler] branch develop updated: compiler-jx: added some
optional scripts to override the ones from compiler
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-compiler.git
The following commit(s) were added to refs/heads/develop by this push:
new f0d9176 compiler-jx: added some optional scripts to override the ones from compiler
f0d9176 is described below
commit f0d9176c405c0508255d20a98b095ea21ff4b238
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Thu Nov 21 09:44:36 2019 -0800
compiler-jx: added some optional scripts to override the ones from compiler
If used, these override scripts allow an SDK to have a working bin/mxmlc and bin/compc when royale-config.xml and other config files contain extended options for JS that compiler doesn't understand
---
.../src/assembly/compiler-override-scripts/compc | 71 ++++++++++++++++++++++
.../assembly/compiler-override-scripts/compc.bat | 32 ++++++++++
.../src/assembly/compiler-override-scripts/mxmlc | 71 ++++++++++++++++++++++
.../assembly/compiler-override-scripts/mxmlc.bat | 33 ++++++++++
4 files changed, 207 insertions(+)
diff --git a/compiler-jx/src/assembly/compiler-override-scripts/compc b/compiler-jx/src/assembly/compiler-override-scripts/compc
new file mode 100644
index 0000000..bc17b37
--- /dev/null
+++ b/compiler-jx/src/assembly/compiler-override-scripts/compc
@@ -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.
+##
+################################################################################
+
+#
+# compc shell script to launch compiler-compc.jar on OSX, Unix, or Cygwin.
+# In Windows Command Prompt, use compc.bat instead.
+#
+
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
+then
+ SCRIPT_HOME=`dirname "$0"`
+ ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
+else
+ echo Using Royale codebase: $ROYALE_COMPILER_HOME
+fi
+
+if [ "x${ROYALE_HOME}" = "x" ]
+then
+ SCRIPT_HOME=`dirname "$0"`
+ ROYALE_HOME=${SCRIPT_HOME}/..
+else
+ echo Using Royale SDK: $ROYALE_HOME
+fi
+
+case `uname` in
+ CYGWIN*)
+ OS="Windows"
+ ;;
+ *)
+ OS=Unix
+esac
+
+D32=''
+
+if [ $OS = "Windows" ]; then
+
+ ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
+ ROYALE_HOME=`cygpath -m $ROYALE_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 -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/js/lib/compc.jar" --targets=SWF "$@"
diff --git a/compiler-jx/src/assembly/compiler-override-scripts/compc.bat b/compiler-jx/src/assembly/compiler-override-scripts/compc.bat
new file mode 100644
index 0000000..b18d134
--- /dev/null
+++ b/compiler-jx/src/assembly/compiler-override-scripts/compc.bat
@@ -0,0 +1,32 @@
+@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 compc.bat script to launch compiler-compc.jar in Windows Command Prompt.
+rem On OSX, Unix, or Cygwin, use the compc shell script instead.
+rem
+
+setlocal
+
+if "x%ROYALE_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
+
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
+
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%/frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\compc.jar" --targets=SWF %*
+
diff --git a/compiler-jx/src/assembly/compiler-override-scripts/mxmlc b/compiler-jx/src/assembly/compiler-override-scripts/mxmlc
new file mode 100644
index 0000000..366818f
--- /dev/null
+++ b/compiler-jx/src/assembly/compiler-override-scripts/mxmlc
@@ -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 compiler-mxmlc.jar on OSX, Unix, or Cygwin.
+# In Windows Command Prompt, use mxmlc.bat instead.
+#
+
+if [ "x${ROYALE_COMPILER_HOME}" = "x" ]
+then
+ SCRIPT_HOME=`dirname "$0"`
+ ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
+else
+ echo Using Royale codebase: $ROYALE_COMPILER_HOME
+fi
+
+if [ "x${ROYALE_HOME}" = "x" ]
+then
+ SCRIPT_HOME=`dirname "$0"`
+ ROYALE_HOME=${SCRIPT_HOME}/..
+else
+ echo Using Royale SDK: $ROYALE_HOME
+fi
+
+case `uname` in
+ CYGWIN*)
+ OS="Windows"
+ ;;
+ *)
+ OS=Unix
+esac
+
+D32=''
+
+if [ $OS = "Windows" ]; then
+
+ ROYALE_COMPILER_HOME=`cygpath -m $ROYALE_COMPILER_HOME`
+ ROYALE_HOME=`cygpath -m $ROYALE_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 -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/js/lib/mxmlc.jar" --targets=SWF "$@"
diff --git a/compiler-jx/src/assembly/compiler-override-scripts/mxmlc.bat b/compiler-jx/src/assembly/compiler-override-scripts/mxmlc.bat
new file mode 100644
index 0000000..5f71d7d
--- /dev/null
+++ b/compiler-jx/src/assembly/compiler-override-scripts/mxmlc.bat
@@ -0,0 +1,33 @@
+@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 compiler-mxmlc.jar in Windows Command Prompt.
+rem On OSX, Unix, or Cygwin, use the mxmlc shell script instead.
+rem
+
+setlocal
+
+if "x%ROYALE_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
+
+if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
+
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" --targets=SWF %*
+
+