Return-Path: 
 <commits-return-26383-apmail-flex-commits-archive=flex.apache.org@flex.apache.org>
X-Original-To: apmail-flex-commits-archive@www.apache.org
Delivered-To: apmail-flex-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id ADFEA19A25
	for <apmail-flex-commits-archive@www.apache.org>;
 Wed,  6 Apr 2016 15:06:10 +0000 (UTC)
Received: (qmail 40669 invoked by uid 500); 6 Apr 2016 15:06:01 -0000
Delivered-To: apmail-flex-commits-archive@flex.apache.org
Received: (qmail 40621 invoked by uid 500); 6 Apr 2016 15:06:01 -0000
Mailing-List: contact commits-help@flex.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@flex.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@flex.apache.org>
List-Post: <mailto:commits@flex.apache.org>
List-Id: <commits.flex.apache.org>
Reply-To: dev@flex.apache.org
Delivered-To: mailing list commits@flex.apache.org
Received: (qmail 38629 invoked by uid 99); 6 Apr 2016 15:06:00 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org)
 (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Apr 2016 15:06:00 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at
 git1-us-west.apache.org, from userid 33)
	id C14ECEAB46; Wed,  6 Apr 2016 15:05:59 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
From: aharui@apache.org
To: commits@flex.apache.org
Date: Wed, 06 Apr 2016 15:06:39 -0000
Message-Id: <13f865e7fc21411d9a621be35ec8b990@git.apache.org>
In-Reply-To: <66c1024aefa64a2cbc35d365673afb38@git.apache.org>
References: <66c1024aefa64a2cbc35d365673afb38@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [41/50] [abbrv] git commit: [flex-asjs] [refs/heads/master] - try to
 make the designmodo fonts an optional dependency

try to make the designmodo fonts an optional dependency


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fb682e0b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fb682e0b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fb682e0b

Branch: refs/heads/master
Commit: fb682e0bc4053a9b5b0cf851dbf30da8e2c6cb93
Parents: 164ec03
Author: Alex Harui <aharui@apache.org>
Authored: Mon Mar 28 23:40:57 2016 -0700
Committer: Alex Harui <aharui@apache.org>
Committed: Mon Mar 28 23:40:57 2016 -0700

----------------------------------------------------------------------
 apache-flex-flexjs-installer-config.xml | 29 ++++++++++
 build.xml                               |  3 +-
 frameworks/downloads.xml                | 41 ++++++++++++--
 installer.properties/en_US.properties   | 14 +++++
 installer.xml                           | 81 +++++++++++++++++++++++++---
 5 files changed, 155 insertions(+), 13 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/apache-flex-flexjs-installer-config.xml
----------------------------------------------------------------------
diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml
index 38264fd..7807a0c 100755
--- a/apache-flex-flexjs-installer-config.xml
+++ b/apache-flex-flexjs-installer-config.xml
@@ -152,6 +152,12 @@
 			<zh_CN>Adobe Flash Player playerglobal.swc (必须的)</zh_CN>
 			<zh_TW>Adobe Flash Player playerglobal.swc (必須的)</zh_TW>
 		</step>
+        <step id="flat-download" property="do.flat.install">
+            <el_GR>DesignModo fonts</el_GR>
+            <en_US>DesignModo fonts (Optional)</en_US>
+            <zh_CN>DesignModo fonts (必须的)</zh_CN>
+            <zh_TW>DesignModo fonts (必須的)</zh_TW>
+        </step>
 		<step id="swfobject-download">
 			<el_GR>SWFObject (Απαιτούμενο)</el_GR>
 			<en_US>SWFObject (Required)</en_US>
@@ -233,4 +239,27 @@
 			<license>Adobe Flex SDK 授權合約</license>
 		</zh_TW>
 	</component>
