Repository: flex-sdk Updated Branches: refs/heads/release4.14.0 42cdd44b8 -> ad9ff189a
remove OSMF and SWFObject license approval Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ad9ff189 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ad9ff189 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ad9ff189 Branch: refs/heads/release4.14.0 Commit: ad9ff189a678ad9a8ba8b01751073186948381d4 Parents: 42cdd44 Author: Alex Harui <aha...@apache.org> Authored: Tue Jan 13 22:51:59 2015 -0800 Committer: Alex Harui <aha...@apache.org> Committed: Tue Jan 13 22:51:59 2015 -0800 ---------------------------------------------------------------------- apache-flex-sdk-installer-config.xml | 100 +----------------------------- installer.xml | 10 ++- 2 files changed, 6 insertions(+), 104 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ad9ff189/apache-flex-sdk-installer-config.xml ---------------------------------------------------------------------- diff --git a/apache-flex-sdk-installer-config.xml b/apache-flex-sdk-installer-config.xml index c47619f..ed6b758 100755 --- a/apache-flex-sdk-installer-config.xml +++ b/apache-flex-sdk-installer-config.xml @@ -57,7 +57,7 @@ <zh_CN>Adobe Flash Player playerglobal.swc (å¿ é¡»ç)</zh_CN> <zh_TW>Adobe Flash Player playerglobal.swc (å¿ é ç)</zh_TW> </step> - <step id="swfobject-download" property="do.swfobject.install"> + <step id="swfobject-download"> <de_DE>SWFObject (Benötigt)</de_DE> <el_GR>SWFObject (ÎÏαιÏοÏμενο)</el_GR> <en_US>SWFObject (Required)</en_US> @@ -69,7 +69,7 @@ <zh_CN>SWFObject (å¿ é¡»ç)</zh_CN> <zh_TW>SWFObject (å¿ é ç)</zh_TW> </step> - <step id="osmf-download" property="do.osmf.install"> + <step id="osmf-download"> <de_DE>OSMF (Benötigt)</de_DE> <el_GR>OSMF (ÎÏαιÏοÏμενο)</el_GR> <en_US>OSMF (Required)</en_US> @@ -252,102 +252,6 @@ <license>Adobe Flex SDK ææ¬åç´</license> </zh_TW> </component> - <component id="STEP_REQUIRED_INSTALL_SWFOBJECT" required="true" property="do.swfobject.install"> - <de_DE> - <label>SWFObject (Benötigt)</label> - <message>Das SWFObject utility verwendet die MIT License (MIT). Möchten SIe jetzt das SWFObject utility installieren?</message> - </de_DE> - <el_GR> - <label>SWFObject (ÎÏαιÏοÏμενο)</label> - <message>Îια Ïο SWFObject ιÏÏÏει η ÏÏ Î¼ÏÏνία ÏÏήÏÎ·Ï ÏÎ¿Ï MIT License (MIT). ÎÎλεÏε να εγκαÏαÏÏήÏεÏε Ïο SWFObject;</message> - </el_GR> - <en_US> - <label>SWFObject (Required)</label> - <message>The MIT License (MIT) applies to the SWFObject utility. Do you want to install the SWFObject utility?</message> - <license>MIT License</license> - <licenseURL>http://opensource.org/licenses/mit-license.php</licenseURL> - </en_US> - <es_ES> - <label>SWFObject (Requerido)</label> - <message>SWFObject se ofrece bajo licencia MIT (MIT). ¿Quiere instalar SWFObject?</message> - </es_ES> - <fr_FR> - <label>SWFObject (Requis)</label> - <message>La licence MIT (MIT) s'applique à l'utilitaire SWFObject. Voulez-vous installer l'utilitaire SWFObject?</message> - </fr_FR> - <nl_NL> - <label>SWFObject (Verplicht)</label> - <message>De MIT License (MIT) geldt voor de SWFObject utility. Wilt u de SWFObject utility installeren?</message> - </nl_NL> - <pt_BR> - <label>SWFObject (Obrigatório)</label> - <message>A MIT License (MIT) se aplica ao utilitário SWFObject. Você quer instalar o utilitário SWFObject</message> - <license>MIT License</license> - <licenseURL>http://opensource.org/licenses/mit-license.php</licenseURL> - </pt_BR> - <ko_KR> - <label>SWFObject (íì)</label> - <message>SWFObject ì í¸ë¦¬í°ìë MIT License (MIT)ê° ì ì©ë©ëë¤. SWFObject ì í¸ë¦¬í°ë¥¼ ì¤ì¹íìê² ìµëê¹?</message> - </ko_KR> - <zh_CN> - <label>SWFObject (å¿ é¡»ç)</label> - <message>MIT 许å¯åè®®éç¨äº SWFObject å®ç¨ç¨åº. æ¨æ³è¦å®è£ SWFObject å®ç¨ç¨åºå?</message> - <license>MIT 许å¯åè®®</license> - </zh_CN> - <zh_TW> - <label>SWFObject (å¿ é ç)</label> - <message>MIT ææ¬åç´é©ç¨æ¼ SWFObject 實ç¨ç¨å¼. æ¨æ³è¦å®è£ SWFObject 實ç¨ç¨å¼å?</message> - <license>MIT ææ¬åç´</license> - </zh_TW> - </component> - <component id="STEP_REQUIRED_INSTALL_OSMF" required="true" property="do.osmf.install"> - <de_DE> - <label>OSMF (Benötigt)</label> - <message>Das Open Source Media Framework (OSMF) welches von den Videokomponenten verwendet wird ist unter der Mozilla Public License Version 1.1 lizensiert. Möchten Sie das Open Source Media Framework (OSMF) jetzt installieren?</message> - </de_DE> - <el_GR> - <label>OSMF (ÎÏαιÏοÏμενο)</label> - <message>Îια Ïο Open Source Media Framework (OSMF) ÏÎ¿Ï ÏÏηÏιμοÏοιείÏαι αÏο Ïα ανÏικείμενα video ιÏÏÏει η ÏÏ Î¼ÏÏνία ÏÏήÏÎ·Ï ÏÎ¿Ï Mozilla Public License Version 1.1. ÎÎλεÏε να εγκαÏαÏÏήÏεÏε Ïο Îια Ïο Open Source Media Framework (OSMF);</message> - </el_GR> - <en_US> - <label>OSMF (Required)</label> - <message>The Open Source Media Framework (OSMF) used by the video components is licensed under the Mozilla Public License Version 1.1. Do you want to install the Open Source Media Framework (OSMF)?</message> - <license>Mozilla Public License Version 1.1</license> - <licenseURL>http://www.mozilla.org/MPL/</licenseURL> - </en_US> - <es_ES> - <label>OSMF (Requerido)</label> - <message>Open Source Media Framework (OSMF), utilizado en los componentes de video, se ofrece bajo los términos de la Mozilla Public License Version 1.1. ¿Quiere instalar Open Source Media Framework (OSMF)?</message> - </es_ES> - <fr_FR> - <label>OSMF (Requis)</label> - <message>L'Open Source Media Framework (OSMF) utilisé par les composants vidéo est sous licence Mozilla Public License Version 1.1. Voulez-vous installer le Open Source Media Framework (OSMF)?</message> - </fr_FR> - <nl_NL> - <label>OSMF (Verplicht)</label> - <message>Het Open Source Media Framework (OSMF) dat gebruikt wordt door de video componenten is gelicenseerd onder de Mozilla Public License Versie 1.1. Wilt u het Open Source Media Framework (OSMF) installeren?</message> - </nl_NL> - <pt_BR> - <label>OSMF (Obrigatório)</label> - <message>O Open Source Media Framework (OSMF) utilizado pelos componentes de video está sob a licença Mozilla Public License Version 1.1. Você quer instalar o Open Source Media Framework (OSMF)?</message> - <license>Mozilla Public License Version 1.1</license> - <licenseURL>http://www.mozilla.org/MPL/</licenseURL> - </pt_BR> - <ko_KR> - <label>OSMF (íì)</label> - <message>Video ì»´í¬ëí¸ìì ì¬ì©ë Open Source Media Framework (OSMF)ë Mozilla Public License Version 1.1ë¡ ë¼ì´ì¼ì¤ ëì´ììµëë¤. Open Source Media Framework (OSMF)를 ì¤ì¹íìê² ìµëê¹?</message> - </ko_KR> - <zh_CN> - <label>OSMF (å¿ é¡»ç)</label> - <message>Flex çä¸äºè§é¢ç»ä»¶éè¦ç¨å°å¼æºåªä½æ¡æ¶ Open Source Media Framework (OSMF), OSMF ç± Mozilla å ¬å ±è®¸å¯åè®® 1.1 çæä¾ææ. æ¨æ³è¦å®è£ OSMF å?</message> - <license>Mozilla å ¬å ±è®¸å¯åè®® 1.1 ç</license> - </zh_CN> - <zh_TW> - <label>OSMF (å¿ é ç)</label> - <message>Flex çä¸äºè¦é »å 件éè¦ç¨å°éæºåªé«æ¡æ¶ Open Source Media Framework (OSMF), OSMF ç± Mozilla å ¬å ±ææ¬åç´ 1.1 çæä¾ææ¬. æ¨æ³è¦å®è£ OSMF å?</message> - <license>Mozilla å ¬å ±ææ¬åç´ 1.1 ç</license> - </zh_TW> - </component> <component id="STEP_REQUIRED_INSTALL_OFL_FONTS" required="true" property="do.ofl.fonts.install"> <de_DE> <label>Font Awesome and Lato Fonts (Benötigt)</label> http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ad9ff189/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index 8dc9289..5b88f8d 100644 --- a/installer.xml +++ b/installer.xml @@ -120,12 +120,10 @@ <condition property="flash.donot.ask" value="true"> <isset property="installer" /> </condition> - <condition property="swfobject.donot.ask" value="true"> - <isset property="installer" /> - </condition> - <condition property="osmf.donot.ask" value="true"> - <isset property="installer" /> - </condition> + <property name="swfobject.donot.ask" value="true" /> + <property name="do.swfobject.install" value="true" /> + <property name="osmf.donot.ask" value="true" /> + <property name="do.osmf.install" value="true" /> <condition property="fontswf.donot.ask" value="true"> <isset property="installer" /> </condition>
