Bug 862986 - Part 2: Migrate PROGRAM from Makefile.in to moz.build. r=gps

2013-04-30 09:08:31 -04:00 · 2013-04-30 09:08:31 -04:00 · 0baa2a32d6
--- a/b2g/app/Makefile.in
+++ b/b2g/app/Makefile.in
@ -18,11 +18,6 @@ DEFINES += -DENABLE_MARIONETTE=1
 endif

 ifndef LIBXUL_SDK
-ifneq ($(GAIADIR),)
-PROGRAM=$(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
-else
-PROGRAM=$(MOZ_APP_NAME)$(BIN_SUFFIX)
-endif

 CPPSRCS = nsBrowserApp.cpp

--- a/b2g/app/moz.build
+++ b/b2g/app/moz.build
@ -4,3 +4,8 @@
 # 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/.

+if not CONFIG['LIBXUL_SDK']:
+    if CONFIG['GAIADIR']:
+        PROGRAM = CONFIG['MOZ_APP_NAME'] + "-bin"
+    else:
+        PROGRAM = CONFIG['MOZ_APP_NAME']
--- a/b2g/gaia/Makefile.in
+++ b/b2g/gaia/Makefile.in
@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 GAIA_PATH := gaia/profile

-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-
 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS = run-b2g.cpp
 DEFINES += \
--- a/b2g/gaia/moz.build
+++ b/b2g/gaia/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = CONFIG['MOZ_APP_NAME']
+
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@ -43,8 +43,6 @@ endif #} LIBXUL_SDK

 # Build a binary bootstrapping with XRE_main

-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-
 CPPSRCS = nsBrowserApp.cpp

 LOCAL_INCLUDES += \
--- a/browser/app/moz.build
+++ b/browser/app/moz.build
@ -5,3 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DIRS += ['profile/extensions']
+
+PROGRAM = CONFIG['MOZ_APP_NAME']
+
--- a/browser/metro/shell/commandexecutehandler/Makefile.in
+++ b/browser/metro/shell/commandexecutehandler/Makefile.in
@ -16,7 +16,6 @@ include $(topsrcdir)/config/config.mk
 # We want this exe in dist/bin
 DIST_SUBDIR =

-PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)
 DIST_PROGRAM = CommandExecuteHandler$(BIN_SUFFIX)

 # Don't link against mozglue.dll
--- a/browser/metro/shell/commandexecutehandler/moz.build
+++ b/browser/metro/shell/commandexecutehandler/moz.build
@ -4,3 +4,4 @@
 # 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/.

+PROGRAM = 'CommandExecuteHandler'
--- a/browser/metro/shell/linktool/Makefile.in
+++ b/browser/metro/shell/linktool/Makefile.in
@ -15,8 +15,6 @@ include $(topsrcdir)/config/config.mk

 DIST_SUBDIR = metro/install

-PROGRAM = linktool$(BIN_SUFFIX)
-
 CPPSRCS    = linktool.cpp

 OS_LIBS = \
--- a/browser/metro/shell/linktool/moz.build
+++ b/browser/metro/shell/linktool/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'linktool'
+
--- a/browser/metro/shell/testing/Makefile.in
+++ b/browser/metro/shell/testing/Makefile.in
@ -23,8 +23,6 @@ include $(topsrcdir)/config/config.mk
 # We want this exe in dist/bin
 DIST_SUBDIR =

-PROGRAM = metrotestharness$(BIN_SUFFIX)
-
 CPPSRCS	= \
 	metrotestharness.cpp \
 	$(NULL)
--- a/browser/metro/shell/testing/moz.build
+++ b/browser/metro/shell/testing/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'metrotestharness'
+
--- a/build/win32/Makefile.in
+++ b/build/win32/Makefile.in
@ -13,7 +13,6 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1

 ifdef ENABLE_TESTS

-PROGRAM = crashinject$(BIN_SUFFIX)
 USE_STATIC_LIBS = 1
 CPPSRCS = crashinject.cpp

