595559 - omnijar packaging fails when there are no binary components in the application

Status: RESOLVED WONTFIX

(Toolkit Graveyard :: Build Config, defect)

Description

[Dave Townsend [:mossop]]

Attachment: patch rev 1

With no binary components components/components.manifest does not exist and so the step fails. Even if you fix that it still creates a useless empty binary.manifest.

This only plays with components.manifest if it exists and if binary.manifest is empty then it just deletes it and never creates a chrome.manifest.

Comment 1

[Michael Wu [:mwu]]

Comment on attachment 474418 [details] [diff] [review]
patch rev 1

components/components.manifest should always exist AFAIK.. unless you're not packaging, in which you're missing out on the benefits of manifest combining and xptlinking.

Comment 2

[Dave Townsend [:mossop]]

(In reply to comment #1)
> Comment on attachment 474418 [details] [diff] [review]
> patch rev 1
> 
> components/components.manifest should always exist AFAIK.. unless you're not
> packaging, in which you're missing out on the benefits of manifest combining
> and xptlinking.

Perhaps if you have a package manifest defined, if not you get xpt linking for free anyway and there is no components/components.manifest

Comment 3

[Michael Wu [:mwu]]

Comment on attachment 474418 [details] [diff] [review]
patch rev 1

Hm ok, I can see that. Fair enough.

Comment 4

[(not currently active) Ted Mielczarek]

Comment on attachment 474418 [details] [diff] [review]
patch rev 1

I hate this even worse than I hated it before. Plz rewrite this all in Python soon.
>diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
>--- a/toolkit/mozapps/installer/packager.mk
>+++ b/toolkit/mozapps/installer/packager.mk
>@@ -237,13 +237,19 @@ NON_OMNIJAR_FILES = \
> PACK_OMNIJAR	= \
>   rm -f omni.jar components/binary.manifest && \
>   grep -h '^binary-component' components/*.manifest > binary.manifest ; \
>-  sed -e 's/^binary-component/\#binary-component/' components/components.manifest > components.manifest && \
>-  mv components.manifest components && \
>+  if [ -e components/components.manifest ]; then \
>+    sed -e 's/^binary-component/\#binary-component/' components/components.manifest > components.manifest && \
>+    mv components.manifest components; \
>+  fi && \
>   find . | xargs touch -t 201001010000 && \
>   zip -r9mX omni.jar $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \
>   $(OPTIMIZE_JARS_CMD) --optimize $(_ABS_DIST)/jarlog/ ./ ./ && \
>-  mv binary.manifest components && \
>-  printf "manifest components/binary.manifest\n" > chrome.manifest
>+  if [ -s binary.manifest ]; then \
>+    mv binary.manifest components && \
>+    printf "manifest components/binary.manifest\n" > chrome.manifest; \
>+  else \
>+    rm binary.manifest; \

Presumably you want rm -f binary.manifest? Since it could not exist if you get to this branch.

Comment 5

[Kim Moir [:kmoir] ET]

Triaging, old bug, n/a now, closing