930228 - Consolidate vorbis moz.build files

Status: RESOLVED FIXED

(Core :: Audio/Video, defect)

Description

[Ralph Giles (:rillian)]

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.

Comment 1

[Ralph Giles (:rillian)]

Attachment: Consolidate vorbis build files

Replace recursive build files with a single pair in the top
level source for better readability and parse time.

Comment 2

[(not currently active) Ted Mielczarek]

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

Comment 3

[Ralph Giles (:rillian)]

Attachment: Move solaris define to moz.build

Follow up patch to move the define.

Comment 4

[(not currently active) Ted Mielczarek]

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.

Comment 5

[Ralph Giles (:rillian)]

(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.

Comment 6

[Ralph Giles (:rillian)]

Attachment: Consolidate vorbis build files v2

Rebase on top of bugs 930674, 929905 and 914270. Carrying forward r=ted

Comment 7

[Ralph Giles (:rillian)]

Attachment: Move AIX define to moz.build v2

Rebase, carrying forward r=ted.

Comment 8

[Ralph Giles (:rillian)]

Attachment: Consolidate vorbis build files v3

Part 1: Consolidate vorbis build files v3

Fix a rebase error. Carrying forward same r=ted.

Comment 9

[Ralph Giles (:rillian)]

Attachment: Move AIX define to moz.build v3

Fix indent.

Comment 10

[Ralph Giles (:rillian)]

https://hg.mozilla.org/integration/mozilla-inbound/rev/2f86ab651d78
https://hg.mozilla.org/integration/mozilla-inbound/rev/2c6772af1393

Comment 11

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://hg.mozilla.org/mozilla-central/rev/2f86ab651d78
https://hg.mozilla.org/mozilla-central/rev/2c6772af1393