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 2014/01/16 00:27:07 UTC
[3/4] git commit: [flex-asjs] [refs/heads/develop] - tune up installer
tune up installer
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f0527c9b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f0527c9b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f0527c9b
Branch: refs/heads/develop
Commit: f0527c9b8310ee2a04abc07a186297d48d4ce04e
Parents: b067cf0
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jan 14 21:35:46 2014 -0800
Committer: Alex Harui <ah...@apache.org>
Committed: Wed Jan 15 15:26:48 2014 -0800
----------------------------------------------------------------------
installer-config.xml | 2 +-
installer.xml | 16 +++++++---------
2 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0527c9b/installer-config.xml
----------------------------------------------------------------------
diff --git a/installer-config.xml b/installer-config.xml
index 5e5d085..61e6b13 100644
--- a/installer-config.xml
+++ b/installer-config.xml
@@ -66,7 +66,7 @@
</string>
<string id="STEP_VERIFY_FLEX_SDK">
<el_GR>Γίνεται επαλήθευση του Apache Flex SDK MD5 Signature</el_GR>
- <en_US>Verifying Apache Flex SDK MD5 Signature</en_US>
+ <en_US>Verifying Apache Flex JS MD5 Signature</en_US>
</string>
<string id="STEP_UNZIP_FLEX_SDK">
<el_GR>Αποσυμπίεση του Apache Flex SDK</el_GR>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f0527c9b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 7090a18..e16466d 100644
--- a/installer.xml
+++ b/installer.xml
@@ -118,7 +118,9 @@
<echo>${basedir} is now an IDE compatible folder</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" />
+ <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>
+ </target>
<target name="check-java" description="fail if java doesn't exist">
<fail message="${unable.to.find.java}">
@@ -131,7 +133,6 @@
</target>
<target name="find-java-executable-windows" if="isWindows">
- <echo>find-java-executable Windows</echo>
<condition property="java.executable" value="${java.home}/bin/java.exe" >
<and>
<isset property="java.home" />
@@ -141,31 +142,28 @@
</target>
<target name="find-java-executable-others" unless="isWindows">
- <echo>find-java-executable non-Windows</echo>
<condition property="java.executable" value="${java.home}/bin/java" >
<and>
<isset property="java.home" />
<available file="${java.home}" />
</and>
</condition>
- <echo>${java.executable}</echo>
</target>
<target name="search-java" depends="search-java-windows,search-java-others" description="search for java executable" unless="java.home">
</target>
<target name="search-java-windows" unless="java.home">
- <echo message="searching for Java on Windows" />
+ <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" />
+ <echo message="Searching for Java on non-Windows" />
<exec executable="which" os="mac,linux" outputproperty="java.executable" >
<arg value="java"/>
</exec>
- <echo message="got ${java.executable}" />
</target>
<target name="check-binary" description="Make sure this is a binary package">
@@ -551,8 +549,8 @@
value="${flash.sdk.swfversion}"/>
<replacefilter token="@locale@"
value="${bundle}"/>
- <replacefilter token="{playerglobalHome}"
- value="libs/player"/>
+ <replacefilter token="{airHome}/frameworks/libs"
+ value="libs"/>
</replace>
</target>