Bug 1041936 part 2 - Directly use the static library "xul" to link into "xul-gtest" instead of having an intermediate library "xul" used by "xul-shared" and "xul-gtest". r=gps

browser/components/build/moz.build

@@ -27,5 +27,5 @@ LOCAL_INCLUDES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

content/base/test/moz.build

@@ -46,5 +46,5 @@ BROWSER_CHROME_MANIFESTS += ['browser.ini']
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

content/canvas/compiledtest/moz.build

@@ -19,5 +19,5 @@ LOCAL_INCLUDES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

content/media/compiledtest/moz.build

@@ -19,5 +19,5 @@ LOCAL_INCLUDES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

content/media/webaudio/compiledtest/moz.build

@@ -19,5 +19,5 @@ LOCAL_INCLUDES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

dom/audiochannel/tests/moz.build

@@ -20,5 +20,5 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

editor/txmgr/tests/moz.build

@@ -15,5 +15,5 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

extensions/gnomevfs/moz.build

@@ -20,5 +20,5 @@ FORCE_SHARED_LIB = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

intl/lwbrk/tests/moz.build

@@ -17,5 +17,5 @@ LOCAL_INCLUDES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

intl/unicharutil/tests/moz.build

@@ -24,7 +24,7 @@ USE_STATIC_LIBS = True
 USE_LIBS += [
     'mozalloc',
     'unicharutil_external_s',
-    'xul-shared',
+    'xul',
 ]
 
 if CONFIG['OS_ARCH'] == 'WINNT':

ipc/app/moz.build

@@ -17,7 +17,7 @@ else:
     ]
     USE_LIBS += [
         'mozalloc',
-        'xul-shared',
+        'xul',
     ]
 
 include('/ipc/chromium/chromium-config.mozbuild')

ipc/ipdl/test/cxx/app/moz.build

@@ -22,5 +22,5 @@ if CONFIG['_MSC_VER']:
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

js/xpconnect/shell/moz.build

@@ -41,5 +41,5 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

js/xpconnect/tests/components/native/moz.build

@@ -27,5 +27,5 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

js/xpconnect/tests/moz.build

@@ -18,5 +18,5 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

media/libcubeb/tests/moz.build

@@ -45,5 +45,5 @@ else:
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

media/mtransport/test/moz.build

@@ -90,7 +90,7 @@ USE_LIBS += [
     'nicer',
     'nrappkit',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]
 
 if CONFIG['MOZ_SCTP']:

media/webrtc/signaling/test/moz.build

@@ -103,7 +103,7 @@ USE_LIBS += [
     'nksrtp_s',
     'webrtc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
     'yuv',
 ]
 

memory/mozalloc/tests/moz.build

@@ -13,5 +13,5 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

netwerk/streamconv/test/moz.build

@@ -23,5 +23,5 @@ if CONFIG['OS_ARCH'] == 'WINNT':
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

netwerk/test/moz.build

@@ -66,5 +66,5 @@ RESOURCE_FILES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

rdf/tests/rdfcat/moz.build

@@ -13,5 +13,5 @@ SOURCES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

rdf/tests/rdfpoll/moz.build

@@ -13,5 +13,5 @@ SOURCES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

rdf/tests/triplescat/moz.build

@@ -13,5 +13,5 @@ SOURCES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

security/manager/ssl/tests/compiled/moz.build

@@ -13,5 +13,5 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

startupcache/test/moz.build

@@ -18,5 +18,5 @@ EXTRA_COMPONENTS += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

storage/test/moz.build

@@ -39,7 +39,7 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]
 
 if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']:

toolkit/components/places/tests/cpp/moz.build

@@ -15,7 +15,7 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]
 
 if CONFIG['JS_SHARED_LIBRARY']:

toolkit/crashreporter/test/moz.build

@@ -42,5 +42,5 @@ include('/toolkit/crashreporter/crashreporter.mozbuild')
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

toolkit/library/Makefile.in

@@ -6,8 +6,22 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 CXXFLAGS += $(TK_CFLAGS)
 endif
 
+include $(topsrcdir)/toolkit/library/libxul.mk
+
+ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
+# Wrap linker to measure peak virtual memory usage.
+LD := $(PYTHON) $(topsrcdir)/build/link.py linker-vsize $(LD)
+endif
+
 include $(topsrcdir)/config/rules.mk
 
