bug 883350: move SDK_HEADERS to mozbuild (file batch #1) r=mshal

UltraBlame original commit: 2199300dce2744caadd111ce4cdf2066d345e577
marco-c · Sep 29, 2019 · ba52284 · ba52284
1 parent 27c0c82
commit ba52284
Show file tree

Hide file tree

Showing 18 changed files with 84 additions and 14 deletions.
diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in
@@ -11,7 +11,7 @@ VPATH           = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SDK_HEADERS         = \
+DISABLED_SDK_HEADERS         = \
                 nsEmbedCID.h \
                 $(NULL)
 

diff --git a/embedding/base/moz.build b/embedding/base/moz.build
@@ -13,3 +13,6 @@ XPIDL_SOURCES += [
 
 MODULE = 'embed_base'
 
+EXPORTS += [
+    'nsEmbedCID.h',
+]
diff --git a/intl/unicharutil/util/Makefile.in b/intl/unicharutil/util/Makefile.in
@@ -20,7 +20,7 @@ DIST_INSTALL = 1
 SDK_LIBRARY = $(LIBRARY)
 
 
-SDK_HEADERS = \
+DISABLED_SDK_HEADERS = \
 	nsUnicharUtils.h \
 	$(NULL)
 

diff --git a/intl/unicharutil/util/moz.build b/intl/unicharutil/util/moz.build
@@ -11,6 +11,7 @@ MODULE = 'unicharutil'
 EXPORTS += [
     'nsBidiUtils.h',
     'nsSpecialCasingData.h',
+    'nsUnicharUtils.h',
     'nsUnicodeProperties.h',
     'nsUnicodeScriptCodes.h',
 ]
@@ -23,4 +24,3 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'unicharutil_external_s'
-
diff --git a/xpcom/Makefile.in b/xpcom/Makefile.in
@@ -12,7 +12,7 @@ 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
 
diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in
@@ -32,7 +32,7 @@ endif
 
 endif #if OS_ARCH == WINNT
 
-SDK_HEADERS     = \
+DISABLED_SDK_HEADERS     = \
 		nsAutoPtr.h \
 		nsError.h \
 		ErrorList.h \
@@ -45,7 +45,7 @@ SDK_HEADERS     = \
 		nsObjCExceptions.h \
 
 ifeq ($(OS_ARCH),WINNT)
-SDK_HEADERS += \
+DISABLED_SDK_HEADERS += \
 		nsWindowsHelpers.h \
 		$(NULL)
 endif

diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build
@@ -41,24 +41,39 @@ 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',

diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in
@@ -63,7 +63,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../../docshell/base \
 		$(NULL)
 
-SDK_HEADERS =  \
+DISABLED_SDK_HEADERS =  \
   nsXPCOM.h       \
   nsXPCOMCID.h    \
   $(NULL)

diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
@@ -7,6 +7,8 @@
 MODULE = 'xpcom'
 
 EXPORTS += [
+    'nsXPCOM.h',
+    'nsXPCOMCID.h',
     'nsXPCOMCIDInternal.h',
     'nsXREAppData.h',
     'nsXULAppAPI.h',
@@ -49,4 +51,3 @@ CPP_SOURCES += [
     'nsXPCOMStrings.cpp',
     'nsXPComInit.cpp',
 ]
-
diff --git a/xpcom/glue/Makefile.in b/xpcom/glue/Makefile.in
@@ -19,7 +19,7 @@ LOCAL_INCLUDES	= \
 		-I$(srcdir)/../build \
 		$(NULL)
 
-SDK_HEADERS = \
+DISABLED_SDK_HEADERS = \
 		nsArrayEnumerator.h \
 		nsArrayUtils.h \
 		nsBaseHashtable.h \

diff --git a/xpcom/glue/moz.build b/xpcom/glue/moz.build
@@ -14,14 +14,56 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 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 += [
@@ -54,4 +96,3 @@ CPP_SOURCES += [
 ]
 
 LIBRARY_NAME = 'xpcomglue_s'
-
diff --git a/xpcom/glue/standalone/Makefile.in b/xpcom/glue/standalone/Makefile.in
@@ -19,7 +19,7 @@ LOCAL_INCLUDES	= \
 	-I$(srcdir)/../../build \
 	$(NULL)
 
-SDK_HEADERS     = \
+DISABLED_SDK_HEADERS     = \
 	nsXPCOMGlue.h \
 	$(NULL)
 

diff --git a/xpcom/glue/standalone/moz.build b/xpcom/glue/standalone/moz.build
@@ -19,3 +19,6 @@ CPP_SOURCES += [
 
 LIBRARY_NAME = 'xpcomglue'
 
+EXPORTS += [
+    'nsXPCOMGlue.h',
+]
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
@@ -28,7 +28,7 @@ DISABLED_CMMSRCS		+= \
 		$(NULL)
 endif
 
-SDK_HEADERS =  \
+DISABLED_SDK_HEADERS =  \
 		nsDirectoryServiceDefs.h \
 		nsDirectoryServiceUtils.h \
 		$(NULL)

diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build
@@ -73,6 +73,8 @@ EXPORTS += [
     'nsAppDirectoryServiceDefs.h',
     'nsDirectoryService.h',
     'nsDirectoryServiceAtomList.h',
+    'nsDirectoryServiceDefs.h',
+    'nsDirectoryServiceUtils.h',
     'nsEscape.h',
     'nsLinebreakConverter.h',
     'nsLocalFile.h',

diff --git a/xpcom/moz.build b/xpcom/moz.build
@@ -40,3 +40,7 @@ if CONFIG['DEHYDRA_PATH']:
 
 MODULE = 'xpcom'
 
+# xpcom-config.h is generated by configure
+EXPORTS += [
+    'xpcom-config.h',
+]
diff --git a/xpcom/string/public/Makefile.in b/xpcom/string/public/Makefile.in
@@ -11,7 +11,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SDK_HEADERS	=				\
+DISABLED_SDK_HEADERS	=				\
 		nsXPCOMStrings.h		\
 		nsEmbedString.h			\
 		$(NULL)

diff --git a/xpcom/string/public/moz.build b/xpcom/string/public/moz.build
@@ -12,6 +12,7 @@ EXPORTS += [
     'nsCharTraits.h',
     'nsDependentString.h',
     'nsDependentSubstring.h',
+    'nsEmbedString.h',
     'nsLiteralString.h',
     'nsPrintfCString.h',
     'nsPromiseFlatString.h',
@@ -29,9 +30,9 @@ EXPORTS += [
     'nsTSubstring.h',
     'nsTSubstringTuple.h',
     'nsUTF8Utils.h',
+    'nsXPCOMStrings.h',
     'nsXPIDLString.h',
     'string-template-def-char.h',
     'string-template-def-unichar.h',
     'string-template-undef.h',
 ]
-