tweak output of install script
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/86fb570b Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/86fb570b Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/86fb570b Branch: refs/heads/develop Commit: 86fb570b4be8135e91f9473bbbed20cbc4a72a8d Parents: f0527c9 Author: Alex Harui <[email protected]> Authored: Wed Jan 15 15:26:23 2014 -0800 Committer: Alex Harui <[email protected]> Committed: Wed Jan 15 15:26:48 2014 -0800 ---------------------------------------------------------------------- installer.properties/en_US.properties | 3 +++ installer.xml | 16 ++++++++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/86fb570b/installer.properties/en_US.properties ---------------------------------------------------------------------- diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties index 5d00b9b..0878e65 100644 --- a/installer.properties/en_US.properties +++ b/installer.properties/en_US.properties @@ -63,3 +63,6 @@ Do you want to download and install the SWFObject? unable.to.find.java=Unable to find Java executable. Please set JAVA_HOME environment variable +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} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/86fb570b/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index e16466d..71e7be8 100644 --- a/installer.xml +++ b/installer.xml @@ -115,11 +115,14 @@ <property name="flash.sdk.swfversion" refid="${flash.sdk.swfversion.ref}" /> <target name="install" depends="find-java,check-binary,ask-licenses,get-flex,get-falcon,get-third-party-files,fixup-config-files,hack-fb-files,setup-launch-configs" description="Converts binary package to IDE compatible folder"> - <echo>${basedir} is now an IDE compatible folder</echo> + <echo>${install.complete.echo}</echo> </target> <target name="find-java" depends="find-java-executable-windows,find-java-executable-others,search-java,check-java" description="get path to java executable"> - <echo>Java is ${java.executable}</echo> + <echo file="${basedir}/findjava.properties">find.java.echo=${find.java.echo.pattern}</echo> + <property file="${basedir}/findjava.properties" /> + <delete file="${basedir}/findjava.properties" /> + <echo>${find.java.echo}</echo> </target> <target name="check-java" description="fail if java doesn't exist"> @@ -154,13 +157,11 @@ </target> <target name="search-java-windows" unless="java.home"> - <echo message="Searching for Java on Windows" /> <exec executable="where.exe" os="windows" outputproperty="java.executable" > <arg value="java"/> </exec> </target> <target name="search-java-others" unless="java.home"> - <echo message="Searching for Java on non-Windows" /> <exec executable="which" os="mac,linux" outputproperty="java.executable" > <arg value="java"/> </exec> @@ -467,6 +468,10 @@ </target> <target name="mac-copy-dir" description="copies a directory using exec and rsync so that symbolic links are preserved"> + <echo file="${basedir}/maccopy.properties">mac.copy.echo=${mac.copy.echo.pattern}</echo> + <property file="${basedir}/maccopy.properties" /> + <delete file="${basedir}/maccopy.properties" /> + <echo>${mac.copy.echo}</echo> <exec executable="rsync" dir="${FLEXJS_HOME}"> <arg value="--archive" /> <arg value="--ignore-existing" /> @@ -477,6 +482,9 @@ </target> <target name="mac-copy-dir-if-exists" depends="mac-check-exists" if="${srcdir}.exists" description="copies a directory using exec and rsync so that symbolic links are preserved"> + <echo file="${basedir}/maccopy.properties">mac.copy.echo=${mac.copy.echo.pattern}</echo> + <property file="${basedir}/maccopy.properties" /> + <echo>${mac.copy.echo}</echo> <exec executable="rsync" dir="${FLEXJS_HOME}"> <arg value="--archive" /> <arg value="--ignore-existing" />