+    <component id="STEP_REQUIRED_INSTALL_FLAT_FONTS" required="true" property="do.flat.install">
+        <el_GR>
+            <label>designmodo fonts (Προαιρετικό)</label>
+            <message>Για το designmodo fonts ισχύει η συμφωνία χρήσης του CC-BY-NC-ND License. Θέλετε να εγκαταστήσετε το designmodo fonts;</message>
+            <license>'Αδεια χρήσης CC-BY-NC-ND</license>
+        </el_GR>
+        <en_US>
+            <label>designmodo fonts (Optional)</label>
+            <message>The CC-BY-NC-ND license applies to the designmodo fonts.  Do you want to install the designmodo fonts?</message>
+            <license>CC-BY-NC-ND</license>
+            <licenseURL>http://creativecommons.org/licenses/by-nc-nd/3.0/</licenseURL>
+        </en_US>
+        <zh_CN>
+            <label>designmodo (必须的)</label>
+            <message>CC-BY-NC-ND 许可协议适用于 designmodo 的 fonts 文件. 您想要安装 designmodo 的 fonts 文件吗?</message>
+            <license>C-BY-NC-ND 许可协议</license>
+        </zh_CN>
+        <zh_TW>
+            <label>designmodo fonts(必須的)</label>
+            <message>CC-BY-NC-ND 授權合約適用於 designmodo 的 fonts 檔案. 您想要安裝 designmodo 的 fonts 檔案嗎?</message>
+            <license>CC-BY-NC-ND 授權合約</license>
+        </zh_TW>
+    </component>
 </config>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 6ec2fbc..9bda287 100644
--- a/build.xml
+++ b/build.xml
@@ -739,12 +739,13 @@
         </copy>
          -->
          
-         <!-- fonts -->
+         <!-- fonts
           <copy todir="${basedir}/temp/frameworks/fonts">
               <fileset dir="${basedir}/frameworks/fonts" >
                   <include name="**/**"/>
               </fileset>
           </copy>
+          -->
          
         <!-- examples -->
         <copy todir="${basedir}/temp/examples">

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/frameworks/downloads.xml
----------------------------------------------------------------------
diff --git a/frameworks/downloads.xml b/frameworks/downloads.xml
index a54782d..ac9e0fb 100644
--- a/frameworks/downloads.xml
+++ b/frameworks/downloads.xml
@@ -26,8 +26,8 @@
     <property name="FLEX_HOME" value="${env.FLEX_HOME}" />
 
 	<property name="download.dir" value="${FLEXJS_HOME}/in"/>
-	        
-    <!-- 
+    
+    <!--
        To clean these you must call thirdparty-clean or super-clean to clean everything.  
        clean does not remove these since they don't change often and the downloads take time.
     -->
@@ -82,11 +82,42 @@
     <!-- swfobject.js (Version 2.2) -->
     <!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
     <target name="flat-ui-check" description="Checks if SWFObject has been downloaded.">
-        <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat-ui.present"/>
+        <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.ttf" property="flat.donot.ask"/>
+        <condition property="flat.donot.ask">
+            <isset property="build.noprompt"/>
+        </condition>
+        <condition property="do.flat.install">
+            <isset property="build.noprompt"/>
+        </condition>
     </target>
     
