Consolidate vorbis moz.build files

RESOLVED FIXED in mozilla28

Status

()

Core
Audio/Video
RESOLVED FIXED
5 years ago
4 years ago

People

(Reporter: rillian, Assigned: rillian)

Tracking

Trunk
mozilla28
x86_64
Linux
Points:
---

Firefox Tracking Flags

(Not tracked)

Details

(Whiteboard: [qa-])

Attachments

(2 attachments, 4 obsolete attachments)

media/libvorbis uses hierarchical moz.build files, and hides a Makefile.in with some build config in a subdirectory.

Consolidating these to a pair of files in the top-level source directory will be less confusing and parse faster.
(Assignee)

Comment 1

5 years ago
Created attachment 821308 [details] [diff] [review]
Consolidate vorbis build files

Replace recursive build files with a single pair in the top
level source for better readability and parse time.
Attachment #821308 - Flags: review?(ted)
Comment on attachment 821308 [details] [diff] [review]
Consolidate vorbis build files

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

::: media/libvorbis/Makefile.in
@@ +8,5 @@
> +VISIBILITY_FLAGS =
> +endif
> +
> +ifeq ($(OS_ARCH),AIX)
> +DEFINES += -Dalloca=__alloca

FYI there's not a lot of it in the tree yet, but you can put DEFINES in moz.build nowadays:
mxr.mozilla.org/mozilla-central/source/python/mozbuild/mozbuild/test/frontend/data/defines/moz.build
Attachment #821308 - Flags: review?(ted) → review+
(Assignee)

Updated

5 years ago
Blocks: 930718
(Assignee)

Comment 3

5 years ago
Created attachment 821934 [details] [diff] [review]
Move solaris define to moz.build

Follow up patch to move the define.
Attachment #821934 - Flags: review?(ted)
Comment on attachment 821934 [details] [diff] [review]
Move solaris define to moz.build

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

::: media/libvorbis/moz.build
@@ +35,5 @@
>      'lib/vorbis_window.c',
>  ]
>  
> +if CONFIG['OS_ARCH'] == 'AIX':
> +  DEFINES['alloca'] = '__alloca'

4-space indent in moz.build files.
Attachment #821934 - Flags: review?(ted) → review+
(Assignee)

Comment 5

5 years ago
(In reply to Ted Mielczarek [:ted.mielczarek] from comment #4)

> 4-space indent in moz.build files.

Always? Ok thanks. vim was doing a confusing combination of 2- and 4-space indents when I was editing.
(Assignee)

Comment 6

5 years ago
Created attachment 823781 [details] [diff] [review]
Consolidate vorbis build files v2

Rebase on top of bugs 930674, 929905 and 914270. Carrying forward r=ted
Attachment #821308 - Attachment is obsolete: true
(Assignee)

Comment 7

5 years ago
Created attachment 823782 [details] [diff] [review]
Move AIX define to moz.build v2

Rebase, carrying forward r=ted.
Attachment #821934 - Attachment is obsolete: true
(Assignee)

Comment 8

5 years ago
Created attachment 823891 [details] [diff] [review]
Consolidate vorbis build files v3

Part 1: Consolidate vorbis build files v3

Fix a rebase error. Carrying forward same r=ted.
Attachment #823781 - Attachment is obsolete: true
(Assignee)

Comment 9

5 years ago
Created attachment 823898 [details] [diff] [review]
Move AIX define to moz.build v3

Fix indent.
Attachment #823782 - Attachment is obsolete: true
https://hg.mozilla.org/mozilla-central/rev/2f86ab651d78
https://hg.mozilla.org/mozilla-central/rev/2c6772af1393
Status: NEW → RESOLVED
Last Resolved: 5 years ago
Resolution: --- → FIXED
Target Milestone: --- → mozilla28

Updated

4 years ago
Whiteboard: [qa-]
You need to log in before you can comment on or make changes to this bug.