Bug 976886 - Port RCINCLUDE to moz.build; r=mshal

--HG-- extra : rebase_source : e8a75bc01c3f57516a1a1307de3d170ea07ca1ac
2024-09-13 09:24:08 -07:00 · 2014-03-04 17:19:24 -05:00 · 2014-03-04 17:19:24 -05:00 · 394d5f9fd5
commit 394d5f9fd5
parent 6af883c75a
26 changed files with 32 additions and 22 deletions
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -55,7 +55,6 @@ NSDISTMODE = copy
 include $(topsrcdir)/config/config.mk

 ifeq ($(OS_ARCH),WINNT)
-RCINCLUDE = splash.rc
 # Rebuild firefox.exe if the manifest changes - it's included by splash.rc.
 # (this dependency should really be just for firefox.exe, not other targets)
 # Note the manifest file exists in the tree, so we use the explicit filename
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@ -39,6 +39,7 @@ if CONFIG['_MSC_VER']:
    WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']

 if CONFIG['OS_ARCH'] == 'WINNT':
+    RCINCLUDE = 'splash.rc'
    DEFINES['MOZ_PHOENIX'] = True

 # Control the default heap size.
--- a/browser/metro/shell/commandexecutehandler/Makefile.in
+++ b/browser/metro/shell/commandexecutehandler/Makefile.in
@ -5,7 +5,6 @@
 include $(topsrcdir)/config/config.mk

 DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
-RCINCLUDE = CommandExecuteHandler.rc

 # Don't link against mozglue.dll
 MOZ_GLUE_LDFLAGS =
--- a/browser/metro/shell/commandexecutehandler/moz.build
+++ b/browser/metro/shell/commandexecutehandler/moz.build
@ -18,3 +18,5 @@ for var in ('UNICODE', '_UNICODE', 'NS_NO_XPCOM'):
    DEFINES[var] = True

 NO_PGO = True
+
+RCINCLUDE = 'CommandExecuteHandler.rc'
--- a/dom/plugins/ipc/hangui/Makefile.in
+++ b/dom/plugins/ipc/hangui/Makefile.in
@ -4,8 +4,6 @@

 OS_LIBS = $(call EXPAND_LIBNAME,comctl32)

-RCINCLUDE = HangUIDlg.rc
-
 STL_FLAGS = \
  -D_HAS_EXCEPTIONS=0 \
  $(NULL)
--- a/dom/plugins/ipc/hangui/moz.build
+++ b/dom/plugins/ipc/hangui/moz.build
@ -18,3 +18,5 @@ DEFINES['NS_NO_XPCOM'] = True

 if CONFIG['GNU_CC']:
    WIN32_EXE_LDFLAGS += ['-municode']
+
+RCINCLUDE = 'HangUIDlg.rc'
--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@ -241,6 +241,7 @@ class TreeMetadataEmitter(LoggingMixin):
            'OS_LIBS',
            'RCFILE',
            'RESFILE',
+            'RCINCLUDE',
            'DEFFILE',
            'SDK_LIBRARY',
            'WIN32_EXE_LDFLAGS',
--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@ -349,6 +349,12 @@ VARIABLES = {
        This variable can only be used on Windows.
        """, None),

+    'RCINCLUDE': (unicode, unicode,
+        """The resource script file to be included in the default .res file.
+
+        This variable can only be used on Windows.
+        """, None),
+
    'DEFFILE': (unicode, unicode,
        """The program .def (module definition) file.

--- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build
@ -38,6 +38,7 @@ DELAYLOAD_DLLS = ['foo.dll', 'bar.dll']

 RCFILE = 'foo.rc'
 RESFILE = 'bar.res'
+RCINCLUDE = 'bar.rc'
 DEFFILE = 'baz.def'

 USE_STATIC_LIBS = True
--- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
+++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py
@ -334,6 +334,9 @@ class TestRecursiveMakeBackend(BackendTester):
            'RESFILE': [
                'RESFILE := bar.res',
            ],
+            'RCINCLUDE': [
+                'RCINCLUDE := bar.rc',
+            ],
            'DEFFILE': [
                'DEFFILE := baz.def',
            ],
--- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build
@ -44,6 +44,7 @@ DELAYLOAD_DLLS = ['foo.dll', 'bar.dll']

 RCFILE = 'foo.rc'
 RESFILE = 'bar.res'
+RCINCLUDE = 'bar.rc'
 DEFFILE = 'baz.def'

 USE_STATIC_LIBS = True
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@ -174,6 +174,7 @@ class TestEmitterBasic(unittest.TestCase):
            USE_DELAYIMP=True,
            RCFILE='foo.rc',
            RESFILE='bar.res',
+            RCINCLUDE='bar.rc',
            DEFFILE='baz.def',
            USE_STATIC_LIBS=True,
            MOZBUILD_CFLAGS=['-fno-exceptions', '-w'],
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@ -16,8 +16,6 @@ else
 LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../../mozapps/update/common)
 endif

