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 2016/03/29 18:01:24 UTC
[1/2] git commit: [flex-asjs] [refs/heads/develop] - fix files in
LICENSE
Repository: flex-asjs
Updated Branches:
refs/heads/develop fb682e0bc -> 50ae7df92
fix files in LICENSE
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/7cd1bd4a
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/7cd1bd4a
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/7cd1bd4a
Branch: refs/heads/develop
Commit: 7cd1bd4a3bfdfdd4433eb0555d698ef1f19495f6
Parents: fb682e0
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 08:31:50 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 08:31:50 2016 -0700
----------------------------------------------------------------------
LICENSE | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7cd1bd4a/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index a3c1df1..15de483 100644
--- a/LICENSE
+++ b/LICENSE
@@ -210,7 +210,7 @@ separate copyright notices and license terms. Your use of the source
code for the these subcomponents is subject to the terms and
conditions of the following licenses.
-Portions of frameworks/projects/Flat/as/defaults.css is based on
+Portions of frameworks/projects/Flat/src/main/resources/defaults.css is based on
designmodo’s (http://designmodo.com/flat-free/) Flat UI which is
available under an MIT license.
@@ -218,7 +218,7 @@ The map image in examples/flexjs/FlexJSStore/src/assets/427px-Bayarea_map.png
was placed into the Public Domain by its author. See:
https://commons.wikimedia.org/wiki/File:Bayarea_map.png
-The map coordinates in examples/native/USStatesMap/src/MapCoords.js
+The map coordinates in examples/native/USStatesMap/src/MapCoords.as
were placed into the Public Domain by its author. See:
https://en.wikipedia.org/wiki/File:USA_CIA_Map.svg#file
[2/2] git commit: [flex-asjs] [refs/heads/develop] - AntOnAIR doesn't
have flattenmapper so try alternative
Posted by ah...@apache.org.
AntOnAIR doesn't have flattenmapper so try alternative
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/50ae7df9
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/50ae7df9
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/50ae7df9
Branch: refs/heads/develop
Commit: 50ae7df92601fb920f7b82249bea10070815c5f4
Parents: 7cd1bd4
Author: Alex Harui <ah...@apache.org>
Authored: Tue Mar 29 09:01:16 2016 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Tue Mar 29 09:01:16 2016 -0700
----------------------------------------------------------------------
installer.xml | 29 +++++++++++++----------------
1 file changed, 13 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/50ae7df9/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index 27ae65f..01d676e 100644
--- a/installer.xml
+++ b/installer.xml
@@ -704,27 +704,24 @@
description="Downloads Flat fonts and copies to correct locations">
<mkdir dir="${download.dir}"/>
- <echo>${INFO_INSTALLING_FLAT_FONTS} ${flat.font.url.server}/${flat.font.url.folder}/${flat.font.url.file}</echo>
+ <echo>${INFO_INSTALLING_FLAT_FONTS} https://github.com/designmodo/Flat-UI/archive/2.2.2.zip</echo>
<get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"
dest="${download.dir}/flat-ui_2_2.zip"
verbose="false"/>
<mkdir dir="${FLEXJS_HOME}/frameworks/fonts"/>
- <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
- <patternset>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"/>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"/>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"/>
- <include name="Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"/>
- </patternset>
- <flattenmapper />
- </unzip>
- <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${FLEXJS_HOME}/frameworks/fonts">
- <patternset>
- <include name="Flat-UI-2.2.2/README.md"/>
- </patternset>
- <flattenmapper />
- </unzip>
+ <mkdir dir="${download.dir}/flat/fonts"/>
+ <unzip src="${download.dir}/flat-ui_2_2.zip" dest="${download.dir}/flat/fonts" />
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.eot"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.ttf"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.svg"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/fonts/glyphicons/flat-ui-icons-regular.woff"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
+ <copy file="${download.dir}/flat/fonts/Flat-UI-2.2.2/README.md"
+ todir="${FLEXJS_HOME/frameworks/fonts"/>
</target>
<!-- swfobject.js (Version 2.2) -->