bug 883350: move SDK_HEADERS to mozbuild (file batch #1) r=mshal
authorJoey Armstrong <joey@mozilla.com>
Mon, 01 Jul 2013 17:24:53 -0400
changeset 149347 2199300dce2744caadd111ce4cdf2066d345e577
parent 149346 024f4fcbdfdb1919de16455bf45be9adaf86ccc2
child 149348 7e01fb914a166d72dc62c5e2ac769056b223dee0
push id2859
push userakeybl@mozilla.com
push dateMon, 16 Sep 2013 19:14:59 +0000
treeherdermozilla-beta@87d3c51cd2bf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs883350
milestone25.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 883350: move SDK_HEADERS to mozbuild (file batch #1) r=mshal
embedding/base/Makefile.in
embedding/base/moz.build
intl/unicharutil/util/Makefile.in
intl/unicharutil/util/moz.build
xpcom/Makefile.in
xpcom/base/Makefile.in
xpcom/base/moz.build
xpcom/build/Makefile.in
xpcom/build/moz.build
xpcom/glue/Makefile.in
xpcom/glue/moz.build
xpcom/glue/standalone/Makefile.in
xpcom/glue/standalone/moz.build
xpcom/io/Makefile.in
xpcom/io/moz.build
xpcom/moz.build
xpcom/string/public/Makefile.in
xpcom/string/public/moz.build
--- a/embedding/base/Makefile.in
+++ b/embedding/base/Makefile.in
@@ -6,13 +6,13 @@
 
 DEPTH           = @DEPTH@
 topsrcdir       = @top_srcdir@
 srcdir          = @srcdir@
 VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SDK_HEADERS         = \
+DISABLED_SDK_HEADERS         = \
                 nsEmbedCID.h \
                 $(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/embedding/base/moz.build
+++ b/embedding/base/moz.build
@@ -8,8 +8,11 @@ XPIDL_SOURCES += [
     'nsIDialogCreator.idl',
     'nsIWindowCreator.idl',
     'nsIWindowCreator2.idl',
     'nsIWindowProvider.idl',
 ]
 
 MODULE = 'embed_base'
 
+EXPORTS += [
+    'nsEmbedCID.h',
+]
--- a/intl/unicharutil/util/Makefile.in
+++ b/intl/unicharutil/util/Makefile.in
@@ -15,17 +15,17 @@ include $(DEPTH)/config/autoconf.mk
 # unicharutil_s which is built in the internal/ subdirectory.
 
 include $(srcdir)/objs.mk
 
 DIST_INSTALL = 1
 SDK_LIBRARY = $(LIBRARY)
 
 
-SDK_HEADERS = \
+DISABLED_SDK_HEADERS = \
 	nsUnicharUtils.h \
 	$(NULL)
 
 FORCE_STATIC_LIB = 1
 USE_STATIC_LIBS = 1
 
 LOCAL_INCLUDES += -I$(srcdir)/../src
 
--- a/intl/unicharutil/util/moz.build
+++ b/intl/unicharutil/util/moz.build
@@ -6,21 +6,21 @@
 
 DIRS += ['internal']
 
 MODULE = 'unicharutil'
 
 EXPORTS += [
     'nsBidiUtils.h',
     'nsSpecialCasingData.h',
+    'nsUnicharUtils.h',
     'nsUnicodeProperties.h',
     'nsUnicodeScriptCodes.h',
 ]
 
 CPP_SOURCES += [
     'nsBidiUtils.cpp',
     'nsSpecialCasingData.cpp',
     'nsUnicharUtils.cpp',
     'nsUnicodeProperties.cpp',
 ]
 
 LIBRARY_NAME = 'unicharutil_external_s'
-
--- a/xpcom/Makefile.in
+++ b/xpcom/Makefile.in
@@ -7,12 +7,12 @@ DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 
 # xpcom-config.h is generated by configure
-SDK_HEADERS	= xpcom-config.h
+DISABLED_SDK_HEADERS	= xpcom-config.h
 
 include $(topsrcdir)/config/rules.mk
 
--- a/xpcom/base/Makefile.in
+++ b/xpcom/base/Makefile.in
@@ -27,30 +27,30 @@ CSRCS = \
 ifeq ($(OS_ARCH),WINNT)
 
 ifdef MOZ_DEBUG
 CSRCS		+= pure_api.c
 endif
 
 endif #if OS_ARCH == WINNT
 
-SDK_HEADERS     = \
+DISABLED_SDK_HEADERS     = \
 		nsAutoPtr.h \
 		nsError.h \
 		ErrorList.h \
 		ErrorListCxxDefines.h \
 		ErrorListCDefines.h \
 		nsISupportsBase.h \
 		nscore.h \
 		nsAtomicRefcnt.h \
 		nsCycleCollector.h \
 		nsObjCExceptions.h \
 
 ifeq ($(OS_ARCH),WINNT)
-SDK_HEADERS += \
+DISABLED_SDK_HEADERS += \
 		nsWindowsHelpers.h \
 		$(NULL)
 endif
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 
--- a/xpcom/base/moz.build
+++ b/xpcom/base/moz.build
@@ -36,34 +36,49 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
         'nsIMacUtils.idl',
     ]
 
 XPIDL_MODULE = 'xpcom_base'
 
 MODULE = 'xpcom'
 
 EXPORTS += [
+    'ErrorList.h',
+    'ErrorListCDefines.h',
+    'ErrorListCxxDefines.h',
     'nsAgg.h',
+    'nsAtomicRefcnt.h',
+    'nsAutoPtr.h',
     'nsAutoRef.h',
     'nsCom.h',
+    'nsCycleCollector.h',
     'nsDebugImpl.h',
+    'nsError.h',
     'nsGZFileWriter.h',
     'nsIAllocator.h',
     'nsIID.h',
     'nsISizeOf.h',
+    'nsISupportsBase.h',
     'nsISupportsObsolete.h',
     'nsInterfaceRequestorAgg.h',
+    'nsObjCExceptions.h',
     'nsStackWalk.h',
     'nsTraceRefcntImpl.h',
     'nsWeakPtr.h',
+    'nscore.h',
 ]
 
 if CONFIG['MOZ_DEBUG']:
     EXPORTS += ['pure.h']
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    EXPORTS += [
+        'nsWindowsHelpers.h',
+    ]
+
 EXPORTS.mozilla += [
     'AvailableMemoryTracker.h',
     'ClearOnShutdown.h',
     'CycleCollectedJSRuntime.h',
     'MapsMemoryReporter.h',
     'StackWalk.h',
     'StaticMutex.h',
     'StaticPtr.h',
--- a/xpcom/build/Makefile.in
+++ b/xpcom/build/Makefile.in
@@ -58,17 +58,17 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../io \
 		-I$(srcdir)/../components \
 		-I$(srcdir)/../threads \
 		-I$(srcdir)/../reflect/xptinfo/src \
 		-I$(topsrcdir)/chrome/src \
 		-I$(srcdir)/../../docshell/base \
 		$(NULL)
 
-SDK_HEADERS =  \
+DISABLED_SDK_HEADERS =  \
   nsXPCOM.h       \
   nsXPCOMCID.h    \
   $(NULL)
 
 GARBAGE         += $(XPCOM_GLUE_SRC_LCPPSRCS) $(XPCOM_GLUENS_SRC_LCPPSRCS)
 
 include $(topsrcdir)/config/config.mk
 include $(topsrcdir)/ipc/chromium/chromium-config.mk
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -2,16 +2,18 @@
 # 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/.
 
 MODULE = 'xpcom'
 
 EXPORTS += [
+    'nsXPCOM.h',
+    'nsXPCOMCID.h',
     'nsXPCOMCIDInternal.h',
     'nsXREAppData.h',
     'nsXULAppAPI.h',
     'xrecore.h',
 ]
 
 EXPORTS.mozilla += [
     'FileLocation.h',
@@ -44,9 +46,8 @@ CPP_SOURCES += [
     '$(XPCOM_GLUE_SRC_LCPPSRCS)',
     'FileLocation.cpp',
     'FrozenFunctions.cpp',
     'Omnijar.cpp',
     'Services.cpp',
     'nsXPCOMStrings.cpp',
     'nsXPComInit.cpp',
 ]
-
--- a/xpcom/glue/Makefile.in
+++ b/xpcom/glue/Makefile.in
@@ -14,17 +14,17 @@ include $(srcdir)/objs.mk
 EXTRA_DEPS += $(srcdir)/objs.mk
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 		-I$(srcdir)/../build \
 		$(NULL)
 
-SDK_HEADERS = \
+DISABLED_SDK_HEADERS = \
 		nsArrayEnumerator.h \
 		nsArrayUtils.h \
 		nsBaseHashtable.h \
 		nsCOMArray.h \
 		nsCOMPtr.h \
 		nsCRTGlue.h \
 		nsCategoryCache.h \
 		nsClassHashtable.h \
--- a/xpcom/glue/moz.build
+++ b/xpcom/glue/moz.build
@@ -9,24 +9,66 @@ DIRS += ['standalone', 'nomozalloc']
 # On win we build two glue libs - glue linked to crt dlls here and in staticruntime we build
 # a statically linked glue lib.
 if CONFIG['OS_ARCH'] == 'WINNT':
     DIRS += ['staticruntime']
 
 MODULE = 'xpcom'
 
 EXPORTS += [
+    'nsArrayEnumerator.h',
+    'nsArrayUtils.h',
+    'nsBaseHashtable.h',
+    'nsCOMArray.h',
+    'nsCOMPtr.h',
+    'nsCRTGlue.h',
+    'nsCategoryCache.h',
+    'nsClassHashtable.h',
+    'nsComponentManagerUtils.h',
     'nsCycleCollectionNoteChild.h',
     'nsCycleCollectionNoteRootCallback.h',
+    'nsCycleCollectionParticipant.h',
     'nsCycleCollectionTraversalCallback.h',
     'nsCycleCollectorUtils.h',
+    'nsDataHashtable.h',
+    'nsDebug.h',
+    'nsDeque.h',
+    'nsEnumeratorUtils.h',
+    'nsHashKeys.h',
+    'nsIClassInfoImpl.h',
+    'nsID.h',
+    'nsIInterfaceRequestorUtils.h',
+    'nsINIParser.h',
+    'nsISupportsImpl.h',
+    'nsISupportsUtils.h',
+    'nsIWeakReferenceUtils.h',
+    'nsInterfaceHashtable.h',
+    'nsJSThingHashtable.h',
+    'nsMemory.h',
     'nsProxyRelease.h',
+    'nsQuickSort.h',
+    'nsRefPtrHashtable.h',
+    'nsServiceManagerUtils.h',
+    'nsStringAPI.h',
+    'nsStringGlue.h',
+    'nsTArray-inl.h',
+    'nsTArray.h',
+    'nsTArrayForwardDeclare.h',
+    'nsTHashtable.h',
+    'nsTObserverArray.h',
     'nsTPriorityQueue.h',
+    'nsTWeakRef.h',
+    'nsTextFormatter.h',
     'nsThreadUtils.h',
+    'nsTraceRefcnt.h',
+    'nsVersionComparator.h',
+    'nsVoidArray.h',
+    'nsWeakReference.h',
     'nsXPTCUtils.h',
+    'pldhash.h',
 ]
 
 EXPORTS.mozilla += [
     'AppData.h',
     'AutoRestore.h',
     'BlockingResourceBase.h',
     'CondVar.h',
     'DeadlockDetector.h',
@@ -49,9 +91,8 @@ EXPORTS.mozilla.threads += [
 CPP_SOURCES += [
     '$(XPCOM_GLUENS_SRC_LCPPSRCS)',
     '$(XPCOM_GLUE_SRC_LCPPSRCS)',
     'GenericModule.cpp',
     'nsStringAPI.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue_s'
-
--- a/xpcom/glue/standalone/Makefile.in
+++ b/xpcom/glue/standalone/Makefile.in
@@ -14,17 +14,17 @@ include $(srcdir)/../objs.mk
 EXTRA_DEPS += $(srcdir)/../objs.mk
 
 DIST_INSTALL	= 1
 
 LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../build \
 	$(NULL)
 
-SDK_HEADERS     = \
+DISABLED_SDK_HEADERS     = \
 	nsXPCOMGlue.h \
 	$(NULL)
 
 SDK_LIBRARY     	= \
 	$(LIB_PREFIX)xpcomglue.$(LIB_SUFFIX) \
 	$(NULL)
 
 FORCE_STATIC_LIB = 1
--- a/xpcom/glue/standalone/moz.build
+++ b/xpcom/glue/standalone/moz.build
@@ -14,8 +14,11 @@ MODULE = 'xpcom'
 CPP_SOURCES += [
     '$(XPCOM_GLUE_SRC_LCPPSRCS)',
     'nsStringAPI.cpp',
     'nsXPCOMGlue.cpp',
 ]
 
 LIBRARY_NAME = 'xpcomglue'
 
+EXPORTS += [
+    'nsXPCOMGlue.h',
+]
--- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in
@@ -23,17 +23,17 @@ endif
 endif
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 DISABLED_CMMSRCS		+= \
 		CocoaFileUtils.mm \
 		$(NULL)
 endif
 
-SDK_HEADERS =  \
+DISABLED_SDK_HEADERS =  \
 		nsDirectoryServiceDefs.h \
 		nsDirectoryServiceUtils.h \
 		$(NULL)
 
 # we don't want the shared lib, but we want to force the creation of a static lib.
 FORCE_STATIC_LIB = 1
 
 
--- a/xpcom/io/moz.build
+++ b/xpcom/io/moz.build
@@ -68,16 +68,18 @@ XPIDL_MODULE = 'xpcom_io'
 MODULE = 'xpcom'
 
 EXPORTS += [
     'SpecialSystemDirectory.h',
     'nsAnonymousTemporaryFile.h',
     'nsAppDirectoryServiceDefs.h',
     'nsDirectoryService.h',
     'nsDirectoryServiceAtomList.h',
+    'nsDirectoryServiceDefs.h',
+    'nsDirectoryServiceUtils.h',
     'nsEscape.h',
     'nsLinebreakConverter.h',
     'nsLocalFile.h',
     'nsMultiplexInputStream.h',
     'nsNativeCharsetUtils.h',
     'nsScriptableInputStream.h',
     'nsStorageStream.h',
     'nsStreamUtils.h',
--- a/xpcom/moz.build
+++ b/xpcom/moz.build
@@ -35,8 +35,12 @@ TEST_TOOL_DIRS += [
 #    'reflect/xptcall/tests,
 #]
 
 if CONFIG['DEHYDRA_PATH']:
     DIRS += ['analysis']
 
 MODULE = 'xpcom'
 
+# xpcom-config.h is generated by configure
+EXPORTS += [
+    'xpcom-config.h',
+]
--- a/xpcom/string/public/Makefile.in
+++ b/xpcom/string/public/Makefile.in
@@ -6,14 +6,14 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SDK_HEADERS	=				\
+DISABLED_SDK_HEADERS	=				\
 		nsXPCOMStrings.h		\
 		nsEmbedString.h			\
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/xpcom/string/public/moz.build
+++ b/xpcom/string/public/moz.build
@@ -7,16 +7,17 @@
 MODULE = 'string'
 
 EXPORTS += [
     'nsAString.h',
     'nsAlgorithm.h',
     'nsCharTraits.h',
     'nsDependentString.h',
     'nsDependentSubstring.h',
+    'nsEmbedString.h',
     'nsLiteralString.h',
     'nsPrintfCString.h',
     'nsPromiseFlatString.h',
     'nsReadableUtils.h',
     'nsString.h',
     'nsStringBuffer.h',
     'nsStringFwd.h',
     'nsStringIterator.h',
@@ -24,14 +25,14 @@ EXPORTS += [
     'nsSubstringTuple.h',
     'nsTDependentString.h',
     'nsTDependentSubstring.h',
     'nsTPromiseFlatString.h',
     'nsTString.h',
     'nsTSubstring.h',
     'nsTSubstringTuple.h',
     'nsUTF8Utils.h',
+    'nsXPCOMStrings.h',
     'nsXPIDLString.h',
     'string-template-def-char.h',
     'string-template-def-unichar.h',
     'string-template-undef.h',
 ]
-