--- a/build/win32/moz.build
+++ b/build/win32/moz.build
@ -9,3 +9,5 @@ if CONFIG['_MSC_VER'] and CONFIG['OS_TEST'] != 'x86_64':

 TEST_DIRS += ['crashinjectdll']

+if CONFIG['ENABLE_TESTS']:
+    PROGRAM = 'crashinject'
--- a/dom/plugins/ipc/hangui/Makefile.in
+++ b/dom/plugins/ipc/hangui/Makefile.in
@ -15,8 +15,6 @@ CPPSRCS = \
  PluginHangUIChild.cpp \
  $(NULL)

-PROGRAM = plugin-hang-ui$(BIN_SUFFIX)
-
 OS_LIBS = $(call EXPAND_LIBNAME,comctl32)

 RCINCLUDE = HangUIDlg.rc
--- a/dom/plugins/ipc/hangui/moz.build
+++ b/dom/plugins/ipc/hangui/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'plugin-hang-ui'
+
--- a/embedding/tests/winEmbed/Makefile.in
+++ b/embedding/tests/winEmbed/Makefile.in
@ -36,7 +36,6 @@ include $(DEPTH)/config/autoconf.mk

 XPI_NAME	= winembed

-PROGRAM		= winEmbed$(BIN_SUFFIX)
 RESFILE		= winEmbed.res

 CPPSRCS		= \
--- a/embedding/tests/winEmbed/moz.build
+++ b/embedding/tests/winEmbed/moz.build
@ -6,3 +6,5 @@

 MODULE = 'winEmbed'

+PROGRAM = 'winEmbed'
+
--- a/intl/unicharutil/tools/Makefile.in
+++ b/intl/unicharutil/tools/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= ucgendat
-
 CSRCS		= ucgendat.c

 # XXX need configure test
--- a/intl/unicharutil/tools/moz.build
+++ b/intl/unicharutil/tools/moz.build
@ -6,3 +6,5 @@

 MODULE = 'ucgendat'

+PROGRAM = 'ucgendat'
+
--- a/ipc/app/Makefile.in
+++ b/ipc/app/Makefile.in
@ -9,8 +9,6 @@ VPATH     = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM = $(MOZ_CHILD_PROCESS_NAME)
-
 ifneq ($(dir $(PROGRAM)),./)
  GENERATED_DIRS = $(dir $(PROGRAM))
 endif
--- a/ipc/app/moz.build
+++ b/ipc/app/moz.build
@ -6,3 +6,5 @@

 MODULE = 'ipc'

+PROGRAM = CONFIG['MOZ_CHILD_PROCESS_NAME']
+
--- a/ipc/ipdl/test/cxx/app/Makefile.in
+++ b/ipc/ipdl/test/cxx/app/Makefile.in
@ -9,8 +9,6 @@ VPATH = @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM = $(MODULE)$(BIN_SUFFIX)
-
 NSDISTMODE = copy

 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
--- a/ipc/ipdl/test/cxx/app/moz.build
+++ b/ipc/ipdl/test/cxx/app/moz.build
@ -6,3 +6,5 @@

 MODULE = 'ipdlunittest'

+PROGRAM = 'ipdlunittest'
+
--- a/js/src/gdb/Makefile.in
+++ b/js/src/gdb/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@ @srcdir@/tests

 include $(DEPTH)/config/autoconf.mk

-PROGRAM = gdb-tests$(BIN_SUFFIX)
 CPPSRCS =					\
  gdb-tests.cpp					\
  test-jsid.cpp					\
--- a/js/src/gdb/moz.build
+++ b/js/src/gdb/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'gdb-tests'
+
--- a/js/src/jsapi-tests/Makefile.in
+++ b/js/src/jsapi-tests/Makefile.in
@ -11,8 +11,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM         = jsapi-tests$(BIN_SUFFIX)
-
 CPPSRCS = \
  tests.cpp \
  selfTest.cpp \
