Bug 875013 - VPATH removals in build, roboextender, crashreporter; r=ted
authorMike Shal <mshal@mozilla.com>
Tue, 21 Jan 2014 18:01:22 -0500
changeset 165879 b3ccfb70c31bbc2da246dbad4d6dc09c07a0f9d8
parent 165878 ce4d2dd81858c50964fc4ef0db7a97dc3a2ba2e9
child 165880 d7cf9038a7ecd31969a5f15b6c80a4e28466be23
push idunknown
push userunknown
push dateunknown
reviewersted
bugs875013
milestone29.0a1
Bug 875013 - VPATH removals in build, roboextender, crashreporter; r=ted
build/unix/elfhack/Makefile.in
testing/mochitest/roboextender/Makefile.in
toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
toolkit/crashreporter/breakpad-windows-libxul/moz.build
toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
toolkit/crashreporter/breakpad-windows-standalone/moz.build
toolkit/crashreporter/client/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild
toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild
toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mk
toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mozbuild
toolkit/crashreporter/google-breakpad/src/common/Makefile.in
toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild
toolkit/crashreporter/test/Makefile.in
--- a/build/unix/elfhack/Makefile.in
+++ b/build/unix/elfhack/Makefile.in
@@ -1,17 +1,15 @@
 #
 # 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/.
 
 INTERNAL_TOOLS = 1
 
-VPATH += $(topsrcdir)/build
-
 OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions
 
 WRAP_LDFLAGS=
 
 include $(topsrcdir)/config/rules.mk
 
 test-array$(DLL_SUFFIX) test-ctors$(DLL_SUFFIX): %$(DLL_SUFFIX): %.$(OBJ_SUFFIX) elfhack
 	$(MKSHLIB) $(LDFLAGS) $< -nostartfiles
--- a/testing/mochitest/roboextender/Makefile.in
+++ b/testing/mochitest/roboextender/Makefile.in
@@ -1,18 +1,13 @@
 #
 # 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           = ../../..
-topsrcdir       = @top_srcdir@
-srcdir          = @srcdir@
-VPATH           = @srcdir@
-relativesrcdir  = testing/mochitest/roboextender
 TESTPATH        = $(topsrcdir)/mobile/android/base/tests/roboextender
 
 include $(DEPTH)/config/autoconf.mk
 
 TEST_EXTENSIONS_DIR = $(DEPTH)/_tests/testing/mochitest/extensions
 
 TEST_FILES = \
   bootstrap.js \
--- a/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
+++ b/toolkit/crashreporter/breakpad-windows-libxul/Makefile.in
@@ -1,26 +1,5 @@
 # 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/.
 
 STL_FLAGS =
-
-LOCAL_INCLUDES = -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
-
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mk
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
-
-VPATH += \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/sender \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation \
-  $(NULL)
-
-CPPSRCS += \
-  $(objs_common) \
-  $(objs_crash_generation) \
-  $(objs_handler) \
-  $(objs_sender) \
-  $(NULL)
--- a/toolkit/crashreporter/breakpad-windows-libxul/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-libxul/moz.build
@@ -9,8 +9,22 @@ SOURCES += [
 ]
 
 LIBRARY_NAME = 'google_breakpad_libxul_s'
 
 FINAL_LIBRARY = 'xulapp_s'
 
 for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
     DEFINES[var] = True
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter/google-breakpad/src',
+]
+
+include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild')
+
+SOURCES += objs_common
+SOURCES += objs_crash_generation
+SOURCES += objs_handler
+SOURCES += objs_sender
--- a/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
+++ b/toolkit/crashreporter/breakpad-windows-standalone/Makefile.in
@@ -1,26 +1,8 @@
 # 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/.
 
 USE_STATIC_LIBS = 1
 MOZ_GLUE_LDFLAGS =
 
 STL_FLAGS =
-
-LOCAL_INCLUDES = -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src
-
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
-include $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
-
-VPATH += \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/windows \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/handler \
-  $(topsrcdir)/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation \
-  $(NULL)
-
-CPPSRCS += \
-  $(objs_common) \
-  $(objs_crash_generation) \
-  $(objs_handler) \
-  $(NULL)
--- a/toolkit/crashreporter/breakpad-windows-standalone/moz.build
+++ b/toolkit/crashreporter/breakpad-windows-standalone/moz.build
@@ -3,8 +3,20 @@
 # 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/.
 
 FINAL_LIBRARY = 'breakpadinjector'
 
 for var in ('UNICODE', 'UNICODE_', 'BREAKPAD_NO_TERMINATE_THREAD', 'NOMINMAX'):
     DEFINES[var] = True
