Repository: flex-asjs Updated Branches: refs/heads/develop 119c5ce1c -> 0dfd3deac
remove swfobject from checklist Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/0dfd3dea Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0dfd3dea Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0dfd3dea Branch: refs/heads/develop Commit: 0dfd3deac38bfb67b46b545383d5b7510f3e289b Parents: 119c5ce Author: Alex Harui <[email protected]> Authored: Tue Sep 8 10:23:53 2015 -0700 Committer: Alex Harui <[email protected]> Committed: Tue Sep 8 10:23:53 2015 -0700 ---------------------------------------------------------------------- apache-flex-flexjs-installer-config.xml | 24 +-------- installer.xml | 80 ++-------------------------- 2 files changed, 4 insertions(+), 100 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0dfd3dea/apache-flex-flexjs-installer-config.xml ---------------------------------------------------------------------- diff --git a/apache-flex-flexjs-installer-config.xml b/apache-flex-flexjs-installer-config.xml index 6553851..38264fd 100755 --- a/apache-flex-flexjs-installer-config.xml +++ b/apache-flex-flexjs-installer-config.xml @@ -152,7 +152,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"> <el_GR>SWFObject (ÎÏαιÏοÏμενο)</el_GR> <en_US>SWFObject (Required)</en_US> <zh_CN>SWFObject (å¿ é¡»ç)</zh_CN> @@ -233,26 +233,4 @@ <license>Adobe Flex SDK ææ¬åç´</license> </zh_TW> </component> - <component id="SWFObject (Required)" required="true" property="do.swfobject.install"> - <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> - <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> </config> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0dfd3dea/installer.xml ---------------------------------------------------------------------- diff --git a/installer.xml b/installer.xml index e9cd1de..bd0427c 100644 --- a/installer.xml +++ b/installer.xml @@ -88,19 +88,13 @@ </condition> <property name="AIRDownloadEcho" value="${INFO_DOWNLOADING_AIR_RUNTIME_KIT_MAC}" /> - <condition property="goog.donot.ask" value="true"> - <isset property="installer" /> - </condition> <condition property="air.donot.ask" value="true"> <isset property="installer" /> </condition> <condition property="flash.donot.ask" value="true"> <isset property="installer" /> </condition> - <condition property="swfobject.donot.ask" value="true"> - <isset property="installer" /> - </condition> - + <condition property="COMPC" value="compc.bat"> <os family="windows" /> </condition> @@ -213,10 +207,6 @@ <property name="falcon.md5.server.url" value="${falcon.server.url}" /> <property name="falcon.folder" value="flex/falcon/${falcon.version}/binaries" /> <property name="falcon.file" value="apache-flex-falconjx-${falcon.version}-bin.zip" /> - <property name="goog.lib.url.server" value="${config.google-closure-library.server}" /> - <property name="goog.lib.url.folder" value="${config.google-closure-library.folder}" /> - <property name="goog.lib.url.file" value="${config.google-closure-library.file}" /> - <property name="goog.lib.md5" value="${config.google-closure-library.md5}" /> </target> <target name="install" depends="get-data,find-java,get-md5-data,check-binary,ask-licenses,get-falcon,get-third-party-files,fixup-config-files,hack-fb-files,setup-launch-configs,delete-download-dir" description="Converts binary package to IDE compatible folder"> @@ -287,24 +277,9 @@ </fail> </target> - <target name="ask-licenses" depends="ask-goog,ask-air,ask-flash,ask-swfobject" description="Ask about the various licenses"> + <target name="ask-licenses" depends="ask-air,ask-flash" description="Ask about the various licenses"> </target> - <target name="ask-goog" unless="goog.donot.ask" - description="Prompt the user before downloading Google Closure Library"> - - <input - message="${goog.prompt.text}" - validargs="${yes.no.prompts}" - defaultvalue="${no}" - addproperty="input.goog.download"/> - <condition property="do.goog.install"> - <equals arg1="${yes}" arg2="${input.goog.download}"/> - </condition> - <!-- Only ask once per ant run. --> - <property name="goog.donot.ask" value="set"/> - </target> - <target name="ask-air" unless="air.donot.ask" description="Prompt the user before downloading AIR"> @@ -335,21 +310,6 @@ <property name="flash.donot.ask" value="set"/> </target> - <target name="ask-swfobject" unless="swfobject.donot.ask" - description="Prompt the user before downloading SWFObject"> - - <input - message="${swfobject.prompt.text}" - validargs="${yes.no.prompts}" - defaultvalue="${no}" - addproperty="input.swfobject.download"/> - <condition property="do.swfobject.install"> - <equals arg1="${yes}" arg2="${input.swfobject.download}"/> - </condition> - <!-- Only ask once per ant run. --> - <property name="swfobject.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" /> @@ -450,40 +410,6 @@ <target name="get-third-party-files" depends="air-download,flash-download,swfobject-download" /> - <!-- Because this requires a network connection it downloads artifacts only if it doesn't already exist. --> - <target name="goog-check" description="Checks if Google Closure Library has been downloaded."> - <available file="${FLEXJS_HOME}/js/lib/google/closure-library/closure/goog/base.js" property="goog.lib.present"/> - </target> - - <target name="goog-download" depends="goog-check" unless="goog.lib.present" - description="Downloads Google Closure Library and copies to correct locations"> - - <mkdir dir="${download.dir}"/> - <antcall target="goog-get" /> - <unzip src="${download.dir}/${goog.lib.url.file}" dest="${download.dir}/temp" /> - <copy todir="${FLEXJS_HOME}/js/lib/google/closure-library"> - <fileset dir="${download.dir}/temp/closure-library-master"> - <include name="**" /> - </fileset> - </copy> - </target> - - <target name="goog-get-check" > - <available file="${download.dir}/${goog.lib.url.file}" property="goog.downloaded" /> - </target> - - <target name="goog-get" depends="goog-get-check" unless="goog.downloaded" > - <echo>${INFO_INSTALLING_GOOG} ${goog.lib.url.server}/${goog.lib.url.folder}/${goog.lib.url.file}</echo> - <antcall target="download_using_get" > - <param name="srcDomain" value="${goog.lib.url.server}" /> - <param name="srcFolder" value="${goog.lib.url.folder}" /> - <param name="srcFile" value="${goog.lib.url.file}" /> - <param name="dest" value="${download.dir}/${goog.lib.url.file}" /> - <param name="failmessage" value="Google Closure Library download failed" /> - <param name="md5" value="${goog.lib.md5}" /> - </antcall> - </target> - <target name="air-check" description="Checks if AIR SDK has been downloaded."> <available file="${FLEXJS_HOME}/lib/adt.jar" property="air.jar.present"/> </target> @@ -737,7 +663,7 @@ </target> <target name="swfobject-download" depends="swfobject-check" unless="swfobject.js.present" - description="Copies SWFObject from code.google.com"> + description="Copies SWFObject from github"> <echo file="${basedir}/swfobject.properties">swfobject.echo=${INFO_DOWNLOADING_FILE_FROM}</echo> <replace file="${basedir}/swfobject.properties" token="{0}" value="${swfobject.url.file}" />