--- a/js/src/jsapi-tests/moz.build
+++ b/js/src/jsapi-tests/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'jsapi-tests'
+
--- a/js/src/shell/Makefile.in
+++ b/js/src/shell/Makefile.in
@ -11,7 +11,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM         = $(JS_SHELL_NAME)$(BIN_SUFFIX)
 CPPSRCS		= \
  js.cpp \
  jsoptparse.cpp \
--- a/js/src/shell/moz.build
+++ b/js/src/shell/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM         = CONFIG['JS_SHELL_NAME']
+
--- a/js/xpconnect/shell/Makefile.in
+++ b/js/xpconnect/shell/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= xpcshell$(BIN_SUFFIX)
 SDK_BINARY	= $(PROGRAM)

 CPPSRCS		= xpcshell.cpp
--- a/js/xpconnect/shell/moz.build
+++ b/js/xpconnect/shell/moz.build
@ -6,3 +6,5 @@

 MODULE = 'xpcshell'

+PROGRAM = 'xpcshell'
+
--- a/mobile/android/app/Makefile.in
+++ b/mobile/android/app/Makefile.in
@ -16,7 +16,6 @@ DIST_FILES = recommended-addons.json

 ifndef LIBXUL_SDK
 ifneq (Android,$(OS_TARGET))
-PROGRAM=$(MOZ_APP_NAME)$(BIN_SUFFIX)

 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
 LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/base
--- a/mobile/android/app/moz.build
+++ b/mobile/android/app/moz.build
@ -4,3 +4,6 @@
 # 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/.

+if not CONFIG['LIBXUL_SDK']:
+    if CONFIG['OS_TARGET'] != 'Android':
+        PROGRAM = CONFIG['MOZ_APP_NAME']
--- a/modules/libmar/tool/Makefile.in
+++ b/modules/libmar/tool/Makefile.in
@ -20,10 +20,6 @@ endif
 # Mozilla distribution.
 HOST_PROGRAM = mar$(HOST_BIN_SUFFIX)

-ifdef MOZ_ENABLE_SIGNMAR
-PROGRAM = signmar$(BIN_SUFFIX)
-endif
-
 # Don't link the against libmozglue because we don't need it.
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
--- a/modules/libmar/tool/moz.build
+++ b/modules/libmar/tool/moz.build
@ -6,3 +6,5 @@

 MODULE = 'mar'

+if CONFIG['MOZ_ENABLE_SIGNMAR']:
+    PROGRAM = 'signmar'
--- a/netwerk/streamconv/test/Makefile.in
+++ b/netwerk/streamconv/test/Makefile.in
@ -11,8 +11,6 @@ FAIL_ON_WARNINGS := 1

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= TestStreamConv$(BIN_SUFFIX)
-
 CPPSRCS		= \
 		Converters.cpp \
 		TestStreamConv.cpp \
--- a/netwerk/streamconv/test/moz.build
+++ b/netwerk/streamconv/test/moz.build
@ -6,3 +6,5 @@

 MODULE = 'TestStreamConv'

+PROGRAM = 'TestStreamConv'
+
--- a/python/mozbuild/mozbuild/backend/recursivemake.py
+++ b/python/mozbuild/mozbuild/backend/recursivemake.py
@ -16,6 +16,7 @@ from ..frontend.data import (
    SandboxDerived,
    VariablePassthru,
    Exports,
+    Program,
    XpcshellManifests,
 )
 from ..util import FileAvoidWrite
@ -213,6 +214,8 @@ class RecursiveMakeBackend(BuildBackend):
                    backend_file.write('%s := %s\n' % (k, v))
        elif isinstance(obj, Exports):
            self._process_exports(obj.exports, backend_file)
+        elif isinstance(obj, Program):
+            self._process_program(obj.program, backend_file)

        elif isinstance(obj, XpcshellManifests):
            self._process_xpcshell_manifests(obj.xpcshell_manifests, backend_file)
@ -325,5 +328,8 @@ class RecursiveMakeBackend(BuildBackend):
            self._process_exports(children[subdir], backend_file,
                                  namespace=namespace + subdir)