-    <target name="flat-ui-download" depends="flat-ui-check" unless="flat-ui.present"
-        description="Copies FlatUI from github">
+    <target name="ask-flat" unless="flat.donot.ask"
+        description="Prompt the user before downloading Flat fonts">
+        
+        <property name="flat.prompt.text"
+        value="Apache FlexJS includes an optional component set that
+        ${line.separator}uses fonts from designmodo.com.
+        ${line.separator}The font files are subject to and governed by the
+        ${line.separator}Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported license:
+        ${line.separator}http://creativecommons.org/licenses/by-nc-nd/3.0/
+        ${line.separator}This license is not compatible with the Apache v2 license.
+        ${line.separator}Do you want to install the designmodo fonts?"/>
+        <input
+        message="${flat.prompt.text}"
+        validargs="y,n"
+        defaultvalue="n"
+        addproperty="input.flat.download"/>
+        <condition property="do.flat.install">
+            <equals arg1="y" arg2="${input.flat.download}"/>
+        </condition>
+        <!-- Only ask once per ant run.  -->
+        <property name="flat.donot.ask" value="set"/>
+    </target>
+    
+    <target name="flat-ui-download" depends="flat-ui-check,get-flat-fonts"
+        description="Copies FlatUI from github" />
+        
+    <target name="get-flat-fonts" depends="ask-flat" if="do.flat.install" >
         
         <mkdir dir="${download.dir}"/>
         <get src="https://github.com/designmodo/Flat-UI/archive/2.2.2.zip"

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/installer.properties/en_US.properties
----------------------------------------------------------------------
diff --git a/installer.properties/en_US.properties b/installer.properties/en_US.properties
index df50962..bb84b36 100644
--- a/installer.properties/en_US.properties
+++ b/installer.properties/en_US.properties
@@ -22,6 +22,19 @@ yes.no.prompts=y,n
 yes=y
 no=n
 
+flat.prompt.text=\
+Apache FlexJS includes an optional component set that\n\
+uses fonts from designmodo.com\n\
+\n\
+The font files are subject to and governed by the\n\
+Creative Commons Attribution-NonCommercial-NoDerivs 3.0 Unported license:\n\
+http://creativecommons.org/licenses/by-nc-nd/3.0/\n\
+By downloading, modifying, distributing, using and/or accessing any of these font files\n\
+you agree to the terms and conditions of the applicable license agreement.\n\
+\n\
+This license is not compatible with the Apache v2 license.\n\
+Do you want to download and install the designmodo fonts?
+
 flash.prompt.text=\
 Apache FlexJS uses the Adobe Flash Player's playerglobal.swc to build Adobe Flash applications.\n\
 \n\
@@ -75,6 +88,7 @@ INFO_DOWNLOADING_AIR_RUNTIME_KIT_WINDOWS=Downloading Adobe AIR Runtime Kit for W
 INFO_FINISHED_UNTARING=Finished untaring: 
 INFO_FINISHED_UNZIPPING=Finished uncompressing: 
 INFO_UNZIPPING=Uncompressing: 
+INFO_INSTALLING_FLAT_FONTS=Installing DesignModo fonts from: 
 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_INSTALLING_LAUNCH_CONFIG_FILES=Installing Adobe Flash Builder launch configuration files

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fb682e0b/installer.xml
----------------------------------------------------------------------
diff --git a/installer.xml b/installer.xml
index f026b9f..27ae65f 100644
--- a/installer.xml
+++ b/installer.xml
@@ -59,7 +59,7 @@
     <property name="flash.sdk.version" value="14.0"/>
     <property name="flexjs.version" value="0.6.0"/>
     <property name="falcon.version" value="0.6.0"/>
-    
+
     <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" />
@@ -94,6 +94,9 @@
     <condition property="flash.donot.ask" value="true">
         <isset property="installer" />
     </condition>
+    <condition property="flat.donot.ask" value="true">
+        <isset property="installer" />
+    </condition>
 
     <condition property="COMPC" value="compc.bat">
         <os family="windows" />
@@ -277,7 +280,7 @@
         </fail>
     </target>
     
-    <target name="ask-licenses" depends="ask-air,ask-flash" description="Ask about the various licenses">
+    <target name="ask-licenses" depends="ask-air,ask-flash,ask-flat" description="Ask about the various licenses">
 	</target>
     
     <target name="ask-air" unless="air.donot.ask"
@@ -291,6 +294,7 @@
         <condition property="do.air.install">
             <equals arg1="${yes}" arg2="${input.air.download}"/>
         </condition>
+        <fail message="${ERROR_REQUIRED_LICENSE}" unless="do.air.install" />
         <!-- Only ask once per ant run.  -->
         <property name="air.donot.ask" value="set"/>
     </target>
