You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2013/11/25 07:59:28 UTC
[18/18] git commit: [flex-asjs] [refs/heads/develop] - fix up
deploy/install scripts
fix up deploy/install scripts
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/52d35044
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/52d35044
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/52d35044
Branch: refs/heads/develop
Commit: 52d3504415d7a27e0940d4d80b7ad35bc45f50e1
Parents: 3688bc7
Author: Alex Harui <ah...@apache.org>
Authored: Sun Nov 24 21:55:54 2013 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Sun Nov 24 21:55:54 2013 -0800
----------------------------------------------------------------------
scripts/deploy.bat | 210 ++++++++++++++++++-----------------------
scripts/deploy.sh | 145 +++++++++++++---------------
scripts/setuplaunches.bat | 48 ++++------
scripts/setuplaunches.sh | 8 +-
4 files changed, 185 insertions(+), 226 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d35044/scripts/deploy.bat
----------------------------------------------------------------------
diff --git a/scripts/deploy.bat b/scripts/deploy.bat
index a0b0eb8..58f7134 100755
--- a/scripts/deploy.bat
+++ b/scripts/deploy.bat
@@ -1,39 +1,31 @@
-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.
-
+@echo off
+REM ################################################################################
+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 ################################################################################
if "%~1" == "" goto error
goto check2
:error
-echo Usage: deploy.bat [absolute path to Apache Flex SDK] [absolute path to new folder]
+echo Usage: deploy.bat [absolute path to Apache Flex SDK]
goto end
:check2
-if "%~2" == "" goto error
if "%GOOG_HOME%" == "" goto nogoog
goto checkjava
@@ -50,96 +42,82 @@ echo JAVA_HOME environment variable not set. Set to folder containing bin\java.
goto end
:copyfiles
-echo "Copying Apache Flex SDK (be patient, lots of files)..."
-md %2
-xcopy /s %1\*.* %2
-
echo %~d0%~p0
setlocal
-set BASEDIR=%~d0%~p0
-echo Installing FlexJS files from %BASEDIR% to %2
-
-echo removing Flex files
-del /q %2\ant\lib\*.*
-del /q %2\bin\*.*
-del %2\lib\asc.jar
-del %2\lib\asdoc.jar
-del %2\lib\batik-all-flex.jar
-del %2\lib\compc.jar
-del %2\lib\copylocale.jar
-del %2\lib\digest.jar
-del %2\lib\fcsh.jar
-del %2\lib\fdb.jar
-del %2\lib\flex-compiler-oem.jar
-del %2\lib\fxgutils.jar
-del /q %2\lib\mxmlc_*.jar
-del %2\lib\optimizer.jar
-del %2\lib\swcdepends.jar
-del %2\lib\swfdump.jar
-del %2\lib\swfutils.jar
-del %2\lib\velocity-dep-1.4-flex.jar
-
-del /q /s %2\lib\external\*.*
-rd /q /s %2\lib\external
-del %2\flex-sdk-description.xml
-del %2\frameworks\flex-config.xml
-del /q %2\frameworks\libs\automation\*.*
-rd /q %2\frameworks\libs\automation
-del /q %2\frameworks\libs\mobile\*.*
-rd /q %2\frameworks\libs\mobile
-del /q %2\frameworks\libs\mx\*.*
-rem rd %2\frameworks\libs\mx FB needs this
-
-
del /q %2\frameworks\libs\*.*
-
-
-
-
-
-echo copying Falcon files"
-xcopy /y /s "%BASEDIR%\ant\lib\*.*" %2\ant\lib
-
-xcopy /y /s "%BASEDIR%\bin\*.*" %2\bin
-
-md %2\bin-legacy
-
-xcopy /y /s "%BASEDIR%\bin-legacy\*.*" %2\bin-legacy
-
-xcopy /y /s "%BASEDIR%\lib\*.*" %2\lib
-
-
-echo copying FalconJS files
-
-md %2\js
-
-xcopy /y /s "%BASEDIR%\js\*.*" %2\js
-
-
-echo copying FlexJS files
-
-xcopy /y /s "%BASEDIR%\frameworks\libs\*.*" %2\frameworks\libs
-
-md %2\frameworks\as
-mkdir %2\frameworks\as\src
-
-xcopy /y /s "%BASEDIR%\frameworks\src\*.*" %2\frameworks\as\src
-
-
-move %2\frameworks\as\src\basic-manifest.xml %2\frameworks
-
-move %2\frameworks\as\src\html5-manifest.xml %2\frameworks
-
-move %2\frameworks\as\src\flex-sdk-description.xml %2
-
-move %2\frameworks\as\src\flex-config.xml %2\frameworks
-
-
-endlocal
-
-copy %1\bin\adl.* %2\bin
-copy %1\bin\adt.* %2\bin
-
-setuplaunches.bat %2 "%JAVA_HOME%\bin\java.exe"
+set IDE_SDK_DIR=%~d0%~p0
+if "%IDE_SDK_DIR:~-1%"=="\" SET IDE_SDK_DIR=%IDE_SDK_DIR:~0,-1%
+set FLEX_SDK_DIR=%~1
+
+REM
+REM Copy all the AIR SDK files to the IDE SDK.
+REM Copy files first, then directories with (/s).
+REM
+:copyAdobeAIRSDK
+echo Copying the AIR SDK files from %FLEX_SDK_DIR% to %IDE_SDK_DIR%
+mkdir %IDE_SDK_DIR%\samples
+
+for %%G in (
+ "AIR SDK license.pdf"
+ "AIR SDK Readme.txt"
+ bin\adl.exe
+ bin\adt.bat
+ lib\adt.jar
+ samples\descriptor-sample.xml) do (
+
+ if exist %FLEX_SDK_DIR%\%%G (
+ copy /y %FLEX_SDK_DIR%\%%G %IDE_SDK_DIR%\%%G
+ )
+)
+
+for %%G in (
+ frameworks\libs\air
+ frameworks\projects\air
+ include
+ install\android
+ lib\android
+ lib\aot
+ lib\nai
+ lib\win
+ runtimes\air\android
+ runtimes\air\mac
+ runtimes\air\win
+ runtimes\air-captive\mac
+ runtimes\air-captive\win
+ samples\badge
+ samples\icons
+ templates\air
+ templates\extensions) do (
+
+ if exist %FLEX_SDK_DIR%\%%G (
+ REM Make the directory so it won't prompt for file or directory.
+ if not exist %IDE_SDK_DIR%\%%G mkdir %IDE_SDK_DIR%\%%G
+ xcopy /q /y /e /i /c /r %FLEX_SDK_DIR%\%%G %IDE_SDK_DIR%\%%G
+ if %errorlevel% NEQ 0 GOTO end
+ )
+)
+
+
+mkdir %IDE_SDK_DIR%\frameworks\libs\player
+xcopy /q /y /e /i /c /r %FLEX_SDK_DIR%\frameworks\libs\player %IDE_SDK_DIR%\frameworks\libs\player
+mkdir %IDE_SDK_DIR%\ide
+mkdir %IDE_SDK_DIR%\ide\flashbuilder
+copy /y %FLEX_SDK_DIR%\ide\flashbuilder\flashbuilder-config.xml %IDE_SDK_DIR%\ide\flashbuilder\
+copy /y %FLEX_SDK_DIR%\frameworks\mxml-manifest.xml %IDE_SDK_DIR%\frameworks
+copy /y %FLEX_SDK_DIR%\frameworks\spark-manifest.xml %IDE_SDK_DIR%\frameworks
+mkdir %IDE_SDK_DIR%\frameworks\themes
+mkdir %IDE_SDK_DIR%\frameworks\themes\Halo
+copy /y %FLEX_SDK_DIR%\frameworks\themes\Halo\halo.swc %IDE_SDK_DIR%\frameworks\themes\Halo
+copy /y %FLEX_SDK_DIR%\frameworks\macfonts.ser %IDE_SDK_DIR%\frameworks
+copy /y %FLEX_SDK_DIR%\frameworks\localFonts.ser %IDE_SDK_DIR%\frameworks
+copy /y %FLEX_SDK_DIR%\frameworks\macfonts.ser %IDE_SDK_DIR%\frameworks
+copy /y %IDE_SDK_DIR%\frameworks\air-config.xml %IDE_SDK_DIR%\frameworks\airmobile-config.xml
+mkdir %IDE_SDK_DIR%\frameworks\locale
+mkdir %IDE_SDK_DIR%\frameworks\mx
+mkdir %IDE_SDK_DIR%\frameworks\projects
+mkdir %IDE_SDK_DIR%\frameworks\rsls
+
+echo Setting up Launch Configs
+setuplaunches.bat %IDE_SDK_DIR% "%JAVA_HOME%\bin\java.exe"
:end
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d35044/scripts/deploy.sh
----------------------------------------------------------------------
diff --git a/scripts/deploy.sh b/scripts/deploy.sh
index 271e4c4..aa96456 100755
--- a/scripts/deploy.sh
+++ b/scripts/deploy.sh
@@ -18,6 +18,26 @@
##
################################################################################
+# copyFileOrDirectory from ADOBE_FLEX_SDK_DIR to IDE_SDK_DIR
+# param1 is file or directory to copy
+copyFileOrDirectory()
+{
+ f="$1"
+
+ dir=`dirname "${BASEDIR}/$f"`
+
+ echo Copying $f to ${dir}
+
+ if [ -f "${FLEX_SDK_DIR}/$f" ] ; then
+ mkdir -p "${dir}"
+ cp -p "${FLEX_SDK_DIR}/$f" "${BASEDIR}/$f"
+ fi
+
+ if [ -d "${FLEX_SDK_DIR}/$f" ] ; then
+ rsync --archive --ignore-existing --force "${FLEX_SDK_DIR}/$f" "${dir}"
+ fi
+}
+
i=0
argv=()
for arg in "$@"; do
@@ -27,17 +47,7 @@ done
if [ "${argv[0]}" = "" ]
then
- echo "Usage: deploy.sh <path to existing Apache Flex SDK> <path to new folder>"
- exit
-fi
-if [ "${argv[1]}" = "" ]
- then
- echo "Usage: deploy.sh <path to existing Apache Flex SDK> <path to new folder>"
- exit
-fi
-if [ -d "${argv[1]}" ]
- then
- echo "Error: folder already exists"
+ echo "Usage: deploy.sh <path to existing Apache Flex SDK>"
exit
fi
if [ "$GOOG_HOME" = "" ]
@@ -50,75 +60,54 @@ if [ "$JAVA_HOME" = "" ]
JAVA_HOME="/System/Library/Java/JavaVirtualMachines/1.6.0.jdk/Contents/Home"
fi
-echo "Copying Apache Flex SDK (be patient, lots of files)..."
-mkdir -pv "${argv[1]}"
-if [ ! -d "${argv[1]}" ]
- then
- echo "Error: creating destination folder '${argv[1]}'"
- exit
+FLEX_SDK_DIR="${argv[0]}"
+RELBASEDIR=$(dirname $0)
+if [ "$RELBASEDIR" = "" ]
+ then
+ echo "Could not determine script folder. Did you use '. deploy.sh' instead of './deploy.sh'?"
+ exit
fi
-DESTDIR=`cd "${argv[1]}"; pwd`
-cp -r "${argv[0]}"/* "$DESTDIR"
-
-BASEDIR=$(dirname $0)
-echo "Installing FlexJS files from $BASEDIR to $DESTDIR"
+BASEDIR=`cd "$RELBASEDIR"; pwd`
-echo "Removing Flex files"
-rm -f "$DESTDIR/ant/lib"/*
-rm "$DESTDIR/bin"/*
-rm "$DESTDIR/lib/asc.jar"
-rm "$DESTDIR/lib/asdoc.jar"
-rm "$DESTDIR/lib/batik-all-flex.jar"
-rm "$DESTDIR/lib/compc.jar"
-rm "$DESTDIR/lib/copylocale.jar"
-rm "$DESTDIR/lib/digest.jar"
-rm "$DESTDIR/lib/fcsh.jar"
-rm "$DESTDIR/lib/fdb.jar"
-rm "$DESTDIR/lib/flex-compiler-oem.jar"
-rm "$DESTDIR/lib/fxgutils.jar"
-rm "$DESTDIR/lib"/mxmlc_*.jar
-rm "$DESTDIR/lib/optimizer.jar"
-rm "$DESTDIR/lib/swcdepends.jar"
-rm "$DESTDIR/lib/swfdump.jar"
-rm "$DESTDIR/lib/swfutils.jar"
-rm "$DESTDIR/lib/velocity-dep-1.4-flex.jar"
-rm -r "$DESTDIR/lib/external"/*
-rmdir "$DESTDIR/lib/external"
-rm "$DESTDIR/flex-sdk-description.xml"
-rm "$DESTDIR/frameworks/flex-config.xml"
-rm "$DESTDIR/frameworks/libs/automation"/*
-rmdir "$DESTDIR/frameworks/libs/automation"
-rm "$DESTDIR/frameworks/libs/mobile"/*
-rmdir "$DESTDIR/frameworks/libs/mobile"
-rm "$DESTDIR/frameworks/libs/mx"/*
-# rmdir "$DESTDIR/frameworks/libs/mx" FB needs this
-rm "$DESTDIR/frameworks/libs"/*
-
-echo "Copying Falcon files"
-mkdir -p "$DESTDIR/ant/lib"
-cp -r "$BASEDIR/ant/lib"/* "$DESTDIR/ant/lib"
-cp -r "$BASEDIR/bin"/* "$DESTDIR/bin"
-mkdir "$DESTDIR/bin-legacy"
-cp -r "$BASEDIR/bin-legacy"/* "$DESTDIR/bin-legacy"
-cp -r "$BASEDIR/lib"/* "$DESTDIR/lib"
-
-echo "Copying FalconJS files"
-mkdir "$DESTDIR/js"
-cp -r "$BASEDIR/js"/* "$DESTDIR/js"
-
-echo "Copying FlexJS files"
-cp -r "$BASEDIR/frameworks/libs"/* "$DESTDIR/frameworks/libs"
-mkdir "$DESTDIR/frameworks/as"
-mkdir "$DESTDIR/frameworks/as/src"
-cp -r "$BASEDIR/frameworks/src"/* "$DESTDIR/frameworks/as/src"
+echo "Copying AIR and Flash SDK from ${FLEX_SDK_DIR} to ${BASEDIR}"
+files=(
+ "AIR SDK license.pdf"
+ "AIR SDK Readme.txt"
+ bin/adl.exe
+ bin/adt.bat
+ frameworks/libs/air
+ frameworks/libs/player
+ frameworks/projects/air
+ include
+ install/android
+ lib/adt.jar
+ lib/android
+ lib/aot
+ lib/nai
+ lib/win
+ runtimes
+ samples/badge
+ samples/descriptor-sample.xml
+ samples/icons
+ templates/air
+ templates/extensions)
+for file in "${files[@]}"
+do
+ copyFileOrDirectory "$file"
+done
-mv "$DESTDIR/frameworks/as/src/basic-manifest.xml" "$DESTDIR/frameworks"
-mv "$DESTDIR/frameworks/as/src/html5-manifest.xml" "$DESTDIR/frameworks"
-mv "$DESTDIR/frameworks/as/src/flex-sdk-description.xml" "$DESTDIR"
-mv "$DESTDIR/frameworks/as/src/flex-config.xml" "$DESTDIR/frameworks"
+copyFileOrDirectory ide/flashbuilder/flashbuilder-config.xml
+copyFileOrDirectory frameworks/mxml-manifest.xml
+copyFileOrDirectory frameworks/spark-manifest.xml
+copyFileOrDirectory frameworks/themes/Halo/halo.swc
+copyFileOrDirectory frameworks/macfonts.ser
+copyFileOrDirectory frameworks/winfonts.ser
+cp frameworks/air-config.xml frameworks/airmobile-config.xml
+mkdir frameworks/locale
+mkdir frameworks/mx
+mkdir frameworks/projects
+mkdir frameworks/rsls
-# needed for AIR apps
-cp "${argv[0]}/bin/adl" "$DESTDIR/bin"
-cp "${argv[0]}/bin/adt" "$DESTDIR/bin"
-./setuplaunches.sh "$DESTDIR" $JAVA_HOME/bin/java
+echo "Setting up Launch Configs"
+./setuplaunches.sh "$BASEDIR" $JAVA_HOME/bin/java
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d35044/scripts/setuplaunches.bat
----------------------------------------------------------------------
diff --git a/scripts/setuplaunches.bat b/scripts/setuplaunches.bat
index c01af14..36fb060 100755
--- a/scripts/setuplaunches.bat
+++ b/scripts/setuplaunches.bat
@@ -1,30 +1,22 @@
@echo off
-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 ## 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 ################################################################################
if "%~1" == "" goto usage
goto check2
@@ -82,7 +74,7 @@ echo ^<listEntry value='org.eclipse.ui.externaltools.launchGroup'/^> >> "%~1\ide
echo ^</listAttribute^> >> "%~1\ide\flashbuilder\%FILENAME%"
echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='%~2'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
-echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler=^"%~1^" -Dflexlib=^"%~1\frameworks^" -jar %~1\js\lib\mxmlc.jar -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib=%GOOG_HOME% -sdk-js-lib=%~1\js\src -fb ^"${project_loc}^"'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
+echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler=^"%~1^" -Dflexlib=^"%~1\frameworks^" -jar %~1\js\lib\mxmlc.jar -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib=%GOOG_HOME% -sdk-js-lib=%~1\frameworks\js\FlexJS\src -fb ^"${project_loc}^"'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
echo ^</launchConfiguration^> >> "%~1\ide\flashbuilder\%FILENAME%"
set FILENAME=FlexJS (COMPC).launch
@@ -108,7 +100,7 @@ echo ^<listEntry value='org.eclipse.ui.externaltools.launchGroup'/^> >> "%~1\ide
echo ^</listAttribute^> >> "%~1\ide\flashbuilder\%FILENAME%"
echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='${project}'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='%~2'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
-echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler=^"%~1^" -Dflexlib=^"%~1\frameworks^" -jar %~1\js\lib\mxmlc.jar -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib=%GOOG_HOME% -sdk-js-lib=%~1\js\src -fb ^"${project_loc}^"'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
+echo ^<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler=^"%~1^" -Dflexlib=^"%~1\frameworks^" -jar %~1\js\lib\mxmlc.jar -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib=%GOOG_HOME% -sdk-js-lib=%~1\frameworks\js\FlexJS\src -fb ^"${project_loc}^"'/^> >> "%~1\ide\flashbuilder\%FILENAME%"
echo ^</launchConfiguration^> >> "%~1\ide\flashbuilder\%FILENAME%"
endlocal
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/52d35044/scripts/setuplaunches.sh
----------------------------------------------------------------------
diff --git a/scripts/setuplaunches.sh b/scripts/setuplaunches.sh
index 443ba45..e7312c3 100755
--- a/scripts/setuplaunches.sh
+++ b/scripts/setuplaunches.sh
@@ -27,12 +27,12 @@ done
if [ "${argv[0]}" = "" ]
then
- echo "Usage: setuplaunches <absolute path to Apache Flex SDK> <absolute path to Java executable>"
+ echo "Usage: setuplaunches <absolute path to Apache FlexJS SDK> <absolute path to Java executable>"
exit
fi
if [ "${argv[1]}" = "" ]
then
- echo "Usage: setuplaunches <absolute path to Apache Flex SDK> <absolute path to Java executable>"
+ echo "Usage: setuplaunches <absolute path to Apache FlexJS SDK> <absolute path to Java executable>"
exit
fi
if [ ! -d "${argv[0]}/frameworks/" ]
@@ -83,7 +83,7 @@ echo "<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>" >> "${argv[
echo "</listAttribute>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='\${project}'/>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='${argv[1]}'/>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
-echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler="${argv[0]}" -Dflexlib="${argv[0]}/frameworks" -jar "${argv[0]}/js/lib/mxmlc.jar" -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib="$GOOG_HOME" -sdk-js-lib="${argv[0]}/js/src" -fb "\${project_loc}"'/>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
+echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler="${argv[0]}" -Dflexlib="${argv[0]}/frameworks" -jar "${argv[0]}/js/lib/mxmlc.jar" -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib="$GOOG_HOME" -sdk-js-lib="${argv[0]}/frameworks/js/FlexJS/src" -fb "\${project_loc}"'/>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
echo "</launchConfiguration>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
FILENAME="FlexJS (COMPC).launch"
@@ -109,5 +109,5 @@ echo "<listEntry value='org.eclipse.ui.externaltools.launchGroup'/>" >> "${argv[
echo "</listAttribute>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LAUNCH_CONFIGURATION_BUILD_SCOPE' value='\${project}'/>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_LOCATION' value='${argv[1]}'/>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
-echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler="${argv[0]}" -Dflexlib="${argv[0]}/frameworks" -jar "${argv[0]}/js/lib/compc.jar" -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib=$GOOG_HOME -sdk-js-lib=${argv[0]}/js/src -fb "\${project_loc}"' />" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
+echo "<stringAttribute key='org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS' value='-Xmx384m -Dfile.encoding=UTF8 -Dsun.io.useCanonCaches=false -Dflexcompiler="${argv[0]}" -Dflexlib="${argv[0]}/frameworks" -jar "${argv[0]}/js/lib/compc.jar" -compiler.mxml.children-as-data -compiler.binding-value-change-event-type=valueChange -js-output-type=FLEXJS -closure-lib=$GOOG_HOME -sdk-js-lib=${argv[0]}/frameworks/js/FlexJS/src -fb "\${project_loc}"' />" >> "${argv[0]}/ide/flashbuilder/$FILENAME"
echo "</launchConfiguration>" >> "${argv[0]}/ide/flashbuilder/$FILENAME"