Bug 1055867 - Move RCFLAGS and RCINCLUDE to moz.build and hardcode manifest name r=jcranmer for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Wed, 03 Sep 2014 22:25:40 +0100
changeset 20915 2a2d2bf985dd99e04956f923a941876b85c9f7df
parent 20914 5540d3b4eb234376fcd74a6a9022f57bba8dc36d
child 20916 77c907e1b6bac0df293ad03cd8d96ed52c048957
push idunknown
push userunknown
push dateunknown
reviewersjcranmer
bugs1055867
Bug 1055867 - Move RCFLAGS and RCINCLUDE to moz.build and hardcode manifest name r=jcranmer for a CLOSED TREE
im/app/Makefile.in
im/app/moz.build
mail/app/Makefile.in
mail/app/moz.build
mail/components/search/wsenable/Makefile.in
mail/components/search/wsenable/moz.build
suite/app/Makefile.in
suite/app/moz.build
--- a/im/app/Makefile.in
+++ b/im/app/Makefile.in
@@ -79,25 +79,21 @@ away-16.ico: $(topsrcdir)/chat/themes/aw
 	$(call png2ico,$(topsrcdir)/chat/themes/away-16.png,0,0,16,away-16.ico)
 
 offline-16.ico: $(topsrcdir)/chat/themes/offline-16.png $(srcdir)/png2ico.py
 	$(call png2ico,$(topsrcdir)/chat/themes/offline-16.png,0,0,16,offline-16.ico)
 
 embedded-icons:: available-16.ico away-16.ico offline-16.ico
 GARBAGE += available-16.ico away-16.ico offline-16.ico
 
-RCINCLUDE = splash.rc
 # Rebuild instantbird.exe if the manifest changes - it's included by splash.rc.
 # (this dependency should really be just for instantbird.exe, not other targets)
-EXTRA_DEPS += $(PROGRAM).manifest
-ifndef GNU_CC
-RCFLAGS += -DMOZ_INSTANTBIRD -I$(srcdir)
-else
-RCFLAGS += -DMOZ_INSTANTBIRD --include-dir $(srcdir)
-endif
+# Note the manifest file exists in the tree, so we use the explicit filename
+# here.
+EXTRA_DEPS += instantbird.exe.manifest
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 
 $(RESFILE): embedded-icons
 
--- a/im/app/moz.build
+++ b/im/app/moz.build
@@ -13,16 +13,20 @@ if not CONFIG['LIBXUL_SDK']:
         '/mozilla/xpcom/base',
         '/mozilla/xpcom/build',
     ]
 
     USE_LIBS += [
         'xpcomglue',
     ]
 
+    if CONFIG['OS_ARCH'] == 'WINNT':
+        RCINCLUDE = 'splash.rc'
+        DEFINES['MOZ_INSTANTBIRD'] = True
+
     if CONFIG['_MSC_VER']:
         # Always enter a Windows program through wmain, whether or not we're
         # a console application.
         WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
     # Control the default heap size.
     # This is the heap returned by GetProcessHeap().
     # As we use the CRT heap, the default size is too large and wastes VM.
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -76,25 +76,21 @@ write-message.ico: $(mailtoolbar) $(srcd
 	$(call png2ico,$(mailtoolbar),19,1,16,write-message.ico)
 
 address-book.ico: $(mailtoolbar) $(srcdir)/png2ico.py
 	$(call png2ico,$(mailtoolbar),37,1,16,address-book.ico)
 
 embedded-icons:: write-message.ico address-book.ico
 GARBAGE += write-message.ico address-book.ico
 
-RCINCLUDE = splash.rc
 # Rebuild thunderbird.exe if the manifest changes - it's included by splash.rc.
 # (this dependency should really be just for thunderbird.exe, not other targets)
-EXTRA_DEPS += $(PROGRAM).manifest
-ifndef GNU_CC
-RCFLAGS += -DMOZ_THUNDERBIRD -I$(srcdir)
-else
-RCFLAGS += -DMOZ_THUNDERBIRD --include-dir $(srcdir)
-endif
+# Note the manifest file exists in the tree, so we use the explicit filename
+# here.
+EXTRA_DEPS += thunderbird.exe.manifest
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
 
 $(RESFILE): embedded-icons
 
--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -18,16 +18,20 @@ if not CONFIG['LIBXUL_SDK']:
         '/mozilla/xpcom/build',
     ]
 
     DELAYLOAD_DLLS += [
         'mozglue.dll',
     ]
     USE_STATIC_LIBS = True    
 
+    if CONFIG['OS_ARCH'] == 'WINNT':
+        RCINCLUDE = 'splash.rc'
+        DEFINES['MOZ_THUNDERBIRD'] = True
+
     if CONFIG['_MSC_VER']:
         # Always enter a Windows program through wmain, whether or not we're
         # a console application.
         WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
     # Control the default heap size.
     # This is the heap returned by GetProcessHeap().
     # As we use the CRT heap, the default size is too large and wastes VM.
deleted file mode 100644
--- a/mail/components/search/wsenable/Makefile.in
+++ /dev/null
@@ -1,14 +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/.
-
-DEPTH     = @DEPTH@
-topsrcdir = @top_srcdir@
-srcdir    = @srcdir@
-VPATH     = @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-RCINCLUDE = WSEnable.rc
-
-include $(topsrcdir)/config/rules.mk
--- a/mail/components/search/wsenable/moz.build
+++ b/mail/components/search/wsenable/moz.build
@@ -9,10 +9,12 @@ SOURCES += [
     'WSEnable.cpp',
 ]
 
 OS_LIBS += [
     'ole32',
     'shell32',
 ]
 
+RCINCLUDE = 'WSEnable.rc'
+
 # This isn't XPCOM code, but it wants to use STL so disable STL wrappers
 DISABLE_STL_WRAPPING = True
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -35,28 +35,21 @@ endif
 
 # This switches $(INSTALL) to copy mode, like $(SYSINSTALL), so things that
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy
 
 include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_ARCH),WINNT)
-RCINCLUDE = splash.rc
 # Rebuild seamonkey.exe if the manifest changes - it's included by splash.rc.
 # (this dependency should really be just for seamonkey.exe, not other targets)
-EXTRA_DEPS += $(PROGRAM).manifest
-ifndef GNU_CC
-RCFLAGS += -DMOZ_SUITE -I$(srcdir)
-else
-RCFLAGS += -DMOZ_SUITE --include-dir $(srcdir)
-endif
-ifdef DEBUG
-RCFLAGS += -DDEBUG
-endif
+# Note the manifest file exists in the tree, so we use the explicit filename
+# here.
+EXTRA_DEPS += seamonkey.exe.manifest
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 libs::
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $(topsrcdir)/suite/installer/license.txt > $(DIST)/bin/license.txt
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -12,16 +12,20 @@ if not CONFIG['LIBXUL_SDK']:
         '/mozilla/xpcom/build',
     ]
     GENERATED_INCLUDES += ['/build']
 
     USE_LIBS += [
         'xpcomglue',
     ]
 
+    if CONFIG['OS_ARCH'] == 'WINNT':
+        RCINCLUDE = 'splash.rc'
+        DEFINES['MOZ_SUITE'] = True
+
     if CONFIG['_MSC_VER']:
         # Always enter a Windows program through wmain, whether or not we're
         # a console application.
         WIN32_EXE_LDFLAGS += ['-ENTRY:wmainCRTStartup']
 
     # Control the default heap size.
     # This is the heap returned by GetProcessHeap().
     # As we use the CRT heap, the default size is too large and wastes VM.