1029870 - Update tools/update-packaging/make_incremental_update.sh to allow passing Product Version and Channel ID

Status: RESOLVED FIXED

Description

[Anhad Jai Singh (:ffledgling)]

Currently there is no way to pass the ChannelID and ProductVersion to the MAR binary at run time.
See: http://hg.mozilla.org/mozilla-central/file/tip/tools/update-packaging/make_incremental_update.sh#l278

Adding provisions in the script to check $MOZ_CHANNEL_ID and $MOZ_PRODUCT_VERSION environment variables to allow for this at run time.

Comment 1

[Anhad Jai Singh (:ffledgling)]

Created attachment 8445637 [details] [diff] [review]
Bug-1029870.patch

Adding patch.

Note: The strange order of appending flags to the `$mar_command` is because the -c <output_file> flag needs to be at the end, else everything after the -c flag is treated as a filename

Probably because of the way args are handled here: http://hg.mozilla.org/mozilla-central/file/a19e0434ea52/modules/libmar/tool/mar.c#l155

Comment 2

[Nick Thomas [:nthomas]]

Comment on attachment 8445637 [details] [diff] [review]
Bug-1029870.patch

Tested fine on our win32/mac/linux64 systems. If this works in the service too we can go ahead and land it.

Comment 3

[Anhad Jai Singh (:ffledgling)]

How do we make sure it works in service as well?

Comment 4

[Nick Thomas [:nthomas]]

Comment on attachment 8445637 [details] [diff] [review]
Bug-1029870.patch

https://hg.mozilla.org/integration/mozilla-inbound/rev/3fa5aac520f6

Expect the sheriffs to merge this to m-c within a day, closing the bug when they do.

Comment 5

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/mozilla-central/rev/3fa5aac520f6