+ifdef COMPILE_ENVIRONMENT
+libs:: $(FINAL_TARGET)/dependentlibs.list
+endif
+
+$(FINAL_TARGET)/dependentlibs.list: $(topsrcdir)/toolkit/library/dependentlibs.py $(SHARED_LIBRARY) $(wildcard $(if $(wildcard $(FINAL_TARGET)/dependentlibs.list),$(addprefix $(FINAL_TARGET)/,$(shell cat $(FINAL_TARGET)/dependentlibs.list))))
+	$(PYTHON) $< $(SHARED_LIBRARY) -L $(FINAL_TARGET) $(if $(TOOLCHAIN_PREFIX),$(addprefix -p ,$(TOOLCHAIN_PREFIX))) > $@
+
 .PHONY: gtestxul
 gtestxul:
 	$(MAKE) -C gtest libs LINK_GTEST=1

toolkit/library/build/Makefile.in

@@ -1,19 +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/.
-
-include $(topsrcdir)/toolkit/library/libxul.mk
-
-ifeq (WINNT_1,$(OS_TARGET)_$(MOZ_PROFILE_USE))
-# Wrap linker to measure peak virtual memory usage.
-LD := $(PYTHON) $(topsrcdir)/build/link.py $(DEPTH)/toolkit/library/linker-vsize $(LD)
-endif
-
-include $(topsrcdir)/config/rules.mk
-
-ifdef COMPILE_ENVIRONMENT
-libs:: $(FINAL_TARGET)/dependentlibs.list
-endif
-
-$(FINAL_TARGET)/dependentlibs.list: $(topsrcdir)/toolkit/library/dependentlibs.py $(SHARED_LIBRARY) $(wildcard $(if $(wildcard $(FINAL_TARGET)/dependentlibs.list),$(addprefix $(FINAL_TARGET)/,$(shell cat $(FINAL_TARGET)/dependentlibs.list))))
-	$(PYTHON) $< $(SHARED_LIBRARY) -L $(FINAL_TARGET) $(if $(TOOLCHAIN_PREFIX),$(addprefix -p ,$(TOOLCHAIN_PREFIX))) > $@

toolkit/library/build/moz.build

@@ -1,10 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# 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/.
-
-LIBRARY_NAME = 'xul-shared'
-SDK_LIBRARY = True
-
-include('../libxul.mozbuild')

toolkit/library/gtest/moz.build

@@ -8,4 +8,8 @@ LIBRARY_NAME = 'xul-gtest'
 
 FINAL_TARGET = 'dist/bin/gtest'
 
+USE_LIBS += [
+    'static:xul',
+]
+
 include('../libxul.mozbuild')

toolkit/library/libxul.mozbuild

@@ -56,52 +56,4 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
         '/xpcom/base',
     ]
     # This file is (only) included from subdirectories, and the file is here.
-    RCINCLUDE = '../xulrunner.rc'
-
-USE_LIBS += [
-    'xul',
-]
-
-# 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',
-]
-
-if CONFIG['OS_ARCH'] == 'WINNT':
-    USE_LIBS += [
-        'sandboxbroker',
-    ]
-
-if CONFIG['MOZ_DMD']:
-    USE_LIBS += [
-        'dmd',
-    ]
-
-if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
-    USE_LIBS += [
-        'mozz',
-    ]
-
-if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']:
-    USE_LIBS += [
-        'mozsqlite3',
-    ]
-
-USE_LIBS += [
-    'gkmedias',
-    'mozalloc',
-]
-
-if CONFIG['MOZ_WIDGET_GTK'] and CONFIG['MOZ_ENABLE_GTK3']:
-    USE_LIBS += [
-        'mozgtk_stub',
-    ]
-
-if CONFIG['MOZ_JPROF']:
-    USE_LIBS += [
-        'jprof',
-    ]
-
-# This needs to be last
-USE_LIBS += ['StaticXULComponentsEnd']
+    RCINCLUDE = '$(topsrcdir)/toolkit/library/xulrunner.rc'

toolkit/library/moz.build

@@ -6,10 +6,18 @@
 
 LIBRARY_NAME = 'xul'
 
+SDK_LIBRARY = True
+
+FORCE_STATIC_LIB = True
+
+STATIC_LIBRARY_NAME = 'xul_s'
+
 SOURCES += [
     'StaticXULComponentsStart.cpp',
 ]
 
