Skip to content
Permalink
Browse files
FLEX-35295 - Use powershell to build zip only files on windows
- Try to fix timestamp build fail
  • Loading branch information
piotrzarzycki21 committed Oct 25, 2017
1 parent e7edfd8 commit 4b82af96963ecf010edd3c0b61635ca582a25ebb
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
@@ -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 {
@@ -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"/>

0 comments on commit 4b82af9

Please sign in to comment.