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:58 UTC
[royale-asjs] 02/03: Revert "continue solving differences between
ANT and MAVEN build distributions"
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 39655dd2e7b96ea0b173ceac48cf94ea9f90cdf4
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Sun Sep 9 10:46:54 2018 +0200
Revert "continue solving differences between ANT and MAVEN build distributions"
This reverts commit 214ae5d2ddd770b01431fb2e3e30c9708510ecb7.
---
distribution/src/main/resources/js/bin/asjsc | 2 +-
distribution/src/main/resources/js/bin/asjsc.bat | 2 +-
distribution/src/main/resources/js/bin/asjscnpm | 49 ----------------------
distribution/src/main/resources/js/bin/asjscompc | 2 +-
.../src/main/resources/js/bin/asjscompc.bat | 2 +-
.../src/main/resources/js/bin/asjscompcnpm | 49 ----------------------
distribution/src/main/resources/js/bin/asnodec | 2 +-
distribution/src/main/resources/js/bin/asnodec.bat | 2 +-
distribution/src/main/resources/js/bin/asnodecnpm | 49 ----------------------
distribution/src/main/resources/js/bin/compc | 2 +-
distribution/src/main/resources/js/bin/compc.bat | 2 +-
distribution/src/main/resources/js/bin/compcnpm | 49 ----------------------
distribution/src/main/resources/js/bin/externc | 2 +-
distribution/src/main/resources/js/bin/externc.bat | 2 +-
distribution/src/main/resources/js/bin/externcnpm | 49 ----------------------
distribution/src/main/resources/js/bin/jquery | 2 +-
distribution/src/main/resources/js/bin/jquery.bat | 2 +-
distribution/src/main/resources/js/bin/mxmlc | 2 +-
distribution/src/main/resources/js/bin/mxmlc.bat | 2 +-
distribution/src/main/resources/js/bin/mxmlcnpm | 49 ----------------------
20 files changed, 14 insertions(+), 308 deletions(-)
diff --git a/distribution/src/main/resources/js/bin/asjsc b/distribution/src/main/resources/js/bin/asjsc
index 0fedac4..10c3c2c 100755
--- a/distribution/src/main/resources/js/bin/asjsc
+++ b/distribution/src/main/resources/js/bin/asjsc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=jsc +configname=js "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=jsc +configname=js "$@"
diff --git a/distribution/src/main/resources/js/bin/asjsc.bat b/distribution/src/main/resources/js/bin/asjsc.bat
index b88b9cc..e3b0e19 100644
--- a/distribution/src/main/resources/js/bin/asjsc.bat
+++ b/distribution/src/main/resources/js/bin/asjsc.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -js-output-type=jsc +configname=js %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -js-output-type=jsc +configname=js %*
diff --git a/distribution/src/main/resources/js/bin/asjscnpm b/distribution/src/main/resources/js/bin/asjscnpm
deleted file mode 100755
index 8c9e9f8..0000000
--- a/distribution/src/main/resources/js/bin/asjscnpm
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/*
- *
- * 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.
- *
- */
-
-var child_process = require("child_process");
-var path = require("path");
-
-var scriptName = "asjsc";
-if(process.platform === "win32")
-{
- scriptName += ".bat";
-}
-
-var scriptPath = path.join(__dirname, scriptName);
-try
-{
- child_process.execFileSync(scriptPath, process.argv.slice(2),
- {
- stdio: "inherit",
- encoding: "utf8"
- });
-}
-catch(error)
-{
- if(error.status === null)
- {
- console.error("Error executing " + scriptName + " with code: " + error.code);
- process.exit(1);
- }
- process.exit(error.status);
-}
-process.exit(0);
\ No newline at end of file
diff --git a/distribution/src/main/resources/js/bin/asjscompc b/distribution/src/main/resources/js/bin/asjscompc
index a4e01af..4a12639 100755
--- a/distribution/src/main/resources/js/bin/asjscompc
+++ b/distribution/src/main/resources/js/bin/asjscompc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=jsc +configname=js "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=jsc +configname=js "$@"
diff --git a/distribution/src/main/resources/js/bin/asjscompc.bat b/distribution/src/main/resources/js/bin/asjscompc.bat
index bb88ab0..41b8a64 100644
--- a/distribution/src/main/resources/js/bin/asjscompc.bat
+++ b/distribution/src/main/resources/js/bin/asjscompc.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\compc.jar" -js-output-type=jsc +configname=js %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\compc.jar" -js-output-type=jsc +configname=js %*
diff --git a/distribution/src/main/resources/js/bin/asjscompcnpm b/distribution/src/main/resources/js/bin/asjscompcnpm
deleted file mode 100755
index 0cc2402..0000000
--- a/distribution/src/main/resources/js/bin/asjscompcnpm
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/*
- *
- * 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.
- *
- */
-
-var child_process = require("child_process");
-var path = require("path");
-
-var scriptName = "asjscompc";
-if(process.platform === "win32")
-{
- scriptName += ".bat";
-}
-
-var scriptPath = path.join(__dirname, scriptName);
-try
-{
- child_process.execFileSync(scriptPath, process.argv.slice(2),
- {
- stdio: "inherit",
- encoding: "utf8"
- });
-}
-catch(error)
-{
- if(error.status === null)
- {
- console.error("Error executing " + scriptName + " with code: " + error.code);
- process.exit(1);
- }
- process.exit(error.status);
-}
-process.exit(0);
\ No newline at end of file
diff --git a/distribution/src/main/resources/js/bin/asnodec b/distribution/src/main/resources/js/bin/asnodec
index 58d29fb..4c42764 100755
--- a/distribution/src/main/resources/js/bin/asnodec
+++ b/distribution/src/main/resources/js/bin/asnodec
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=node +configname=node "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=node +configname=node "$@"
diff --git a/distribution/src/main/resources/js/bin/asnodec.bat b/distribution/src/main/resources/js/bin/asnodec.bat
index be1ef07..5f6a379 100644
--- a/distribution/src/main/resources/js/bin/asnodec.bat
+++ b/distribution/src/main/resources/js/bin/asnodec.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -js-output-type=node +configname=node %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -js-output-type=node +configname=node %*
diff --git a/distribution/src/main/resources/js/bin/asnodecnpm b/distribution/src/main/resources/js/bin/asnodecnpm
deleted file mode 100644
index 8654736..0000000
--- a/distribution/src/main/resources/js/bin/asnodecnpm
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/*
- *
- * 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.
- *
- */
-
-var child_process = require("child_process");
-var path = require("path");
-
-var scriptName = "asnodec";
-if(process.platform === "win32")
-{
- scriptName += ".bat";
-}
-
-var scriptPath = path.join(__dirname, scriptName);
-try
-{
- child_process.execFileSync(scriptPath, process.argv.slice(2),
- {
- stdio: "inherit",
- encoding: "utf8"
- });
-}
-catch(error)
-{
- if(error.status === null)
- {
- console.error("Error executing " + scriptName + " with code: " + error.code);
- process.exit(1);
- }
- process.exit(error.status);
-}
-process.exit(0);
\ No newline at end of file
diff --git a/distribution/src/main/resources/js/bin/compc b/distribution/src/main/resources/js/bin/compc
index adab071..4063bb1 100755
--- a/distribution/src/main/resources/js/bin/compc
+++ b/distribution/src/main/resources/js/bin/compc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$ROYALE_HOME/frameworks" -sdk-js-lib="$ROYALE_HOME/frameworks/js/Royale/generated-sources" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/compc.jar" +royalelib="$ROYALE_HOME/frameworks" -sdk-js-lib="$ROYALE_HOME/frameworks/js/Royale/generated-sources" "$@"
diff --git a/distribution/src/main/resources/js/bin/compc.bat b/distribution/src/main/resources/js/bin/compc.bat
index fe5b69e..ec64b5b 100644
--- a/distribution/src/main/resources/js/bin/compc.bat
+++ b/distribution/src/main/resources/js/bin/compc.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\compc.jar" -sdk-js-lib="%ROYALE_HOME%\frameworks\js\Royale\generated-sources" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\compc.jar" -sdk-js-lib="%ROYALE_HOME%\frameworks\js\Royale\generated-sources" %*
diff --git a/distribution/src/main/resources/js/bin/compcnpm b/distribution/src/main/resources/js/bin/compcnpm
deleted file mode 100755
index e9e22af..0000000
--- a/distribution/src/main/resources/js/bin/compcnpm
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/*
- *
- * 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.
- *
- */
-
-var child_process = require("child_process");
-var path = require("path");
-
-var scriptName = "compc";
-if(process.platform === "win32")
-{
- scriptName += ".bat";
-}
-
-var scriptPath = path.join(__dirname, scriptName);
-try
-{
- child_process.execFileSync(scriptPath, process.argv.slice(2),
- {
- stdio: "inherit",
- encoding: "utf8"
- });
-}
-catch(error)
-{
- if(error.status === null)
- {
- console.error("Error executing " + scriptName + " with code: " + error.code);
- process.exit(1);
- }
- process.exit(error.status);
-}
-process.exit(0);
\ No newline at end of file
diff --git a/distribution/src/main/resources/js/bin/externc b/distribution/src/main/resources/js/bin/externc
index 548e25e..03393fa 100755
--- a/distribution/src/main/resources/js/bin/externc
+++ b/distribution/src/main/resources/js/bin/externc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/externc.jar" +royalelib="$ROYALE_HOME/frameworks" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/externc.jar" +royalelib="$ROYALE_HOME/frameworks" "$@"
diff --git a/distribution/src/main/resources/js/bin/externc.bat b/distribution/src/main/resources/js/bin/externc.bat
index 3004988..c5179318 100644
--- a/distribution/src/main/resources/js/bin/externc.bat
+++ b/distribution/src/main/resources/js/bin/externc.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\externc.jar" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\externc.jar" %*
diff --git a/distribution/src/main/resources/js/bin/externcnpm b/distribution/src/main/resources/js/bin/externcnpm
deleted file mode 100755
index a6c5c3a..0000000
--- a/distribution/src/main/resources/js/bin/externcnpm
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/*
- *
- * 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.
- *
- */
-
-var child_process = require("child_process");
-var path = require("path");
-
-var scriptName = "externc";
-if(process.platform === "win32")
-{
- scriptName += ".bat";
-}
-
-var scriptPath = path.join(__dirname, scriptName);
-try
-{
- child_process.execFileSync(scriptPath, process.argv.slice(2),
- {
- stdio: "inherit",
- encoding: "utf8"
- });
-}
-catch(error)
-{
- if(error.status === null)
- {
- console.error("Error executing " + scriptName + " with code: " + error.code);
- process.exit(1);
- }
- process.exit(error.status);
-}
-process.exit(0);
\ No newline at end of file
diff --git a/distribution/src/main/resources/js/bin/jquery b/distribution/src/main/resources/js/bin/jquery
index edcf903..0c310b3 100755
--- a/distribution/src/main/resources/js/bin/jquery
+++ b/distribution/src/main/resources/js/bin/jquery
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=jsc +configname=jquery "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -js-output-type=jsc +configname=jquery "$@"
diff --git a/distribution/src/main/resources/js/bin/jquery.bat b/distribution/src/main/resources/js/bin/jquery.bat
index f90ee2b..947b443 100644
--- a/distribution/src/main/resources/js/bin/jquery.bat
+++ b/distribution/src/main/resources/js/bin/jquery.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -js-output-type=jsc +configname=jquery %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -js-output-type=jsc +configname=jquery %*
diff --git a/distribution/src/main/resources/js/bin/mxmlc b/distribution/src/main/resources/js/bin/mxmlc
index abb1ca2..aa6ce34 100755
--- a/distribution/src/main/resources/js/bin/mxmlc
+++ b/distribution/src/main/resources/js/bin/mxmlc
@@ -67,4 +67,4 @@ fi
VMARGS="-Xmx384m -Dsun.io.useCanonCaches=false "
-java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalecompiler="$ROYALE_COMPILER_HOME" -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -sdk-js-lib="$ROYALE_HOME/frameworks/js/Royale/generated-sources" "$@"
+java $VMARGS $D32 $SETUP_SH_VMARGS -Droyalelib="$ROYALE_HOME/frameworks" -jar "$SCRIPT_HOME/../lib/mxmlc.jar" +royalelib="$ROYALE_HOME/frameworks" -sdk-js-lib="$ROYALE_HOME/frameworks/js/Royale/generated-sources" "$@"
diff --git a/distribution/src/main/resources/js/bin/mxmlc.bat b/distribution/src/main/resources/js/bin/mxmlc.bat
index 0bd02da..d7f93f8 100644
--- a/distribution/src/main/resources/js/bin/mxmlc.bat
+++ b/distribution/src/main/resources/js/bin/mxmlc.bat
@@ -26,4 +26,4 @@ if "x%ROYALE_COMPILER_HOME%"=="x" (set "ROYALE_COMPILER_HOME=%~dp0..\..") else
if "x%ROYALE_HOME%"=="x" (set "ROYALE_HOME=%~dp0..\..") else echo Using Royale SDK: %ROYALE_HOME%
-@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalecompiler="%ROYALE_COMPILER_HOME%" -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -sdk-js-lib="%ROYALE_HOME%\frameworks\js\Royale\generated-sources" %*
+@java -Dsun.io.useCanonCaches=false -Xms32m -Xmx512m -Droyalelib="%ROYALE_HOME%\frameworks" -jar "%ROYALE_COMPILER_HOME%\js\lib\mxmlc.jar" -sdk-js-lib="%ROYALE_HOME%\frameworks\js\Royale\generated-sources" %*
diff --git a/distribution/src/main/resources/js/bin/mxmlcnpm b/distribution/src/main/resources/js/bin/mxmlcnpm
deleted file mode 100755
index 5a6c710..0000000
--- a/distribution/src/main/resources/js/bin/mxmlcnpm
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env node
-
-/*
- *
- * 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.
- *
- */
-
-var child_process = require("child_process");
-var path = require("path");
-
-var scriptName = "mxmlc";
-if(process.platform === "win32")
-{
- scriptName += ".bat";
-}
-
-var scriptPath = path.join(__dirname, scriptName);
-try
-{
- child_process.execFileSync(scriptPath, process.argv.slice(2),
- {
- stdio: "inherit",
- encoding: "utf8"
- });
-}
-catch(error)
-{
- if(error.status === null)
- {
- console.error("Error executing " + scriptName + " with code: " + error.code);
- process.exit(1);
- }
- process.exit(error.status);
-}
-process.exit(0);
\ No newline at end of file