Make sure CPP_SOURCES only points to existing files

RESOLVED FIXED in mozilla27

Status

Firefox Build System
General
RESOLVED FIXED
5 years ago
3 months ago

People

(Reporter: Ms2ger, Assigned: Ms2ger)

Tracking

Trunk
mozilla27
Dependency tree / graph

Firefox Tracking Flags

(Not tracked)

Details

Attachments

(7 attachments)

(Assignee)

Description

5 years ago
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)

Updated

5 years ago
Blocks: 912438
(Assignee)

Updated

5 years ago
Blocks: 875013
(Assignee)

Updated

5 years ago
Blocks: 913268
(Assignee)

Comment 1

5 years ago
Created attachment 811076 [details] [diff] [review]
Part a: most of the tree
Attachment #811076 - Flags: review?(mshal)
(Assignee)

Comment 2

5 years ago
Created attachment 811077 [details] [diff] [review]
Part b: ipc/chromium
Attachment #811077 - Flags: review?(mshal)
(Assignee)

Comment 3

5 years ago
Created attachment 811078 [details] [diff] [review]
Part c: gfx/angle
Attachment #811078 - Flags: review?(mshal)
(Assignee)

Comment 4

5 years ago
Created attachment 811079 [details] [diff] [review]
Part d: gfx/layers
Attachment #811079 - Flags: review?(mshal)
(Assignee)

Comment 5

5 years ago
Created attachment 811080 [details] [diff] [review]
Part e: gfx/skia
Attachment #811080 - Flags: review?(mshal)
(Assignee)

Comment 6

5 years ago
Created attachment 811081 [details] [diff] [review]
Part f: toolkit/crashreporter
Attachment #811081 - Flags: review?(mshal)
(Assignee)

Comment 7

5 years ago
Created attachment 811082 [details] [diff] [review]
Part g: js/src
Attachment #811082 - Flags: review?(mshal)
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 on attachment 811077 [details] [diff] [review]
Part b: ipc/chromium

Looks good!
Attachment #811077 - Flags: review?(mshal) → review+
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

5 years ago
Attachment #811079 - Flags: review?(mshal) → review+

Updated

5 years ago
Attachment #811080 - Flags: review?(mshal) → review+

Updated

5 years ago
Attachment #811081 - Flags: review?(mshal) → review+

Updated

5 years ago
Attachment #811082 - Flags: review?(mshal) → review+
(Assignee)

Updated

5 years ago
Depends on: 923489
Depends on: 930350
Blocks: 932197

Updated

3 months ago
Product: Core → Firefox Build System
You need to log in before you can comment on or make changes to this bug.