Repository: flex-utilities Updated Branches: refs/heads/develop e7edfd84d -> 4b82af969
FLEX-35295 - Use powershell to build zip only files on windows - Try to fix timestamp build fail Project: http://git-wip-us.apache.org/repos/asf/flex-utilities/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-utilities/commit/4b82af96 Tree: http://git-wip-us.apache.org/repos/asf/flex-utilities/tree/4b82af96 Diff: http://git-wip-us.apache.org/repos/asf/flex-utilities/diff/4b82af96 Branch: refs/heads/develop Commit: 4b82af96963ecf010edd3c0b61635ca582a25ebb Parents: e7edfd8 Author: Piotr Zarzycki <[email protected]> Authored: Wed Oct 25 19:42:50 2017 +0200 Committer: Piotr Zarzycki <[email protected]> Committed: Wed Oct 25 19:42:50 2017 +0200 ---------------------------------------------------------------------- .../src/org/apache/flex/ant/tags/Unzip.as | 21 ++++++++++---------- flex-installer/build.xml | 5 +++-- 2 files changed, 13 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/4b82af96/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Unzip.as ---------------------------------------------------------------------- diff --git a/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Unzip.as b/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Unzip.as index 41b67f3..43e08bc 100644 --- a/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Unzip.as +++ b/flex-installer/ant_on_air/src/org/apache/flex/ant/tags/Unzip.as @@ -135,9 +135,16 @@ package org.apache.flex.ant.tags private function dounzip():void { - if (unzip(srcFile)) + if (Capabilities.os.indexOf("Win") != -1 && srcFile.extension == "zip") { - dispatchEvent(new Event(Event.COMPLETE)); + if (winUnzip(srcFile)) + { + dispatchEvent(new Event(Event.COMPLETE)); + } + } + else + { + unzip(srcFile); } } @@ -170,13 +177,7 @@ package org.apache.flex.ant.tags _process.start(startupInfo); } - private function unzip(fileToUnzip:File):Boolean { - if (Capabilities.os.indexOf("Win") != -1) - { - winUnzip(fileToUnzip); - return false; - } - + private function unzip(fileToUnzip:File):void { var zipFileBytes:ByteArray = new ByteArray(); var fs:FileStream = new FileStream(); var fzip:Zip = new Zip(); @@ -191,8 +192,6 @@ package org.apache.flex.ant.tags // synchronous, so no progress events fzip.loadBytes(zipFileBytes); - - return true; } private function isDirectory(f:ZipFile):Boolean { http://git-wip-us.apache.org/repos/asf/flex-utilities/blob/4b82af96/flex-installer/build.xml ---------------------------------------------------------------------- diff --git a/flex-installer/build.xml b/flex-installer/build.xml index 9aca661..567976c 100644 --- a/flex-installer/build.xml +++ b/flex-installer/build.xml @@ -380,8 +380,7 @@ <target name="simple-untar-license" > <mkdir dir="${DEPS_DIR}/as3-simple-untar" /> <get src="https://raw.githubusercontent.com/thdtjsdn/as3-simple-untar/master/src/de/ketzler/utils/SimpleUntar.as"; - dest="${DEPS_DIR}/as3-simple-untar/LICENSE" - /> + dest="${DEPS_DIR}/as3-simple-untar/LICENSE"/> <replaceregexp file="${DEPS_DIR}/as3-simple-untar/LICENSE" match="package .*" replace="" flags="s" @@ -401,10 +400,12 @@ /> <antcall target="get-as3crypto-license" /> <antcall target="simple-untar-license" /> + <echo message="Run Adobe Air ADT"/> <java jar="${ADT}" fork="true" failonerror="true" maxmemory="512m"> <arg value="-package"/> + <arg line="-tsa http://timestamp.digicert.com"/> <arg value="-storetype"/> <arg value="${STORETYPE}"/> <arg value="-keystore"/>
