672758 - make -C [browser|xulrunner]/installer fails

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Jacek Caban]

Attachment: fix v1.0

I've found the problem by trying to do |make -C xulrunner/installer| in my cross compiled mingw build on Linux, but after analyzing the problem, it seems to be a problem also for browser builds and other configs. The error message is:

/bin/sh: 1: command not found

That's because GENERATE_CACHE is used as a command in toolkit/mozapps/installer/packager.mk PACK_OMNIJAR rule:

PACK_OMNIJAR    = \
  rm -f omni.jar components/binary.manifest && \
  grep -h '^binary-component' components/*.manifest > binary.manifest ; \
  for m in components/*.manifest; do \
    sed -e 's/^binary-component/\#binary-component/' $$m > tmp.manifest && \
    mv tmp.manifest $$m; \
  done; \
  $(ZIP) -r9m omni.jar $(OMNIJAR_FILES) -x $(NON_OMNIJAR_FILES) && \
  $(GENERATE_CACHE) && \
  $(OPTIMIZE_JARS_CMD) --optimize $(JARLOG_DIR_AB_CD) ./ ./ && \
  mv binary.manifest components && \
  printf "manifest components/binary.manifest\n" > chrome.manifest

but it's set to 1 instead of true in browser/installer/Makefile.in and xulrunner/installer/Makefile.in.

Comment 1

[Mike Hommey [:glandium]]

Attachment: Properly set GENERATE_CACHE in all cases

Comment 2

[(not currently active) Ted Mielczarek]

Comment on attachment 547037 [details] [diff] [review]
Properly set GENERATE_CACHE in all cases

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

Comment 3

[Mike Hommey [:glandium]]

http://hg.mozilla.org/integration/mozilla-inbound/rev/c3906fd66ba0

Comment 4

[Mike Hommey [:glandium]]

Fixup:
http://hg.mozilla.org/integration/mozilla-inbound/rev/3223495dfc69

Comment 5

[(no longer active)]

http://hg.mozilla.org/mozilla-central/rev/c3906fd66ba0
http://hg.mozilla.org/mozilla-central/rev/3223495dfc69