Closed
Bug 912099
Opened 11 years ago
Closed 11 years ago
Make sure CPP_SOURCES only points to existing files
Categories
(Firefox Build System :: General, defect)
Firefox Build System
General
Tracking
(Not tracked)
RESOLVED
FIXED
mozilla27
People
(Reporter: Ms2ger, Assigned: Ms2ger)
References
Details
Attachments
(7 files)
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
(deleted),
patch
|
mshal
:
review+
|
Details | Diff | Splinter Review |
There's three main issues here:
1. make syntax in moz.build
2. copying / generating files into . during export
3. vpath
I've gone with moving 1 and 2 back into makefiles, and giving 3 a full path.
Assignee | ||
Comment 1•11 years ago
|
||
Attachment #811076 -
Flags: review?(mshal)
Assignee | ||
Comment 2•11 years ago
|
||
Attachment #811077 -
Flags: review?(mshal)
Assignee | ||
Comment 3•11 years ago
|
||
Attachment #811078 -
Flags: review?(mshal)
Assignee | ||
Comment 4•11 years ago
|
||
Attachment #811079 -
Flags: review?(mshal)
Assignee | ||
Comment 5•11 years ago
|
||
Attachment #811080 -
Flags: review?(mshal)
Assignee | ||
Comment 6•11 years ago
|
||
Attachment #811081 -
Flags: review?(mshal)
Assignee | ||
Comment 7•11 years ago
|
||
Attachment #811082 -
Flags: review?(mshal)
Comment 8•11 years ago
|
||
Comment on attachment 811076 [details] [diff] [review]
Part a: most of the tree
>diff --git a/build/stlport/moz.build b/build/stlport/moz.build
>--- a/build/stlport/moz.build
>+++ b/build/stlport/moz.build
>@@ -1,12 +1,8 @@
> # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
> # vim: set filetype=python:
> # This Source Code Form is subject to the terms of the Mozilla Public
> # License, v. 2.0. If a copy of the MPL was not distributed with this
> # file, You can obtain one at http://mozilla.org/MPL/2.0/.
>
>-CPP_SOURCES += [
>- '$(notdir $(wildcard $(srcdir)/src/*.cpp))',
>-]
We should just be able to list the srcs explicitly here now since we don't need the $(notdir) anymore. I can do that as part of VPATH removal afterward though.
I don't see any major reasons for this not to go in, though putting things back into Makefiles feels like a step backward. I guess we can move them back into moz.build once we get the code generation there as well, so it can know to skip checking those files.
Attachment #811076 -
Flags: review?(mshal) → review+
Comment 9•11 years ago
|
||
Comment on attachment 811077 [details] [diff] [review]
Part b: ipc/chromium
Looks good!
Attachment #811077 -
Flags: review?(mshal) → review+
Comment 10•11 years ago
|
||
Comment on attachment 811078 [details] [diff] [review]
Part c: gfx/angle
>diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build
>--- a/gfx/angle/moz.build
>+++ b/gfx/angle/moz.build
>@@ -15,35 +15,35 @@
> if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
>- CPP_SOURCES += [
>+ CPP_SOURCES += ['src/compiler/' + src for src in [
> 'ossource_win.cpp',
>- ]
>+ ]]
> else:
>- CPP_SOURCES += [
>+ CPP_SOURCES += ['src/compiler/' + src for src in [
> 'ossource_posix.cpp',
>- ]
>+ ]]
nit: Might be a bit clearer to do 'src/compiler/ossource_posix.cpp' for these two, rather than do the loop.
Attachment #811078 -
Flags: review?(mshal) → review+
Updated•11 years ago
|
Attachment #811079 -
Flags: review?(mshal) → review+
Updated•11 years ago
|
Attachment #811080 -
Flags: review?(mshal) → review+
Updated•11 years ago
|
Attachment #811081 -
Flags: review?(mshal) → review+
Updated•11 years ago
|
Attachment #811082 -
Flags: review?(mshal) → review+
Assignee | ||
Comment 11•11 years ago
|
||
https://hg.mozilla.org/mozilla-central/rev/027743d48686
https://hg.mozilla.org/mozilla-central/rev/ccd2f40d48f8
https://hg.mozilla.org/mozilla-central/rev/16799dc6bd46
https://hg.mozilla.org/mozilla-central/rev/229a2dde03b3
https://hg.mozilla.org/mozilla-central/rev/f5ff5837edd5
https://hg.mozilla.org/mozilla-central/rev/5e91fd0e187d
https://hg.mozilla.org/mozilla-central/rev/c2625a33e8f0
Status: ASSIGNED → RESOLVED
Closed: 11 years ago
Flags: in-testsuite-
Resolution: --- → FIXED
Target Milestone: --- → mozilla27
Updated•7 years ago
|
Product: Core → Firefox Build System
You need to log in
before you can comment on or make changes to this bug.
Description
•