-RCINCLUDE = maintenanceservice.rc
-
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)

 ifndef MOZ_WINCONSOLE
--- a/toolkit/components/maintenanceservice/moz.build
+++ b/toolkit/components/maintenanceservice/moz.build
@ -32,3 +32,5 @@ USE_STATIC_LIBS = True

 if CONFIG['_MSC_VER']:
    WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
+
+RCINCLUDE = 'maintenanceservice.rc'
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@ -19,7 +19,6 @@ ifeq ($(OS_ARCH),WINNT)
 LIBS += \
  $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX)
  $(NULL)
-RCINCLUDE = crashreporter.rc
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 shell32 wininet shlwapi)
 MOZ_WINCONSOLE = 0
 endif
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@ -43,3 +43,4 @@ if CONFIG['MOZ_ENABLE_GTK']:
        'crashreporter_unix_common.cpp'
    ]

+RCINCLUDE = 'crashreporter.rc'
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@ -24,10 +24,6 @@ SHARED_LIBRARY_LIBS += \
  $(foreach component,$(COMPONENT_LIBS),$(DEPTH)/staticlib/$(LIB_PREFIX)$(component).$(LIB_SUFFIX)) \
  $(NULL)

-ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_)
-RCINCLUDE = xulrunner.rc
-endif
-
 # dependent libraries
 ifdef MOZ_B2G_BT_BLUEZ #{
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
--- a/toolkit/library/moz.build
+++ b/toolkit/library/moz.build
@ -16,9 +16,10 @@ if CONFIG['OS_ARCH'] == 'WINNT':
    ]
    if not CONFIG['GNU_CC']:
        LOCAL_INCLUDES += [
-	    '/widget/windows',
-	    '/xpcom/base',
-	]
+            '/widget/windows',
+            '/xpcom/base',
+        ]
+        RCINCLUDE = 'xulrunner.rc'

 # component libraries
 additional_defines = (
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@ -20,7 +20,6 @@ LIBS += \

 ifeq ($(OS_ARCH),WINNT)
 LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify)
-RCINCLUDE = updater.rc
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi)
 endif

--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@ -20,6 +20,7 @@ if CONFIG['OS_ARCH'] == 'WINNT':
        'progressui_win.cpp',
        'win_dirent.cpp',
    ]
+    RCINCLUDE = 'updater.rc'
    DEFINES['UNICODE'] = True
    DEFINES['_UNICODE'] = True
    USE_STATIC_LIBS = True
--- a/webapprt/win/Makefile.in
+++ b/webapprt/win/Makefile.in
@ -30,8 +30,6 @@ DEFINES += -DAPP_VERSION=$(APP_VERSION)

 OS_LIBS += $(call EXPAND_LIBNAME,shell32)

-RCINCLUDE = webapprt.rc
-
 # Uninstaller
 ifdef LOCALE_MERGEDIR
 PPL_LOCALE_ARGS = \
--- a/webapprt/win/moz.build
+++ b/webapprt/win/moz.build
@ -39,3 +39,5 @@ if CONFIG['_MSC_VER']:
 # Set it to 256k.  See bug 127069.
 if not CONFIG['GNU_CC']:
    LDFLAGS += ['/HEAP:0x40000']
+
+RCINCLUDE = 'webapprt.rc'
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@ -34,7 +34,6 @@ include $(topsrcdir)/config/config.mk

 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 comdlg32 uuid shell32 ole32 oleaut32 version winspool)
-RCINCLUDE = splash.rc
 endif

 include $(topsrcdir)/config/rules.mk
--- a/xulrunner/app/moz.build
+++ b/xulrunner/app/moz.build
@ -42,3 +42,6 @@ if CONFIG['_MSC_VER']:
 # Set it to 256k.  See bug 127069.
 if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
    LDFLAGS += ['/HEAP:0x40000']
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    RCINCLUDE = 'splash.rc'
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@ -18,10 +18,6 @@ LIBS            += \
 		$(NULL)
 endif

-ifeq ($(OS_ARCH),WINNT)
-RCINCLUDE = xulrunner-stub.rc
-endif
-
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
--- a/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
@ -36,3 +36,4 @@ if CONFIG['_MSC_VER']:

 if CONFIG['OS_ARCH'] == 'WINNT':
    DEFINES['MOZ_XULRUNNER'] = True
+    RCINCLUDE = 'xulrunner-stub.rc'