Updated Branches: refs/heads/develop b20148e22 -> fd5320be3
add echo statements to install script. Needs localization review Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/86bbf0d7 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/86bbf0d7 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/86bbf0d7 Branch: refs/heads/develop Commit: 86bbf0d7f239e576e8427af95ccde0e39a76c4c4 Parents: b35ddde Author: Alex Harui <aha...@apache.org> Authored: Wed Feb 12 00:07:31 2014 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Wed Feb 12 00:07:31 2014 -0800 ---------------------------------------------------------------------- installer.properties/de_DE.properties | 9 +++++ installer.properties/el_GR.properties | 9 +++++ installer.properties/en_US.properties | 9 +++++ installer.properties/es_ES.properties | 9 +++++ installer.properties/fr_FR.properties | 9 +++++ installer.properties/nl_NL.properties | 10 +++++ installer.properties/pt_BR.properties | 9 +++++ installer.xml | 64 ++++++++++++++++++++++++++++++ 8 files changed, 128 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/de_DE.properties ---------------------------------------------------------------------- diff --git a/installer.properties/de_DE.properties b/installer.properties/de_DE.properties index 266069e..f1f97aa 100644 --- a/installer.properties/de_DE.properties +++ b/installer.properties/de_DE.properties @@ -111,3 +111,12 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Lade Adobe AIR Runtime Kit für Mac von: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Lade Adobe AIR Runtime Kit für Windows von: +INFO_DOWNLOADING_FILE_FROM=Lade {0} von: {1} herunter +INFO_DOWNLOADED=Download abgeschlossen +INFO_FINISHED_UNTARING=untar abgeschlossen: +INFO_FINISHED_UNZIPPING=entpacken abgeschlossen: +INFO_INSTALLING_CONFIG_FILES=Installiere Framework Konfigurationsdateien für die Verwendung mit einer IDE +INFO_INSTALLING_PLAYERGLOBAL_SWC=Installiere Adobe Flash Player playerglobal.swc von: http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/el_GR.properties ---------------------------------------------------------------------- diff --git a/installer.properties/el_GR.properties b/installer.properties/el_GR.properties index 1a3d147..2ec2130 100644 --- a/installer.properties/el_GR.properties +++ b/installer.properties/el_GR.properties @@ -113,3 +113,12 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_FILE_FROM=ÎίνεÏαι λήÏη ÏÎ¿Ï {0} αÏÏ: {1} +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=ÎίνεÏαι λήÏη ÏÎ¿Ï Adobe AIR Runtime Kit για Mac αÏÏ: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=ÎίνεÏαι λήÏη ÏÎ¿Ï Adobe AIR Runtime Kit για Windows αÏÏ: +INFO_DOWNLOADED=ΠλήÏη ολοκληÏÏθηκε +INFO_FINISHED_UNTARING=ΠαÏοÏÏ Î¼ÏίεÏη ÏελείÏÏε: +INFO_FINISHED_UNZIPPING=ΠαÏοÏÏ Î¼ÏίεÏη ÏελείÏÏε: +INFO_INSTALLING_CONFIG_FILES=ÎίνεÏαι εγκαÏάÏÏαÏη ÏÏν αÏÏείÏν ÏÏ Î¸Î¼Î¯ÏεÏν ÏÎ¿Ï framework ÏÎ¿Ï ÎÏÎ¿Ï Î½ ÏÏ Î¸Î¼Î¹ÏÏεί για ÏÏήÏη με IDE +INFO_INSTALLING_PLAYERGLOBAL_SWC=ÎίνεÏαι εγκαÏάÏÏαÏη ÏÎ¿Ï Adobe Flash Player playerglobal.swc αÏÏ: http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/en_US.properties ---------------------------------------------------------------------- diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties index 9dc1b90..7f22378 100644 --- a/installer.properties/en_US.properties +++ b/installer.properties/en_US.properties @@ -113,3 +113,12 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Downloading Adobe AIR Runtime Kit for Mac from: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Downloading Adobe AIR Runtime Kit for Windows from: +INFO_FINISHED_UNTARING=Finished untaring: +INFO_FINISHED_UNZIPPING=Finished uncompressing: +INFO_INSTALLING_PLAYERGLOBAL_SWC=Installing Adobe Flash Player playerglobal.swc from: +INFO_INSTALLING_CONFIG_FILES=Installing frameworks configuration files configured for use with an IDE +INFO_DOWNLOADING_FILE_FROM=Downloading {0} from: {1} +INFO_DOWNLOADED=Download complete http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/es_ES.properties ---------------------------------------------------------------------- diff --git a/installer.properties/es_ES.properties b/installer.properties/es_ES.properties index 9588009..9cbbaf1 100644 --- a/installer.properties/es_ES.properties +++ b/installer.properties/es_ES.properties @@ -114,3 +114,12 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Descargando Adobe AIR Runtime Kit para Mac desde: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Descargando Adobe AIR Runtime Kit para Windows desde: +INFO_DOWNLOADING_FILE_FROM=Descargando {0} desde: {1} +INFO_FINISHED_UNTARING=Descompresión finalizada: +INFO_FINISHED_UNZIPPING=Descompresión finalizada: +INFO_INSTALLING_CONFIG_FILES=Instalando archivos de configuración para la interacción con IDEs +INFO_INSTALLING_PLAYERGLOBAL_SWC=Instalando Adobe Flash Player playerglobal.swc desde: +INFO_DOWNLOADED=Descarga finalizada http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/fr_FR.properties ---------------------------------------------------------------------- diff --git a/installer.properties/fr_FR.properties b/installer.properties/fr_FR.properties index b7c4356..df8dfa6 100644 --- a/installer.properties/fr_FR.properties +++ b/installer.properties/fr_FR.properties @@ -111,3 +111,12 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Téléchargement d'Adobe AIR Runtime Kit pour Mac à partir de: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Téléchargement d'Adobe AIR Runtime Kit pour Windows à partir de: +INFO_DOWNLOADING_FILE_FROM=Téléchargement {0} de: {1} +INFO_DOWNLOADED=Téléchargement terminé +INFO_FINISHED_UNTARING=Décompression de l'archive terminée: +INFO_FINISHED_UNZIPPING=Décompression terminée: +INFO_INSTALLING_CONFIG_FILES=Installation des fichiers de configuration du framework configurés pour être utilisés avec un IDE +INFO_INSTALLING_PLAYERGLOBAL_SWC=Installation d'Adobe Flash Player playerglobal.swc à partir de: http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/nl_NL.properties ---------------------------------------------------------------------- diff --git a/installer.properties/nl_NL.properties b/installer.properties/nl_NL.properties index e042231..4ff7384 100644 --- a/installer.properties/nl_NL.properties +++ b/installer.properties/nl_NL.properties @@ -113,3 +113,13 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Adobe AIR Runtime Kit voor Mac wordt gedownload van: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Adobe AIR Runtime Kit voor Windows wordt gedownload van: +INFO_DOWNLOADING_FILE_FROM={0} wordt gedownload van: {1} +INFO_DOWNLOADED=Gedownload +INFO_FINISHED_UNTARING=Klaar met tar uitpakken: +INFO_FINISHED_UNZIPPING=Klaar met zip uitpakken: +INFO_INSTALLING_CONFIG_FILES=Framework configuratie bestanden voor gebruik met IDE worden geinstalleerd +INFO_INSTALLING_PLAYERGLOBAL_SWC=Adobe Flash Player playerglobal.swc wordt geinstalleerd van: + http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.properties/pt_BR.properties ---------------------------------------------------------------------- diff --git a/installer.properties/pt_BR.properties b/installer.properties/pt_BR.properties index ae8c9f8..8e983fb 100644 --- a/installer.properties/pt_BR.properties +++ b/installer.properties/pt_BR.properties @@ -114,3 +114,12 @@ unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME enviro install.complete.echo=${basedir} is now an IDE compatible folder find.java.echo.pattern=Java is $${java.executable} mac.copy.echo.pattern=Copying files from $${download.dir}/airsdk/$${srcdir} to $${destdir} + +INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC=Efetuando download do Adobe AIR Runtime Kit for Mac a partir de: +INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Efetuando download do Adobe AIR Runtime Kit for Windows a partir de: +INFO_DOWNLOADING_FILE_FROM=Efetuando download {0} de: {1} +INFO_DOWNLOADED=Download finalizado +INFO_FINISHED_UNTARING=Untar finalizado: +INFO_FINISHED_UNZIPPING=Descompactação finalizada: +INFO_INSTALLING_CONFIG_FILES=Instalando arquivos de configuração dos frameworks para utilização com a IDE +INFO_INSTALLING_PLAYERGLOBAL_SWC=Instalando Adobe Flash Player playerglobal.swc a partir de: http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/86bbf0d7/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index c7b5170..3dd139e 100644 --- a/installer.xml +++ b/installer.xml @@ -67,6 +67,11 @@ <os family="unix" /> </condition> + <condition property="AIRDownloadEcho" value="${INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS}"> + <os family="windows" /> + </condition> + <property name="AIRDownloadEcho" value="${INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC}" /> + <condition property="air.donot.ask" value="true"> <isset property="installer" /> </condition> @@ -244,6 +249,7 @@ </target> <target name="air-get" depends="air-get-check" unless="air.downloaded" > + <echo>${AIRDownloadEcho} ${air.sdk.url.path}/${air.sdk.url.file}</echo> <get src="${air.sdk.url.path}/${air.sdk.url.file}" dest="${download.dir}/${air.sdk.url.file}" verbose="false"/> @@ -251,6 +257,7 @@ <target name="air-setup-win" if="isWindows"> <unzip src="${download.dir}/${air.sdk.url.file}" dest="${download.dir}/airsdk" /> + <echo>${INFO_FINISHED_UNZIPPING} ${download.dir}/${air.sdk.url.file}</echo> <copy todir="${FLEX_HOME}" overwrite="true"> <fileset dir="${download.dir}/airsdk"> <include name="AIR SDK license.pdf" /> @@ -291,6 +298,7 @@ <arg value="-xvf" /> <arg value="${air.tar.name}" /> </exec> + <echo>${INFO_FINISHED_UNTARING} ${download.dir}/airsdk/${air.tar.name}</echo> <delete file="${basedir}/airtar.properties" /> <antcall target="mac-copy-file"> <param name="srcdir" value="." /> @@ -413,6 +421,7 @@ <mkdir dir="${download.dir}"/> <mkdir dir="${FLEX_HOME}/frameworks/libs/player/${flash.sdk.version}"/> + <echo>${INFO_INSTALLING_PLAYERGLOBAL_SWC} ${flash.sdk.url.path}/${flash.sdk.url.file}</echo> <get src="${flash.sdk.url.path}/${flash.sdk.url.file}" dest="${FLEX_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" verbose="false"/> @@ -427,11 +436,19 @@ <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present" description="Copies SWFObject from code.google.com"> + <echo file="${basedir}/swfobject.properties">swfobject.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/swfobject.properties" token="{0}" value="swfobject_2_2.zip" /> + <replace file="${basedir}/swfobject.properties" token="{1}" value="http://swfobject.googlecode.com/files" /> + <property file="${basedir}/swfobject.properties" /> + <delete file="${basedir}/swfobject.properties" /> + <echo>${swfobject.echo}</echo> + <mkdir dir="${download.dir}"/> <get src="http://swfobject.googlecode.com/files/swfobject_2_2.zip" dest="${download.dir}/swfobject_2_2.zip" verbose="false"/> + <echo>${INFO_DOWNLOADED}</echo> <unzip src="${download.dir}/swfobject_2_2.zip" dest="${FLEX_HOME}/templates"> <patternset> <include name="swfobject/expressInstall.swf"/> @@ -449,6 +466,13 @@ <target name="osmf-download" depends="osmf-check" unless="osmf.swc.present" description="Copies OSMF from Open@Adobe"> + <echo file="${basedir}/osmf.properties">osmf.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/osmf.properties" token="{0}" value="OSMF.swc" /> + <replace file="${basedir}/osmf.properties" token="{1}" value="http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29" /> + <property file="${basedir}/osmf.properties" /> + <delete file="${basedir}/osmf.properties" /> + <echo>${osmf.echo}</echo> + <mkdir dir="${basedir}/frameworks/libs/"/> <get src="http://downloads.sourceforge.net/project/osmf.adobe/OSMF%202.0%20Release%20%28final%20source%2C%20ASDocs%2C%20pdf%20guides%20and%20release%20notes%29/OSMF.swc" dest="${basedir}/frameworks/libs/OSMF.swc" @@ -472,16 +496,48 @@ <target name="fontswf-download" depends="fontswf-check" unless="fontswf.jars.present" description="Copies OSMF from Open@Adobe"> + <echo file="${basedir}/afe.properties">afe.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/afe.properties" token="{0}" value="afe.jar" /> + <replace file="${basedir}/afe.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" /> + <property file="${basedir}/afe.properties" /> + <delete file="${basedir}/afe.properties" /> + <echo>${afe.echo}</echo> + <mkdir dir="${basedir}/lib/external/optional"/> <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/afe.jar" dest="${basedir}/lib/external/optional/afe.jar" verbose="false"/> + + <echo file="${basedir}/agl.properties">agl.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/agl.properties" token="{0}" value="aglj40.jar" /> + <replace file="${basedir}/agl.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" /> + <property file="${basedir}/agl.properties" /> + <delete file="${basedir}/agl.properties" /> + <echo>${agl.echo}</echo> + <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/aglj40.jar" dest="${basedir}/lib/external/optional/aglj40.jar" verbose="false"/> + + <echo file="${basedir}/fontkit.properties">fontkit.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/fontkit.properties" token="{0}" value="flex-fontkit.jar" /> + <replace file="${basedir}/fontkit.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" /> + <property file="${basedir}/fontkit.properties" /> + <delete file="${basedir}/fontkit.properties" /> + <echo>${fontkit.echo}</echo> + <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/flex-fontkit.jar" dest="${basedir}/lib/external/optional/flex-fontkit.jar" verbose="false"/> + + + <echo file="${basedir}/rideau.properties">rideau.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/rideau.properties" token="{0}" value="rideau.jar" /> + <replace file="${basedir}/rideau.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" /> + <property file="${basedir}/rideau.properties" /> + <delete file="${basedir}/rideau.properties" /> + <echo>${rideau.echo}</echo> + <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/rideau.jar" dest="${basedir}/lib/external/optional/rideau.jar" verbose="false"/> @@ -496,6 +552,13 @@ <target name="blazeds-download" depends="blazeds-check" unless="blazeds.jar.present" description="Copies BlazeDS from Open@Adobe"> + <echo file="${basedir}/blaze.properties">blaze.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> + <replace file="${basedir}/blaze.properties" token="{0}" value="flex-messaging-common.jar" /> + <replace file="${basedir}/blaze.properties" token="{1}" value="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib" /> + <property file="${basedir}/blaze.properties" /> + <delete file="${basedir}/blaze.properties" /> + <echo>${blaze.echo}</echo> + <mkdir dir="${basedir}/lib/external/optional"/> <get src="http://opensource.adobe.com/svn/opensource/flex/sdk/branches/4.y/lib/flex-messaging-common.jar" dest="${basedir}/lib/external/optional/flex-messaging-common.jar" @@ -504,6 +567,7 @@ <target name="fixup-config-files"> + <echo>${INFO_INSTALLING_CONFIG_FILES}</echo> <replace file="${FLEX_HOME}/frameworks/flex-config.xml"> <replacefilter token="@playerversion@" value="${flash.sdk.version}"/>