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/06/11 02:42:45 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - forgot to change
folder on server properties
Repository: flex-asjs
Updated Branches:
refs/heads/develop bdce67f09 -> 8c0b30de3
forgot to change folder on server properties
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/8c0b30de
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/8c0b30de
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/8c0b30de
Branch: refs/heads/develop
Commit: 8c0b30de325fea616310f585c5f320e00d9f5413
Parents: 563f445
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 10 17:37:17 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 10 17:42:40 2014 -0700
----------------------------------------------------------------------
installer.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/8c0b30de/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index d758f95..1cc8c85 100644
--- a/installer.xml
+++ b/installer.xml
@@ -48,7 +48,7 @@
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="bundle" value="en_US" />
- <property name="flex.properties.url" value="http://flex.apache.org/installer/properties/sdk/${bundle}.properties" />
+ <property name="flex.properties.url" value="http://flex.apache.org/installer/properties/flexjs/${bundle}.properties" />
<get src="${flex.properties.url}" dest="${basedir}/${bundle}.properties" ignoreerrors="true" />
<property file="${basedir}/${bundle}.properties"/>
<property file="${FLEXJS_HOME}/installer.properties/${bundle}.properties"/>
[2/2] git commit: [flex-asjs] [refs/heads/develop] - switch swfobject
to github and allow for server based language overrides
Posted by ah...@apache.org.
switch swfobject to github and allow for server based language overrides
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/563f4451
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/563f4451
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/563f4451
Branch: refs/heads/develop
Commit: 563f4451d1fb77853e08aaa2848a9841fb26c6eb
Parents: bdce67f
Author: Alex Harui <ah...@apache.org>
Authored: Tue Jun 10 17:33:58 2014 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Jun 10 17:42:40 2014 -0700
----------------------------------------------------------------------
installer.xml | 26 ++++++++++++++++++--------
1 file changed, 18 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/563f4451/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index af6b786..d758f95 100644
--- a/installer.xml
+++ b/installer.xml
@@ -47,6 +47,10 @@
<property file="${FLEXJS_HOME}/nightly.properties"/>
<property file="${FLEXJS_HOME}/build.properties"/>
<property name="bundle" value="en_US" />
+
+ <property name="flex.properties.url" value="http://flex.apache.org/installer/properties/sdk/${bundle}.properties" />
+ <get src="${flex.properties.url}" dest="${basedir}/${bundle}.properties" ignoreerrors="true" />
+ <property file="${basedir}/${bundle}.properties"/>
<property file="${FLEXJS_HOME}/installer.properties/${bundle}.properties"/>
<property file="${FLEXJS_HOME}/installer.properties/en_US.properties"/>
<property name="download.dir" value="${FLEXJS_HOME}/in"/>
@@ -62,10 +66,10 @@
<property name="goog.lib.url.file" value="closure-library-20130212-95c19e7f0f5f.zip" />
<property name="goog.lib.md5" value="7891ce8200dedf50c811017a0d76bcdc" />
- <property name="swfobject.url.server" value="http://swfobject.googlecode.com" />
- <property name="swfobject.url.folder" value="files" />
- <property name="swfobject.url.file" value="swfobject_2_2.zip" />
-
+ <property name="swfobject.url.server" value="https://github.com" />
+ <property name="swfobject.url.folder" value="swfobject/swfobject/archive" />
+ <property name="swfobject.url.file" value="2.2.zip" />
+
<condition property="platform" value="mac">
<os family="mac" />
</condition>
@@ -766,7 +770,7 @@
<echo file="${basedir}/swfobject.properties">swfobject.echo=${INFO_DOWNLOADING_FILE_FROM}</echo>
<replace file="${basedir}/swfobject.properties" token="{0}" value="${swfobject.url.file}" />
- <replace file="${basedir}/swfobject.properties" token="{1}" value="${swfobject.url.server}/${swfoject.url.folder}" />
+ <replace file="${basedir}/swfobject.properties" token="{1}" value="${swfobject.url.server}/${swfobject.url.folder}" />
<property file="${basedir}/swfobject.properties" />
<delete file="${basedir}/swfobject.properties" />
@@ -780,12 +784,18 @@
<param name="failmessage" value="SWFObject download failed" />
</antcall>
<echo>${INFO_DOWNLOADED}</echo>
- <unzip src="${download.dir}/swfobject_2_2.zip" dest="${FLEXJS_HOME}/templates">
+ <mkdir dir="${download.dir}/swfobject"/>
+ <unzip src="${download.dir}/swfobject_2_2.zip" dest="${download.dir}/swfobject">
<patternset>
- <include name="swfobject/expressInstall.swf"/>
- <include name="swfobject/swfobject.js"/>
+ <include name="swfobject-2.2/swfobject/expressInstall.swf"/>
+ <include name="swfobject-2.2/swfobject/swfobject.js"/>
</patternset>
</unzip>
+ <mkdir dir="${FLEXJS_HOME}/templates/swfobject"/>
+ <copy file="${download.dir}/swfobject/swfobject-2.2/swfobject/expressInstall.swf"
+ tofile="${FLEXJS_HOME}/templates/swfobject/expressInstall.swf" />
+ <copy file="${download.dir}/swfobject/swfobject-2.2/swfobject/swfobject.js"
+ tofile="${FLEXJS_HOME}/templates/swfobject/swfobject.js" />
</target>
<target name="fixup-config-files">