You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by cf...@apache.org on 2012/05/16 16:29:59 UTC
svn commit: r1339186 - in /incubator/flex/trunk/ide/flashbuilder:
makeApacheFlexForFlashBuilder.bat makeApacheFlexForFlashBuilder.sh
Author: cframpton
Date: Wed May 16 14:29:58 2012
New Revision: 1339186
URL: http://svn.apache.org/viewvc?rev=1339186&view=rev
Log:
Flashbuilder script tweaking.
Modified:
incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
Modified: incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat?rev=1339186&r1=1339185&r2=1339186&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat (original)
+++ incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.bat Wed May 16 14:29:58 2012
@@ -48,12 +48,6 @@ REM Adobe Flash Player Version 11.1
REM
set ADOBE_FB_GLOBALPLAYER_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
-REM
-REM Location of Adobe Flash Player within Flex SDK for FlashBuilder
-REM
-set FB_GLOBALPLAYER_DIR=%FLEX_HOME%\frameworks\libs\player\11.1
-set FB_GLOBALPLAYER_SWC=playerglobal.swc
-
if not [%1] == [] goto gotDir
echo Usage: %0 [directory for Apache Flex SDK for Adobe Flash Builder]
goto :eof
@@ -87,7 +81,7 @@ if %errorlevel% neq 0 goto errorExit
echo Uncompressing Apache Flex SDK to "%FLEX_HOME%"
if defined hasJarExe (
- pushd "%FLEX_HOME%" & jar xvf "%tempDir%\%APACHE_FLEX_BIN_DISTRO_FILE%" & popd
+ pushd "%FLEX_HOME%" & jar xf "%tempDir%\%APACHE_FLEX_BIN_DISTRO_FILE%" & popd
) else (
cscript //B //nologo extractAll.vbs "%tempDir%\%APACHE_FLEX_BIN_DISTRO_FILE%" "%FLEX_HOME%"
if %errorlevel% neq 0 goto errorExit
@@ -102,7 +96,7 @@ if %errorlevel% neq 0 goto errorExit
echo Uncompressing Adobe AIR Runtime Kit for Windows from "%tempDir%\%ADOBE_AIR_SDK_WIN_FILE%" to "%FLEX_HOME%"
if defined hasJarExe (
- pushd "%FLEX_HOME%" & jar xvf "%tempDir%\%ADOBE_AIR_SDK_WIN_FILE%" & popd
+ pushd "%FLEX_HOME%" & jar xf "%tempDir%\%ADOBE_AIR_SDK_WIN_FILE%" & popd
) else (
cscript //B //nologo extractAll.vbs "%tempDir%\%ADOBE_AIR_SDK_WIN_FILE%" "%FLEX_HOME%"
if %errorlevel% neq 0 goto errorExit
@@ -111,19 +105,18 @@ if defined hasJarExe (
REM
REM Download playerglobal.swc
REM
+set FB_GLOBALPLAYER_DIR=%FLEX_HOME%\frameworks\libs\player\11.1
if not exist "%FB_GLOBALPLAYER_DIR%" mkdir "%FB_GLOBALPLAYER_DIR%"
-echo Downloading Adobe Flash Player playerglobal.swc from "%ADOBE_FB_GLOBALPLAYER_SWC_URL%" to "%FB_GLOBALPLAYER_DIR%\%FB_GLOBALPLAYER_SWC%"
-cscript //B //nologo downloadFile.vbs "%ADOBE_FB_GLOBALPLAYER_SWC_URL%" "%FB_GLOBALPLAYER_DIR%\%FB_GLOBALPLAYER_SWC%"
+echo Downloading Adobe Flash Player playerglobal.swc from "%ADOBE_FB_GLOBALPLAYER_SWC_URL%" to "%FB_GLOBALPLAYER_DIR%\playerglobal.swc"
+cscript //B //nologo downloadFile.vbs "%ADOBE_FB_GLOBALPLAYER_SWC_URL%" "%FB_GLOBALPLAYER_DIR%\playerglobal.swc"
if %errorlevel% neq 0 goto errorExit
REM
REM Copy config files formatted for Flash Builder to frameworks.
REM
-echo Installing frameworks config file configured for use with Adobe Flash Builder
-set fbConfigDir=%FLEX_HOME%\ide\flashbuilder\config
-if not exist "%fbConfigDir%" mkdir "%fbConfigDir%"
-copy /y "%fbConfigDir%"\*-config.xml "%FLEX_HOME%\frameworks"
+echo Installing frameworks config files configured for use with Adobe Flash Builder
+copy /y "%FLEX_HOME%\ide\flashbuilder\config\*-config.xml" "%FLEX_HOME%\frameworks"
if %errorlevel% neq 0 goto errorExit
REM
Modified: incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh
URL: http://svn.apache.org/viewvc/incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh?rev=1339186&r1=1339185&r2=1339186&view=diff
==============================================================================
--- incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh (original)
+++ incubator/flex/trunk/ide/flashbuilder/makeApacheFlexForFlashBuilder.sh Wed May 16 14:29:58 2012
@@ -37,7 +37,6 @@ APACHE_FLEX_BIN_DISTRO_URL=http://people
# Adobe AIR SDK Version 3.1
ADOBE_AIR_SDK_MAC_URL=http://airdownload.adobe.com/air/mac/download/3.1/AdobeAIRSDK.tbz2
-ADOBE_AIR_SDK_WIN_URL=http://airdownload.adobe.com/air/win/download/3.1/AdobeAIRSDK.zip
# Adobe Flash Player Version 11.1
ADOBE_FLASHPLAYER_GLOBALPLAYER_SWC_URL=http://fpdownload.macromedia.com/get/flashplayer/updaters/11/playerglobal11_1.swc
@@ -59,31 +58,25 @@ mkdir -p "$tempDir"
# the names of the tar/zip files
APACHE_FLEX_BIN_DISTRO_FILE=`basename "${APACHE_FLEX_BIN_DISTRO_URL}"`
ADOBE_AIR_SDK_MAC_FILE=`basename "${ADOBE_AIR_SDK_MAC_URL}"`
-ADOBE_AIR_SDK_WIN_FILE=`basename "${ADOBE_AIR_SDK_WIN_URL}"`
# download the Apache Flex SDK
echo "Downloading the Apache Flex SDK from $APACHE_FLEX_BIN_DISTRO_URL"
curl "$APACHE_FLEX_BIN_DISTRO_URL" --output "$tempDir/$APACHE_FLEX_BIN_DISTRO_FILE"
tar xf "$tempDir/$APACHE_FLEX_BIN_DISTRO_FILE" -C "$FLEX_HOME"
-# download the AIR Integration Kit for Mac
-echo "Downloading the Adobe AIR Integration Kit for Mac from $ADOBE_AIR_SDK_MAC_URL"
+# download the AIR SDK for Mac
+echo "Downloading the Adobe AIR SDK for Mac from $ADOBE_AIR_SDK_MAC_URL"
curl "$ADOBE_AIR_SDK_MAC_URL" --output "$tempDir/$ADOBE_AIR_SDK_MAC_FILE"
tar xf "$tempDir/$ADOBE_AIR_SDK_MAC_FILE" -C "$FLEX_HOME"
-# download the AIR Integration Kit for Windows
-echo "Downloading the Adobe AIR Integration Kit for Windows from $ADOBE_AIR_SDK_WIN_URL"
-curl "$ADOBE_AIR_SDK_WIN_URL" --output "$tempDir/$ADOBE_AIR_SDK_WIN_FILE"
-tar xf "$tempDir/$ADOBE_AIR_SDK_WIN_FILE" -C "$FLEX_HOME"
-
# download playerglobal.swc
echo "Downloading Adobe Flash Player playerglobal.swc from $ADOBE_FLASHPLAYER_GLOBALPLAYER_SWC_URL"
mkdir -p "$FLEX_HOME/frameworks/libs/player/11.1"
curl "$ADOBE_FLASHPLAYER_GLOBALPLAYER_SWC_URL" --output "$FLEX_HOME/frameworks/libs/player/11.1/playerglobal.swc" --silent
# copy the config files formatted for Flash Builder to frameworks
-#echo "Install the frameworks config file configured for use with Adobe Flash Builder"
-cp -p -v "$FLEX_HOME"/ide/flashbuilder/config/*-config.xml "$FLEX_HOME/frameworks"
+echo "Installing the frameworks config files configured for use with Adobe Flash Builder"
+cp -p -v "$FLEX_HOME/ide/flashbuilder/config/*-config.xml" "$FLEX_HOME/frameworks"
# remove the zipped kits
rm -rf "$tempDir"
\ No newline at end of file