+    def _process_program(self, program, backend_file):
+        backend_file.write('PROGRAM = %s\n' % program)
+
    def _process_xpcshell_manifests(self, manifest, backend_file, namespace=""):
        backend_file.write('XPCSHELL_TESTS += %s\n' % os.path.dirname(manifest))
--- a/python/mozbuild/mozbuild/frontend/data.py
+++ b/python/mozbuild/mozbuild/frontend/data.py
@ -149,6 +149,24 @@ class Exports(SandboxDerived):
        SandboxDerived.__init__(self, sandbox)
        self.exports = exports

+class Program(SandboxDerived):
+    """Sandbox container object for PROGRAM, which is a unicode string.
+
+    This class handles automatically appending BIN_SUFFIX to the PROGRAM value.
+    If BIN_SUFFIX is not defined, PROGRAM is unchanged.
+    Otherwise, if PROGRAM ends in BIN_SUFFIX, it is unchanged
+    Otherwise, BIN_SUFFIX is appended to PROGRAM
+    """
+    __slots__ = ('program')
+
+    def __init__(self, sandbox, program, bin_suffix):
+        SandboxDerived.__init__(self, sandbox)
+
+        bin_suffix = bin_suffix or ''
+        if not program.endswith(bin_suffix):
+            program += bin_suffix
+        self.program = program
+
 class XpcshellManifests(SandboxDerived):
    """Build object container for XPCSHELL_TESTS_MANIFESTS (was: XPCSHELL_TESTS).

--- a/python/mozbuild/mozbuild/frontend/emitter.py
+++ b/python/mozbuild/mozbuild/frontend/emitter.py
@ -11,6 +11,7 @@ from .data import (
    DirectoryTraversal,
    VariablePassthru,
    Exports,
+    Program,
    ReaderSummary,
    XpcshellManifests,
 )
@ -92,6 +93,10 @@ class TreeMetadataEmitter(object):
        if exports:
            yield Exports(sandbox, exports)

+        program = sandbox.get('PROGRAM')
+        if program:
+            yield Program(sandbox, program, sandbox['CONFIG']['BIN_SUFFIX'])
+
        for manifest in sandbox.get('XPCSHELL_TESTS_MANIFESTS', []):
            yield XpcshellManifests(sandbox, manifest)

--- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
+++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py
@ -167,6 +167,14 @@ VARIABLES = {
        EXPORTS.mozilla.dom += ['bar.h']
        """),

