Bug 1052943 - Move additions to C*FLAGS into moz.build and do not link against the static RTL r=jcranmer for a CLOSED TREE
authorIan Neal <iann_cvs@blueyonder.co.uk>
Tue, 19 Aug 2014 21:18:54 +0100
changeset 16477 9281c70c7224db6e2c47e1675fca425f02b466b2
parent 16476 bdc8535ce585fd9ef76402865fc2b3d6535fb338
child 16478 5c7fab2d17abe1ff9f655523b0e98e0a2b80a989
push id1234
push usermbanner@mozilla.com
push dateMon, 13 Oct 2014 17:59:18 +0000
treeherdercomm-esr52@b5a0add9fb18 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer
bugs1052943
Bug 1052943 - Move additions to C*FLAGS into moz.build and do not link against the static RTL r=jcranmer for a CLOSED TREE
im/components/mintrayr/Makefile.in
im/components/mintrayr/moz.build
mail/components/shell/Makefile.in
mail/components/shell/moz.build
mailnews/extensions/fts3/src/Makefile.in
mailnews/extensions/fts3/src/moz.build
suite/build/Makefile.in
suite/build/moz.build
suite/feeds/src/Makefile.in
suite/profile/Makefile.in
suite/profile/migration/src/Makefile.in
suite/shell/src/Makefile.in
suite/shell/src/moz.build
suite/shell/src/nsWindowsShellService.cpp
--- a/im/components/mintrayr/Makefile.in
+++ b/im/components/mintrayr/Makefile.in
@@ -8,19 +8,11 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # Platform specific stuff
 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
 RCFILE = resources.rc
 RESFILE = resources.res
-
-else
-
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
-
-LOCAL_INCLUDES += $(MOZ_GTK2_CFLAGS)
-
-endif # gtk2
 endif # windows
 
 include $(topsrcdir)/config/rules.mk
--- a/im/components/mintrayr/moz.build
+++ b/im/components/mintrayr/moz.build
@@ -13,16 +13,17 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'wind
     SOURCES += ['trayPlatformWin.cpp']
     OS_LIBS += [
         'shell32',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2':
     SOURCES += ['trayPlatformGtk2.cpp']
     OS_LIBS += CONFIG['TK_LIBS']
     OS_LIBS += CONFIG['XLIBS']
+    CXXFLAGS += CONFIG['MOZ_GTK2_CFLAGS']
 
 IS_COMPONENT = True
 
 LIBRARY_NAME = 'trayToolkit'
 
 XPIDL_SOURCES += [
     'trayIToolkit.idl',
 ]
--- a/mail/components/shell/Makefile.in
+++ b/mail/components/shell/Makefile.in
@@ -7,10 +7,8 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DEFINES += -DMOZ_APP_NAME=\"$(MOZ_APP_NAME)\"
 
 include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS += $(TK_CFLAGS)
--- a/mail/components/shell/moz.build
+++ b/mail/components/shell/moz.build
@@ -20,8 +20,9 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco
 
 EXTRA_COMPONENTS += [
     'nsSetDefaultMail.js',
     'shell.manifest',
 ]
 
 FINAL_LIBRARY = 'mailcomps'
 
+CXXFLAGS += CONFIG['TK_CFLAGS']
deleted file mode 100644
--- a/mailnews/extensions/fts3/src/Makefile.in
+++ /dev/null
@@ -1,16 +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
-
-LOCAL_INCLUDES = \
-		$(SQLITE_CFLAGS)
-
-include $(topsrcdir)/config/rules.mk
--- a/mailnews/extensions/fts3/src/moz.build
+++ b/mailnews/extensions/fts3/src/moz.build
@@ -10,8 +10,9 @@ SOURCES += [
 
 SOURCES += [
     'nsFts3Tokenizer.cpp',
     'nsGlodaRankerFunction.cpp',
 ]
 
 FINAL_LIBRARY = 'mail'
 
+CXXFLAGS += CONFIG['SQLITE_CFLAGS']
--- a/suite/build/Makefile.in
+++ b/suite/build/Makefile.in
@@ -4,14 +4,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-USE_STATIC_LIBS	 = 1
-
 include $(topsrcdir)/config/rules.mk
 
 # Ensure that we don't embed a manifest referencing the CRT.
 EMBED_MANIFEST_AT =
--- a/suite/build/moz.build
+++ b/suite/build/moz.build
@@ -16,31 +16,25 @@ LOCAL_INCLUDES += [
     '/suite/profile',
     '/suite/profile/migration/src',
     '/suite/shell/src',
 ]
 
 USE_LIBS += [
     'mozalloc',
     'unicharutil_external_s',
+    'xpcomglue_s',
     'xul',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    USE_LIBS += [
-        'xpcomglue_staticruntime_s',
-    ]
     OS_LIBS += [
         'ole32',
         'shell32',
     ]
-else:
-    USE_LIBS += [
-        'xpcomglue_s',
-    ]
 
 # js needs to come after xul for now, because it is an archive and its content
 # is discarded when it comes first.
 USE_LIBS += [
     'js',
 ]
 
 OS_LIBS += CONFIG['TK_LIBS']
deleted file mode 100644
--- a/suite/feeds/src/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
-
-USE_STATIC_LIBS = 1
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/suite/profile/Makefile.in
+++ /dev/null
@@ -1,15 +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
-
-USE_STATIC_LIBS = 1
-
-include $(topsrcdir)/config/rules.mk
-
deleted file mode 100644
--- a/suite/profile/migration/src/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
-
-USE_STATIC_LIBS = 1
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/suite/shell/src/Makefile.in
+++ /dev/null
@@ -1,16 +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
-
-USE_STATIC_LIBS = 1
-
-include $(topsrcdir)/config/rules.mk
-
-CXXFLAGS += $(TK_CFLAGS)
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -19,8 +19,9 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gt
 if SOURCES:
     EXTRA_COMPONENTS += [
         'nsSetDefault.js',
         'nsSetDefault.manifest',
     ]
 
 FINAL_LIBRARY = 'suite'
 
+CXXFLAGS += CONFIG['TK_CFLAGS']
--- a/suite/shell/src/nsWindowsShellService.cpp
+++ b/suite/shell/src/nsWindowsShellService.cpp
@@ -452,18 +452,18 @@ nsWindowsShellService::TestForDefault(SE
       return false;
 
     DWORD len = sizeof currValue;
     DWORD res = ::RegQueryValueExW(theKey, value.get(),
                                    nullptr, nullptr, (LPBYTE)currValue, &len);
     // Close the key we opened.
     ::RegCloseKey(theKey);
     if (REG_FAILED(res) ||
-        !dataLongPath.Equals(currValue, CaseInsensitiveCompare) &&
-        !dataShortPath.Equals(currValue, CaseInsensitiveCompare)) {
+        _wcsicmp(dataLongPath.get(), currValue) &&
+        _wcsicmp(dataShortPath.get(), currValue)) {
       // Key wasn't set, or was set to something else (something else became the default client)
       return false;
     }
   }
 
   return true;
 }