@@ -306,10 +310,26 @@
         <condition property="do.flash.install">
             <equals arg1="${yes}" arg2="${input.flash.download}"/>
         </condition>
+        <fail message="${ERROR_REQUIRED_LICENSE}" unless="do.flash.install" />
         <!-- Only ask once per ant run.  -->
         <property name="flash.donot.ask" value="set"/>
     </target>
 
+    <target name="ask-flat" unless="flat.donot.ask"
+        description="Prompt the user before downloading Flat fonts">
+        
+        <input
+        message="${flat.prompt.text}"
+        validargs="${yes.no.prompts}"
+        defaultvalue="${no}"
+        addproperty="input.flat.download"/>
+        <condition property="do.flat.install">
+            <equals arg1="${yes}" arg2="${input.flat.download}"/>
+        </condition>
+        <!-- Only ask once per ant run.  -->
+        <property name="flat.donot.ask" value="set"/>
+    </target>
+
     <target name="mac-chmod" description="makes some scripts executable" unless="isWindows">
         <exec executable="chmod" dir="${FLEXJS_HOME}">
             <arg value="+x" />
@@ -412,13 +432,18 @@
         <property name="skipCache" value="true" />
     </target>
 
-    <target name="get-third-party-files" depends="air-download,flash-download,swfobject-download" />
+    <target name="get-third-party-files" depends="air-download,flash-download,flat-download,swfobject-download" />
     
     <target name="air-check" description="Checks if AIR SDK has been downloaded.">
-        <available file="${FLEXJS_HOME}/lib/adt.jar" property="air.jar.present"/>
+        <available file="${FLEXJS_HOME}/lib/adt.jar" property="skip.air.install"/>
+        <condition property="skip.air.install" value="true">
+            <not>
+                <isset property="do.air.install" />
+            </not>
+        </condition>
     </target>
     
-    <target name="air-download" depends="air-check" unless="air.jar.present"
+    <target name="air-download" depends="air-check" unless="skip.air.install"
         description="Downloads AIR SDK and copies to correct locations">
         
         <mkdir dir="${download.dir}"/>
@@ -632,10 +657,15 @@
 
     <!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
     <target name="flash-check" description="Checks if Flash SDK has been downloaded.">
-        <available file="${FLEXJS_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" property="flash.swc.present"/>
+        <available file="${FLEXJS_HOME}/frameworks/libs/player/${flash.sdk.version}/playerglobal.swc" property="skip.flash.install"/>
+        <condition property="skip.flash.install" value="true">
+            <not>
+                <isset property="do.flash.install" />
+            </not>
+        </condition>
     </target>
     
-    <target name="flash-download" depends="flash-check" unless="flash.swc.present"
+    <target name="flash-download" depends="flash-check" unless="skip.flash.install"
         description="Downloads playerglobal.swc and copies to correct locations">
         
         <mkdir dir="${download.dir}"/>
@@ -660,6 +690,43 @@
         </antcall>
     </target>
     
+    <!-- Because this requires a network connection it downloads Flash SDK only if it doesn't already exist. -->
+    <target name="flat-check" description="Checks if Flat fonts has been downloaded.">
+        <available file="${FLEXJS_HOME}/frameworks/fonts/flat-ui-icons-regular.woff" property="skip.flat.install"/>
+        <condition property="skip.flat.install" value="true">
+            <not>
+                <isset property="do.flat.install" />
+            </not>
+        </condition>
+    </target>
+    
+    <target name="flat-download" depends="flat-check" unless="skip.flat.install"
+        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>
+        <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>
+    </target>
+    
     <!-- swfobject.js (Version 2.2) -->
     <!-- Because this requires a network connection it downloads SWFObject only if it doesn't already exist. -->
     <target name="swfobject-check" description="Checks if SWFObject has been downloaded.">