+MSVC_ENABLE_PGO = True
+
 # This, combined with the fact the file is first, makes the start pointer
 # it contains first in Windows PGO builds.
 SOURCES['StaticXULComponentsStart.cpp'].no_pgo = True
@@ -32,4 +40,50 @@ if CONFIG['OS_ARCH'] == 'WINNT' and not CONFIG['GNU_CC']:
 
 FAIL_ON_WARNINGS = True
 
-DIRS += ['StaticXULComponentsEnd', 'build', 'gtest']
+DIRS += ['gtest']
+
+include('libxul.mozbuild')
+
+# 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',
+]
+
+if CONFIG['OS_ARCH'] == 'WINNT':
+    USE_LIBS += [
+        'sandboxbroker',
+    ]
+
+if CONFIG['MOZ_DMD']:
+    USE_LIBS += [
+        'dmd',
+    ]
+
+if not CONFIG['MOZ_NATIVE_ZLIB'] and not CONFIG['ZLIB_IN_MOZGLUE']:
+    USE_LIBS += [
+        'mozz',
+    ]
+
+if not CONFIG['MOZ_NATIVE_SQLITE'] and not CONFIG['MOZ_FOLD_LIBS']:
+    USE_LIBS += [
+        'mozsqlite3',
+    ]
+
+USE_LIBS += [
+    'gkmedias',
+    'mozalloc',
+]
+
+if CONFIG['MOZ_WIDGET_GTK'] and CONFIG['MOZ_ENABLE_GTK3']:
+    USE_LIBS += [
+        'mozgtk_stub',
+    ]
+
+if CONFIG['MOZ_JPROF']:
+    USE_LIBS += [
+        'jprof',
+    ]
+
+# This needs to be last
+USE_LIBS += ['StaticXULComponentsEnd']

toolkit/system/dbus/moz.build

@@ -17,5 +17,5 @@ IS_COMPONENT = True
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

toolkit/system/gnome/moz.build

@@ -36,5 +36,5 @@ LOCAL_INCLUDES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

toolkit/toolkit.mozbuild

@@ -157,6 +157,7 @@ if CONFIG['MOZ_GIO_COMPONENT']:
 add_tier_dir('platform', app_libxul_dirs)
 add_tier_dir('platform', app_libxul_static_dirs, static=True)
 
+add_tier_dir('platform', 'toolkit/library/StaticXULComponentsEnd')
 add_tier_dir('platform', 'toolkit/library')
 
 if CONFIG['MOZ_REPLACE_MALLOC']:

tools/trace-malloc/moz.build

@@ -47,5 +47,5 @@ RESOURCE_FILES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

widget/tests/moz.build

@@ -29,5 +29,5 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/reflect/xptcall/tests/moz.build

@@ -15,5 +15,5 @@ SOURCES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/reflect/xptinfo/tests/moz.build

@@ -15,5 +15,5 @@ SIMPLE_PROGRAMS += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/sample/moz.build

@@ -43,5 +43,5 @@ RESOURCE_FILES.samples += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/tests/bug656331_component/moz.build

@@ -23,5 +23,5 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % (
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/tests/component/moz.build

@@ -23,5 +23,5 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % (
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/tests/component_no_aslr/moz.build

@@ -23,5 +23,5 @@ DEFINES['LIBRARY_FILENAME'] = '%s%s%s' % (
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/tests/external/moz.build

@@ -15,5 +15,5 @@ SOURCES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/tests/moz.build

@@ -127,5 +127,5 @@ RESOURCE_FILES += [
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/tests/windows/moz.build

@@ -14,5 +14,5 @@ SOURCES += sorted('%s.cpp' % t for t in CPP_UNIT_TESTS)
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]

xpcom/typelib/xpt/tests/moz.build

@@ -18,5 +18,5 @@ FAIL_ON_WARNINGS = True
 USE_LIBS += [
     'mozalloc',
     'xpt',
-    'xul-shared',
+    'xul',
 ]

xulrunner/examples/simple/components/src/moz.build

@@ -22,5 +22,5 @@ XPI_NAME = 'simple'
 USE_LIBS += [
     'mozalloc',
     'xpcomglue_s',
-    'xul-shared',
+    'xul',
 ]