+    'PROGRAM' : (unicode, "",
+        """Compiled executable name.
+
+        If the configuration token 'BIN_SUFFIX' is set, its value will be
+        automatically appended to PROGRAM. If PROGRAM already ends with
+        BIN_SUFFIX, PROGRAM will remain unchanged.
+        """),
+
    # IDL Generation.
    'XPIDL_SOURCES': (list, [],
        """XPCOM Interface Definition Files (xpidl).
--- a/python/mozbuild/mozbuild/test/frontend/data/program/moz.build
+++ b/python/mozbuild/mozbuild/test/frontend/data/program/moz.build
@ -0,0 +1,4 @@
+# Any copyright is dedicated to the Public Domain.
+# http://creativecommons.org/publicdomain/zero/1.0/
+
+PROGRAM = 'test_program'
--- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py
+++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py
@ -15,6 +15,7 @@ from mozbuild.frontend.data import (
    ReaderSummary,
    VariablePassthru,
    Exports,
+    Program,
    XpcshellManifests,
 )
 from mozbuild.frontend.emitter import TreeMetadataEmitter
@ -31,6 +32,7 @@ class TestEmitterBasic(unittest.TestCase):
    def reader(self, name):
        config = MockConfig(os.path.join(data_path, name))
        config.substs['ENABLE_TESTS'] = '1'
+        config.substs['BIN_SUFFIX'] = '.prgm'

        return BuildReader(config)

@ -170,6 +172,17 @@ class TestEmitterBasic(unittest.TestCase):
        overwrite = exports._children['overwrite']
        self.assertEqual(overwrite.get_strings(), ['new.h'])

+    def test_program(self):
+        reader = self.reader('program')
+        objs = self.read_topsrcdir(reader)
+
+        self.assertEqual(len(objs), 2)
+        self.assertIsInstance(objs[0], DirectoryTraversal)
+        self.assertIsInstance(objs[1], Program)
+
+        program = objs[1].program
+        self.assertEqual(program, 'test_program.pgrm')
+
    def test_xpcshell_manifests(self):
        reader = self.reader('xpcshell_manifests')
        objs = self.read_topsrcdir(reader)
--- a/rdf/tests/rdfcat/Makefile.in
+++ b/rdf/tests/rdfcat/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= rdfcat$(BIN_SUFFIX)
-
 CPPSRCS		= rdfcat.cpp

 LIBS		= \
--- a/rdf/tests/rdfcat/moz.build
+++ b/rdf/tests/rdfcat/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'rdfcat'
+
--- a/rdf/tests/rdfpoll/Makefile.in
+++ b/rdf/tests/rdfpoll/Makefile.in
@ -10,7 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= rdfpoll$(BIN_SUFFIX)
 CPPSRCS		= rdfpoll.cpp


--- a/rdf/tests/rdfpoll/moz.build
+++ b/rdf/tests/rdfpoll/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'rdfpoll'
+
--- a/rdf/tests/triplescat/Makefile.in
+++ b/rdf/tests/triplescat/Makefile.in
@ -10,8 +10,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM		= triplescat$(BIN_SUFFIX)
-
 CPPSRCS		= triplescat.cpp

 LIBS		= \
--- a/rdf/tests/triplescat/moz.build
+++ b/rdf/tests/triplescat/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'triplescat'
+
--- a/testing/mochitest/ssltunnel/Makefile.in
+++ b/testing/mochitest/ssltunnel/Makefile.in
@ -14,8 +14,6 @@ include $(DEPTH)/config/autoconf.mk
 # wrappers
 STL_FLAGS =

-PROGRAM = ssltunnel$(BIN_SUFFIX)
-
 CPPSRCS = ssltunnel.cpp

 LIBS = \
--- a/testing/mochitest/ssltunnel/moz.build
+++ b/testing/mochitest/ssltunnel/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'ssltunnel'
+
--- a/testing/tools/screenshot/Makefile.in
+++ b/testing/tools/screenshot/Makefile.in
@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk
 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
 ifdef MOZ_X11

-PROGRAM = screentopng
 CPPSRCS = gdk-screenshot.cpp
 LOCAL_INCLUDES = $(MOZ_GTK2_CFLAGS)
 OS_LIBS = $(MOZ_GTK2_LIBS) $(XSS_LIBS)
@ -22,7 +21,6 @@ endif # GTK2

 ifeq ($(MOZ_WIDGET_TOOLKIT),windows)

-PROGRAM = screenshot$(BIN_SUFFIX)
 CPPSRCS = win32-screenshot.cpp
 OS_LIBS += $(call EXPAND_LIBNAME,gdiplus)
 MOZ_GLUE_PROGRAM_LDFLAGS =
--- a/testing/tools/screenshot/moz.build
+++ b/testing/tools/screenshot/moz.build
@ -4,3 +4,7 @@
 # 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/.

+if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2' and CONFIG['MOZ_X11']:
+    PROGRAM = 'screentopng'
+elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
+    PROGRAM = 'screenshot'
--- a/toolkit/components/maintenanceservice/Makefile.in
+++ b/toolkit/components/maintenanceservice/Makefile.in
@ -21,7 +21,6 @@ CPPSRCS = \
 # For debugging purposes only
 #DEFINES += -DDISABLE_UPDATER_AUTHENTICODE_CHECK

-PROGRAM = maintenanceservice$(BIN_SUFFIX)
 DIST_PROGRAM = maintenanceservice$(BIN_SUFFIX)

 # Don't link the maintenanceservice against mozglue.dll. See bug 687139 and
--- a/toolkit/components/maintenanceservice/moz.build
+++ b/toolkit/components/maintenanceservice/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'maintenanceservice'
+
--- a/toolkit/crashreporter/client/Makefile.in
+++ b/toolkit/crashreporter/client/Makefile.in
@ -16,7 +16,6 @@ include $(DEPTH)/config/autoconf.mk
 STL_FLAGS =

 ifneq ($(OS_TARGET),Android)
-PROGRAM = crashreporter$(BIN_SUFFIX)
 DIST_PROGRAM = crashreporter$(BIN_SUFFIX)

 # Don't link the updater against libmozglue.
--- a/toolkit/crashreporter/client/moz.build
+++ b/toolkit/crashreporter/client/moz.build
@ -6,6 +6,8 @@

 MODULE = 'crashreporter'

+if CONFIG['OS_TARGET'] != 'Android':
+    PROGRAM = 'crashreporter'
 # The xpcshell test case here verifies that the CA certificate list
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk2' and CONFIG['MOZ_PLATFORM_MAEMO']:
    XPCSHELL_TESTS_MANIFESTS += ['maemo-unit/xpcshell.ini']
--- a/toolkit/mozapps/update/updater/Makefile.in
+++ b/toolkit/mozapps/update/updater/Makefile.in
@ -22,8 +22,6 @@ CPPSRCS += \
  $(NULL)
 endif

-PROGRAM = updater$(BIN_SUFFIX)
-
 # Don't link the updater against libmozglue. See bug 687139
 MOZ_GLUE_LDFLAGS =
 MOZ_GLUE_PROGRAM_LDFLAGS =
--- a/toolkit/mozapps/update/updater/moz.build
+++ b/toolkit/mozapps/update/updater/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'updater'
+
--- a/tools/jprof/Makefile.in
+++ b/tools/jprof/Makefile.in
@ -11,8 +11,6 @@ VPATH		= @srcdir@

 include $(DEPTH)/config/autoconf.mk

-PROGRAM = jprof
-
 CPPSRCS = \
 	bfd.cpp    \
 	coff.cpp   \
--- a/tools/jprof/moz.build
+++ b/tools/jprof/moz.build
@ -5,3 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DIRS += ['stub']
+
+PROGRAM = 'jprof'
+
--- a/tools/trace-malloc/Makefile.in
+++ b/tools/trace-malloc/Makefile.in
@ -30,7 +30,6 @@ EXTRACSRCS = tmreader.c
 EXTRACPPSRCS = adreader.cpp

 ifndef MOZ_PROFILE_GENERATE
-PROGRAM		= spacetrace$(BIN_SUFFIX)

 PROGCSRCS = \
  spacetrace.c \
--- a/tools/trace-malloc/moz.build
+++ b/tools/trace-malloc/moz.build
@ -4,3 +4,5 @@
 # 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/.

+if not CONFIG['MOZ_PROFILE_GENERATE']:
+    PROGRAM = 'spacetrace'
--- a/webapprt/gtk2/Makefile.in
+++ b/webapprt/gtk2/Makefile.in
@ -11,8 +11,6 @@ FAIL_ON_WARNINGS := 1
 include $(DEPTH)/config/autoconf.mk

 # Build a binary bootstrapping with XRE_main
-PROGRAM = webapprt-stub
-
 CPPSRCS = webapprt.cpp

 LOCAL_INCLUDES += \
--- a/webapprt/gtk2/moz.build
+++ b/webapprt/gtk2/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'webapprt-stub'
+
--- a/webapprt/mac/Makefile.in
+++ b/webapprt/mac/Makefile.in
@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk
 # shouldn't get 755 perms need $(IFLAGS1) for either way of calling nsinstall.
 NSDISTMODE = copy

-PROGRAM = webapprt-stub$(BIN_SUFFIX)
-
 CMMSRCS = webapprt.mm

 # Don't create a dependency on mozglue, which is impossible (difficult?)
--- a/webapprt/mac/moz.build
+++ b/webapprt/mac/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'webapprt-stub'
+
--- a/webapprt/win/Makefile.in
+++ b/webapprt/win/Makefile.in
@ -10,8 +10,6 @@ VPATH     = @srcdir@
 include $(DEPTH)/config/autoconf.mk

 # Build a binary bootstrapping with XRE_main
-PROGRAM   = webapprt-stub$(BIN_SUFFIX)
-
 CPPSRCS   = webapprt.cpp

 # Statically link against the CRT
--- a/webapprt/win/moz.build
+++ b/webapprt/win/moz.build
@ -4,3 +4,5 @@
 # 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/.

+PROGRAM = 'webapprt-stub'
+
--- a/widget/xremoteclient/Makefile.in
+++ b/widget/xremoteclient/Makefile.in
@ -28,8 +28,6 @@ EXTRA_DSO_LDOPTS = \
 		$(MOZ_COMPONENT_LIBS) \
 		$(NULL)

-PROGRAM         = mozilla-xremote-client$(BIN_SUFFIX)
-
 PROGCPPSRCS = \
  mozilla-xremote-client.cpp \
  XRemoteClient.cpp \
--- a/widget/xremoteclient/moz.build
+++ b/widget/xremoteclient/moz.build
@ -6,3 +6,5 @@

 MODULE = 'xremoteclient'

+PROGRAM = 'mozilla-xremote-client'
+
--- a/xulrunner/app/Makefile.in
+++ b/xulrunner/app/Makefile.in
@ -15,8 +15,6 @@ GARBAGE += $(addprefix $(DIST)/bin/defaults/pref/,xulrunner.js)

 DEFINES += -DAB_CD=$(AB_CD)

-PROGRAM = xulrunner$(BIN_SUFFIX)
-
 DEFINES += -DXULRUNNER_PROGNAME=\"xulrunner\"

 ifdef TARGET_XPCOM_ABI
--- a/xulrunner/app/moz.build
+++ b/xulrunner/app/moz.build
@ -5,3 +5,6 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

 DIRS += ['profile']
+
+PROGRAM = 'xulrunner'
+
--- a/xulrunner/stub/Makefile.in
+++ b/xulrunner/stub/Makefile.in
@ -16,12 +16,6 @@ MOZ_GLUE_LDFLAGS =

 CPPSRCS   = nsXULStub.cpp

-# The value of XULRUNNER_STUB_NAME is generated by configure to allow XULRunner
-# apps to override it using the --with-xulrunner-stub-name=<appname> argument.
-# If this configure argument is not present then the default name is 'xulrunner'
-# for Mac OS X and 'xulrunner-stub' for all other platforms.
-PROGRAM   = $(XULRUNNER_STUB_NAME)$(BIN_SUFFIX)
-
 LOCAL_INCLUDES = \
  -I$(topsrcdir)/xpcom/build \
  -I$(topsrcdir)/xpcom/base \
--- a/xulrunner/stub/moz.build
+++ b/xulrunner/stub/moz.build
@ -6,3 +6,9 @@

 MODULE = 'xulrunner'

+# The value of XULRUNNER_STUB_NAME is generated by configure to allow XULRunner
+# apps to override it using the --with-xulrunner-stub-name=<appname> argument.
+# If this configure argument is not present then the default name is 'xulrunner'
+# for Mac OS X and 'xulrunner-stub' for all other platforms.
+PROGRAM = CONFIG['XULRUNNER_STUB_NAME']
+
--- a/xulrunner/tools/redit/Makefile.in
+++ b/xulrunner/tools/redit/Makefile.in
@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk

 ifeq ($(OS_ARCH),WINNT)
 CPPSRCS    = redit.cpp
-PROGRAM    = redit$(BIN_SUFFIX)

 SDK_BINARY =  \
 	$(PROGRAM) \
--- a/xulrunner/tools/redit/moz.build
+++ b/xulrunner/tools/redit/moz.build
@ -6,3 +6,5 @@

 MODULE = 'redit'

+if CONFIG['OS_ARCH'] == 'WINNT':
+    PROGRAM  = 'redit'