848385 - Running make package twice in a row with MOZ_ENABLE_SZIP is broken

Status: RESOLVED FIXED

(Core :: mozglue, defect)

Description

[Mike Hommey [:glandium]]

The second time, we're trying to re-szip an already szipped file.

Comment 1

[Mike Hommey [:glandium]]

There are other problems, too, like running file_id on szipped files.

Comment 2

[Mike Hommey [:glandium]]

Attachment: Avoid recompressing a szip

Comment 3

[Mike Hommey [:glandium]]

Attachment: Avoid recompressing a szip, and (de)compress in-place (but still with a temporary file)

Comment 4

[Mike Hommey [:glandium]]

Attachment: Change the szip invocation accordingly

For whoever comes here first. The other patch in this bug changes the szip executable such that it takes only one argument and does in-place compression, which removes the need for the mv.

Comment 5

[Mike Hommey [:glandium]]

Attachment: Avoid recompressing a szip, and (de)compress in-place (but still with a temporary file)

And don't error out when trying to decompress something that is not compressed. Makes things easier for other scripts.

Comment 6

[Nathan Froyd [:froydnj]]

Comment on attachment 735115 [details] [diff] [review]
Avoid recompressing a szip, and (de)compress in-place (but still with a temporary file)

Review of attachment 735115 [details] [diff] [review]:
-----------------------------------------------------------------

::: mozglue/linker/szip.cpp
@@ +535,5 @@
>    }
>  
> +  std::stringstream tmpOutStream;
> +  tmpOutStream << firstArg[0] << ".sz." << getpid();
> +  std::string tmpOut(tmpOutStream.str());

Using mkstemp might be a little nicer, though you'd have to change FileBuffer to accept an existing fd as an argument.

Comment 7

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/10f03c8cf438

Comment 8

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/10f03c8cf438