Closed Bug 1319351 Opened 3 years ago Closed 3 years ago

Avoid splash.rc depending on files in dist/branding

Categories

(Firefox Build System :: General, defect)

defect
Not set

Tracking

(firefox53 fixed)

RESOLVED FIXED
mozilla53
Tracking Status
firefox53 --- fixed

People

(Reporter: glandium, Assigned: glandium)

References

(Blocks 1 open bug)

Details

Attachments

(1 file)

No description provided.
Comment on attachment 8813057 [details]
Bug 1319351 - Avoid splash.rc depending on files in dist/branding.

https://reviewboard.mozilla.org/r/94580/#review95036
Attachment #8813057 - Flags: review?(mshal) → review+
Pushed by mh@glandium.org:
https://hg.mozilla.org/integration/autoland/rev/a61bb9441725
Avoid splash.rc depending on files in dist/branding. r=mshal
https://hg.mozilla.org/mozilla-central/rev/a61bb9441725
https://hg.mozilla.org/mozilla-central/rev/ab47a8778213
Status: NEW → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla53
Hi glandium: 

With this patch on my local machine(Ubuntu 14.04)

I will get compile error as below,

 0:02.23 /usr/bin/make -f client.mk -s
 0:07.03 Adding client.mk options from /media/hdd/Projects/gecko-mozilla_fennec/mozconfig:
 0:07.04     CONFIG_GUESS=arm-linux-androideabi
 0:07.04     AUTOCLOBBER=1
 0:07.04     MOZ_OBJDIR=/media/hdd/Projects/gecko-mozilla_fennec/obj-arm-linux-androideabi
 0:07.04     OBJDIR=/media/hdd/Projects/gecko-mozilla_fennec/obj-arm-linux-androideabi
 0:07.04     FOUND_MOZCONFIG=/media/hdd/Projects/gecko-mozilla_fennec/mozconfig
 0:14.36 Elapsed: 0.01s; From dist/public: Kept 0 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:14.36 Elapsed: 0.02s; From dist/private: Kept 0 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:14.44 Elapsed: 0.10s; From dist/xpi-stage: Kept 14 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:14.63 Elapsed: 0.29s; From dist/sdk: Kept 11 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:18.22 Elapsed: 3.88s; From dist/idl: Kept 1064 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:19.54 Elapsed: 5.20s; From _tests: Kept 1143 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:19.57 Elapsed: 5.23s; From dist/bin: Kept 1291 existing; Added/updated 0; Removed 2 files and 0 directories.
 0:21.33 Elapsed: 6.98s; From dist/include: Kept 4911 existing; Added/updated 0; Removed 0 files and 0 directories.
 0:21.34 buildid.h
 0:21.34 source-repo.h
 0:22.56 application.ini
 0:22.78 Error opening file "james"
 0:22.78 Traceback (most recent call last):
 0:22.78   File "/media/hdd/Projects/gecko-mozilla_fennec/python/mozbuild/mozbuild/action/file_generate.py", line 63, in main
 0:22.78     ret = module.__dict__[method](output, *args.additional_arguments)
 0:22.78   File "/media/hdd/Projects/gecko-mozilla_fennec/python/mozbuild/mozbuild/action/preprocessor.py", line 15, in generate
 0:22.78     pp.handleCommandLine(list(args), True)
 0:22.78   File "/media/hdd/Projects/gecko-mozilla_fennec/python/mozbuild/mozbuild/preprocessor.py", line 480, in handleCommandLine
 0:23.04     with open(f, 'rU') as input:
 0:23.04 IOError: [Errno 2] No such file or directory: 'james'
 0:23.05 make[5]: *** [application.ini] Error 1
 0:23.05 make[5]: *** Deleting file `application.ini'
 0:23.05 make[4]: *** [build/export] Error 2
 0:23.05 make[4]: *** Waiting for unfinished jobs....
 0:24.31 make[3]: *** [export] Error 2
 0:24.31 make[2]: *** [default] Error 2
 0:24.31 make[1]: *** [realbuild] Error 2
 0:24.31 make: *** [build] Error 2
 0:24.35 401 compiler warnings present.


Do you know what should I do to fix this?

Need to do a mach bootstrap again?

Thank you.
Flags: needinfo?(mh+mozilla)
Flags: needinfo?(mh+mozilla)
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.