+
+LOCAL_INCLUDES += [
+    '/toolkit/crashreporter/google-breakpad/src',
+]
+
+include('/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild')
+include('/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild')
+
+SOURCES += objs_common
+SOURCES += objs_crash_generation
+SOURCES += objs_handler
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@@ -12,18 +12,16 @@ DIST_PROGRAM = crashreporter$(BIN_SUFFIX
 
 # Don't link the updater against libmozglue.
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
 endif
 
 LOCAL_INCLUDES = -I$(srcdir)/../google-breakpad/src
 
-VPATH += $(topsrcdir)/build/
-
 ifeq ($(OS_ARCH),WINNT)
 LIBS += \
   $(DEPTH)/toolkit/crashreporter/breakpad-windows-libxul/$(LIB_PREFIX)google_breakpad_libxul_s.$(LIB_SUFFIX)
   $(NULL)
 LOCAL_INCLUDES += -I$(srcdir)
 RCINCLUDE = crashreporter.rc
 OS_LIBS += $(call EXPAND_LIBNAME,comctl32 shell32 wininet shlwapi)
 MOZ_WINCONSOLE = 0
--- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/Makefile.in
@@ -11,18 +11,16 @@ ifdef MOZ_THUMB2 #{
 # as a clobbered register yet gcc error's.  The generated assembly for
 # sys_clone() looks OK, so we chalk this up to a gcc/gas quirk and
 # work around it by telling gcc that the THUMB frame pointer is a
 # vanilla callee-save register.
 OS_CXXFLAGS += -fomit-frame-pointer
 MOZ_FRAMEPTR_FLAGS := -fomit-frame-pointer
 endif #}
 
-VPATH += $(srcdir)/../log
-
 LOCAL_INCLUDES = \
   -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src \
   $(NULL)
 
 ifeq ($(OS_TARGET),Android)
 # NDK5 workarounds
 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 endif
deleted file mode 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-objs_crash_generation = \
-  client_info.cc \
-  crash_generation_client.cc \
-  crash_generation_server.cc \
-  minidump_generator.cc \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation/objs.mozbuild
@@ -0,0 +1,17 @@
+# -*- 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/.
+
+lobjs_crash_generation = [
+    'client_info.cc',
+    'crash_generation_client.cc',
+    'crash_generation_server.cc',
+    'minidump_generator.cc',
+]
+
+subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/crash_generation'
+objs_crash_generation = [
+    '%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_crash_generation
+]
deleted file mode 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-objs_handler = exception_handler.cc
new file mode 100644
--- /dev/null
+++ b/toolkit/crashreporter/google-breakpad/src/client/windows/handler/objs.mozbuild
@@ -0,0 +1,14 @@
+# -*- 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/.
+
+lobjs_handler = [
+    'exception_handler.cc',
+]
+
+subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/handler'
+objs_handler = [
+    '%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_handler
+]
deleted file mode 100644
--- a/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mk
+++ /dev/null
@@ -1,1 +0,0 @@
-objs_sender = crash_report_sender.cc
new file mode 100644
--- /dev/null
+++ b/toolkit/crashreporter/google-breakpad/src/client/windows/sender/objs.mozbuild
@@ -0,0 +1,14 @@
+# -*- 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/.
+
+lobjs_sender = [
+    'crash_report_sender.cc',
+]
+
+subdir = 'toolkit/crashreporter/google-breakpad/src/client/windows/sender'
+objs_sender = [
+    '%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_sender
+]
--- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
+++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in
@@ -5,17 +5,16 @@
 ifneq (WINNT,$(OS_TARGET))
 ifdef MOZ_CRASHREPORTER
 endif
 endif
 
 LOCAL_INCLUDES 	= -I$(srcdir)/..
 
 ifeq ($(OS_TARGET),Android)
-VPATH += $(srcdir)/android
 TARGET_LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter/google-breakpad/src/common/android/include/
 endif
 
 # This kind of sucks.
 ifeq (Linux,$(OS_ARCH))
 HOST_CXXFLAGS += -DHAVE_A_OUT_H
 OS_CXXFLAGS += -DHAVE_A_OUT_H
 endif
deleted file mode 100644
--- a/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-objs_common = \
-  guid_string.cc \
-  string_utils.cc \
-  $(NULL)
new file mode 100644
--- /dev/null
+++ b/toolkit/crashreporter/google-breakpad/src/common/windows/objs.mozbuild
@@ -0,0 +1,15 @@
+# -*- 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/.
+
+lobjs_common = [
+    'guid_string.cc',
+    'string_utils.cc',
+]
+
+subdir = 'toolkit/crashreporter/google-breakpad/src/common/windows'
+objs_common = [
+    '%s/%s/%s' % (TOPSRCDIR, subdir, s) for s in lobjs_common
+]
--- a/toolkit/crashreporter/test/Makefile.in
+++ b/toolkit/crashreporter/test/Makefile.in
@@ -1,19 +1,13 @@
 #
 # 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/.
 
-VPATH += \
-  $(srcdir)/../google-breakpad/src/processor/ \
-  $(srcdir)/../google-breakpad/src/common/ \
-  $(topsrcdir)/build/ \
-  $(NULL)
-
 LOCAL_INCLUDES += \
   -I$(srcdir)/../google-breakpad/src/ \
   $(NULL)
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(MOZ_COMPONENT_LIBS) $(XPCOM_GLUE_LDOPTS)
 
 UNIT_FILES = $(SHARED_LIBRARY) $(EXTRA_JS_MODULES)
 UNIT_DEST = $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit/
 INSTALL_TARGETS += UNIT