You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/09/09 08:47:59 UTC
[royale-asjs] 03/03: Revert "looking for differences between ANT
and MAVEN sdks"
This is an automated email from the ASF dual-hosted git repository.
carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit a17847e341c729cb09ce823f448e8eb9310b5950
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 9 10:47:20 2018 +0200
Revert "looking for differences between ANT and MAVEN sdks"
This reverts commit d1bd74416a3a1cd2ef94422a397a75641d08ad81.
---
distribution/src/main/resources/bin/compc | 4 ++--
distribution/src/main/resources/bin/compc.bat | 2 +-
distribution/src/main/resources/bin/mxmlc | 4 ++--
distribution/src/main/resources/bin/mxmlc.bat | 2 +-
distribution/src/main/resources/bin/optimizer | 2 +-
distribution/src/main/resources/bin/swcdepends | 2 +-
distribution/src/main/resources/bin/swcdepends.bat | 6 +++---
distribution/src/main/resources/bin/swfdump | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/distribution/src/main/resources/bin/compc b/distribution/src/main/resources/bin/compc
index 4a37dd8..f3c137c 100755
--- a/distribution/src/main/resources/bin/compc
+++ b/distribution/src/main/resources/bin/compc
@@ -29,7 +29,7 @@ then
SCRIPT_HOME=`dirname "$0"`
ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
else
- echo Using Royale codebase: $ROYALE_COMPILER_HOME
+ echo Using Royale Compiler codebase: $ROYALE_COMPILER_HOME
fi
if [ "x${ROYALE_HOME}" = "x" ]
@@ -68,4 +68,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-compc.jar" "$@"
diff --git a/distribution/src/main/resources/bin/compc.bat b/distribution/src/main/resources/bin/compc.bat
index 54b9ca3..a70aa3d 100644
--- a/distribution/src/main/resources/bin/compc.bat
+++ b/distribution/src/main/resources/bin/compc.bat
@@ -24,7 +24,7 @@ rem
setlocal
-if "x%ROYALE_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
+if "x%ROYALE_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale Compiler codebase: %ROYALE_COMPILER_HOME%
if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
diff --git a/distribution/src/main/resources/bin/mxmlc b/distribution/src/main/resources/bin/mxmlc
index 061cdf4..3ab2ed5 100755
--- a/distribution/src/main/resources/bin/mxmlc
+++ b/distribution/src/main/resources/bin/mxmlc
@@ -29,7 +29,7 @@ then
SCRIPT_HOME=`dirname "$0"`
ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
else
- echo Using Royale codebase: $ROYALE_COMPILER_HOME
+ echo Using Royale Compiler codebase: $ROYALE_COMPILER_HOME
fi
if [ "x${ROYALE_HOME}" = "x" ]
@@ -68,4 +68,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-mxmlc.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-mxmlc.jar" "$@"
diff --git a/distribution/src/main/resources/bin/mxmlc.bat b/distribution/src/main/resources/bin/mxmlc.bat
index 37458cf..c5605ed 100644
--- a/distribution/src/main/resources/bin/mxmlc.bat
+++ b/distribution/src/main/resources/bin/mxmlc.bat
@@ -24,7 +24,7 @@ rem
setlocal
-if "x%ROYALE_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale codebase: %ROYALE_COMPILER_HOME%
+if "x%ROYALE_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale Compiler codebase: %ROYALE_COMPILER_HOME%
if "x%ROYALE_HOME%"=="x" (set ROYALE_HOME=%~dp0..) else echo Using Royale SDK: %ROYALE_HOME%
diff --git a/distribution/src/main/resources/bin/optimizer b/distribution/src/main/resources/bin/optimizer
index b7c68e7..02446a8 100644
--- a/distribution/src/main/resources/bin/optimizer
+++ b/distribution/src/main/resources/bin/optimizer
@@ -29,7 +29,7 @@ then
SCRIPT_HOME=`dirname "$0"`
ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
else
- echo Using Royale codebase: $ROYALE_COMPILER_HOME
+ echo Using Royale Compiler codebase: $ROYALE_COMPILER_HOME
fi
case `uname` in
diff --git a/distribution/src/main/resources/bin/swcdepends b/distribution/src/main/resources/bin/swcdepends
index 2838227..65c1d91 100644
--- a/distribution/src/main/resources/bin/swcdepends
+++ b/distribution/src/main/resources/bin/swcdepends
@@ -68,4 +68,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/royale-swcdepends.jar" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "${ROYALE_COMPILER_HOME}/lib/compiler-swcdepends.jar" "$@"
diff --git a/distribution/src/main/resources/bin/swcdepends.bat b/distribution/src/main/resources/bin/swcdepends.bat
index b4c7a3e..af325e9 100644
--- a/distribution/src/main/resources/bin/swcdepends.bat
+++ b/distribution/src/main/resources/bin/swcdepends.bat
@@ -18,14 +18,14 @@ rem limitations under the License.
rem
rem
-rem swcdepends.bat script to launch royale-swcdepends.jar in Windows Command Prompt.
+rem swcdepends.bat script to launch compiler-swcdepends.jar in Windows Command Prompt.
rem On OSX, Unix, or Cygwin, use the swcdepends 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_COMPILER_HOME%"=="x" (set ROYALE_COMPILER_HOME=%~dp0..) else echo Using Royale Compiler 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%\lib\royale-swcdepends.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\lib\compiler-swcdepends.jar" %*
diff --git a/distribution/src/main/resources/bin/swfdump b/distribution/src/main/resources/bin/swfdump
index e4d6364..55c3ea0 100644
--- a/distribution/src/main/resources/bin/swfdump
+++ b/distribution/src/main/resources/bin/swfdump
@@ -29,7 +29,7 @@ then
SCRIPT_HOME=`dirname "$0"`
ROYALE_COMPILER_HOME=${SCRIPT_HOME}/..
else
- echo Using Royale codebase: $ROYALE_COMPILER_HOME
+ echo Using Royale Compiler codebase: $ROYALE_COMPILER_HOME
fi
case `uname` in