Bug 930242 - Consolidate ogg moz.build files. r=ted
authorRalph Giles <giles@mozilla.com>
Wed, 23 Oct 2013 15:09:00 -0700
changeset 152611 773544d9c681f4e7b89d4b79ad5e975f1c5f4823
parent 152610 e53f9277d6ef924597b70d37d8757dc986f34962
child 152612 2f86ab651d78ad424d7970268099c9174dd6f4d4
push id35593
push userrgiles@mozilla.com
push dateTue, 29 Oct 2013 10:07:09 +0000
treeherdermozilla-inbound@cdd6ecfa8487 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs930242
milestone28.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 930242 - Consolidate ogg moz.build files. r=ted Replace recursive build files with a single pair in the top level source for better readability and parse time.
layout/media/Makefile.in
media/libogg/README_MOZILLA
media/libogg/include/moz.build
media/libogg/include/ogg/moz.build
media/libogg/moz.build
media/libogg/src/Makefile.in
--- a/layout/media/Makefile.in
+++ b/layout/media/Makefile.in
@@ -21,24 +21,24 @@ endif
 
 ifdef MOZ_TREE_PIXMAN
 SHARED_LIBRARY_LIBS += $(MOZ_PIXMAN_LIBS)
 endif
 
 ifdef MOZ_VORBIS
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libvorbis/lib/$(LIB_PREFIX)vorbis.$(LIB_SUFFIX) \
-	$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
 ifdef MOZ_TREMOR
 SHARED_LIBRARY_LIBS	+= \
 	$(DEPTH)/media/libtremor/lib/$(LIB_PREFIX)tremor.$(LIB_SUFFIX) \
-	$(DEPTH)/media/libogg/src/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
+	$(DEPTH)/media/libogg/$(LIB_PREFIX)ogg.$(LIB_SUFFIX) \
 	$(NULL)
 endif
 
 ifdef MOZ_OGG
 SHARED_LIBRARY_LIBS 	+= \
 	$(DEPTH)/media/libtheora/lib/$(LIB_PREFIX)theora.$(LIB_SUFFIX) \
 	$(NULL)
 endif
--- a/media/libogg/README_MOZILLA
+++ b/media/libogg/README_MOZILLA
@@ -1,10 +1,10 @@
 The source from this directory was copied from the libogg subversion
 repository using the update.sh script. The only changes made were
-those applied by update.sh and the addition/upate of Makefile.in files
-for the Mozilla build system.
+those applied by update.sh and the addition/update of moz.build and
+Makefile.in files for the Mozilla build system.
 
 The svn revision number used was r17287.
 
 The int-types.patch address a bug that config_types.h generated from
 Linux platform can't be used on OpenSolaris directly see Mozilla bug
 449754
deleted file mode 100644
--- a/media/libogg/include/moz.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# -*- 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/.
-
-DIRS += ['ogg']
-
-MODULE = 'ogg'
-
deleted file mode 100644
--- a/media/libogg/include/ogg/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- 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/.
-
-EXPORTS.ogg += [
-    'config_types.h',
-    'ogg.h',
-    'os_types.h',
-]
-
--- a/media/libogg/moz.build
+++ b/media/libogg/moz.build
@@ -1,10 +1,27 @@
 # -*- 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/.
 
-DIRS += ['include', 'src']
-
 MODULE = 'ogg'
 
+EXPORTS.ogg += [
+    'include/ogg/config_types.h',
+    'include/ogg/ogg.h',
+    'include/ogg/os_types.h',
+]
+
+LIBRARY_NAME = 'ogg'
+
+SOURCES += [
+    'src/ogg_bitwise.c',
+    'src/ogg_framing.c',
+]
+
+MSVC_ENABLE_PGO = True
+
+FORCE_STATIC_LIB = True
+
+if CONFIG['OS_TARGET'] == 'WINNT':
+    NO_VISIBILITY_FLAGS = True
deleted file mode 100644
--- a/media/libogg/src/Makefile.in
+++ /dev/null
@@ -1,4 +0,0 @@
-# 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/.
-