From a940e46079fbda5b00dbcde58366cc3ac017fa11 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Tue, 30 Apr 2013 21:09:41 -0400 Subject: [PATCH] Backed out changesets c7937fb5f4bb and cf8db9b6bd61 (bug 862986) for bustage. CLOSED TREE --- b2g/app/Makefile.in | 5 +++++ b2g/app/moz.build | 5 ----- b2g/gaia/Makefile.in | 2 ++ b2g/gaia/moz.build | 2 -- b2g/installer/Makefile.in | 1 + browser/app/Makefile.in | 2 ++ browser/app/moz.build | 3 --- browser/installer/Makefile.in | 1 + .../shell/commandexecutehandler/Makefile.in | 1 + .../shell/commandexecutehandler/moz.build | 1 - browser/metro/shell/linktool/Makefile.in | 2 ++ browser/metro/shell/linktool/moz.build | 2 -- browser/metro/shell/testing/Makefile.in | 2 ++ browser/metro/shell/testing/moz.build | 2 -- build/win32/Makefile.in | 1 + build/win32/moz.build | 2 -- configure.in | 17 ----------------- dom/plugins/ipc/hangui/Makefile.in | 2 ++ dom/plugins/ipc/hangui/moz.build | 2 -- embedding/tests/winEmbed/Makefile.in | 1 + embedding/tests/winEmbed/moz.build | 2 -- intl/unicharutil/tools/Makefile.in | 2 ++ intl/unicharutil/tools/moz.build | 2 -- ipc/app/Makefile.in | 3 +++ ipc/app/defs.mk | 14 ++++++++++++++ ipc/app/moz.build | 2 -- ipc/glue/Makefile.in | 5 +++++ ipc/ipdl/test/cxx/app/Makefile.in | 2 ++ ipc/ipdl/test/cxx/app/moz.build | 2 -- js/src/gdb/Makefile.in | 1 + js/src/gdb/moz.build | 2 -- js/src/jsapi-tests/Makefile.in | 2 ++ js/src/jsapi-tests/moz.build | 2 -- js/src/shell/Makefile.in | 1 + js/src/shell/moz.build | 2 -- js/xpconnect/shell/Makefile.in | 1 + js/xpconnect/shell/moz.build | 2 -- mobile/android/app/Makefile.in | 1 + mobile/android/app/moz.build | 3 --- mobile/android/base/Makefile.in | 1 + mobile/android/installer/Makefile.in | 2 ++ modules/libmar/tool/Makefile.in | 4 ++++ modules/libmar/tool/moz.build | 2 -- netwerk/streamconv/test/Makefile.in | 2 ++ netwerk/streamconv/test/moz.build | 2 -- .../mozbuild/mozbuild/backend/recursivemake.py | 7 ------- python/mozbuild/mozbuild/frontend/data.py | 18 ------------------ .../mozbuild/frontend/sandbox_symbols.py | 8 -------- .../test/frontend/data/program/moz.build | 4 ---- .../mozbuild/test/frontend/test_emitter.py | 13 ------------- rdf/tests/rdfcat/Makefile.in | 2 ++ rdf/tests/rdfcat/moz.build | 2 -- rdf/tests/rdfpoll/Makefile.in | 1 + rdf/tests/rdfpoll/moz.build | 2 -- rdf/tests/triplescat/Makefile.in | 2 ++ rdf/tests/triplescat/moz.build | 2 -- testing/mochitest/ssltunnel/Makefile.in | 2 ++ testing/mochitest/ssltunnel/moz.build | 2 -- testing/tools/screenshot/Makefile.in | 2 ++ testing/tools/screenshot/moz.build | 4 ---- .../components/maintenanceservice/Makefile.in | 1 + .../components/maintenanceservice/moz.build | 2 -- toolkit/crashreporter/client/Makefile.in | 1 + toolkit/crashreporter/client/moz.build | 2 -- toolkit/mozapps/installer/packager.mk | 2 ++ toolkit/mozapps/update/updater/Makefile.in | 2 ++ toolkit/mozapps/update/updater/moz.build | 2 -- tools/jprof/Makefile.in | 2 ++ tools/jprof/moz.build | 3 --- tools/trace-malloc/Makefile.in | 1 + tools/trace-malloc/moz.build | 2 -- webapprt/gtk2/Makefile.in | 2 ++ webapprt/gtk2/moz.build | 2 -- webapprt/mac/Makefile.in | 2 ++ webapprt/mac/moz.build | 2 -- webapprt/win/Makefile.in | 2 ++ webapprt/win/moz.build | 2 -- widget/xremoteclient/Makefile.in | 2 ++ widget/xremoteclient/moz.build | 2 -- xulrunner/app/Makefile.in | 2 ++ xulrunner/app/moz.build | 3 --- xulrunner/stub/Makefile.in | 6 ++++++ xulrunner/stub/moz.build | 6 ------ xulrunner/tools/redit/Makefile.in | 1 + xulrunner/tools/redit/moz.build | 2 -- 85 files changed, 96 insertions(+), 151 deletions(-) create mode 100644 ipc/app/defs.mk delete mode 100644 python/mozbuild/mozbuild/test/frontend/data/program/moz.build diff --git a/b2g/app/Makefile.in b/b2g/app/Makefile.in index 41a92f29134..5eaa045f4ad 100644 --- a/b2g/app/Makefile.in +++ b/b2g/app/Makefile.in @@ -18,6 +18,11 @@ 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 diff --git a/b2g/app/moz.build b/b2g/app/moz.build index 9abd79dcd7a..895d11993cf 100644 --- a/b2g/app/moz.build +++ b/b2g/app/moz.build @@ -4,8 +4,3 @@ # 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'] diff --git a/b2g/gaia/Makefile.in b/b2g/gaia/Makefile.in index c29b480d35f..f0bae448e71 100644 --- a/b2g/gaia/Makefile.in +++ b/b2g/gaia/Makefile.in @@ -11,6 +11,8 @@ include $(DEPTH)/config/autoconf.mk GAIA_PATH := gaia/profile +PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) + ifeq ($(OS_ARCH),WINNT) CPPSRCS = run-b2g.cpp DEFINES += \ diff --git a/b2g/gaia/moz.build b/b2g/gaia/moz.build index 75e290033c5..895d11993cf 100644 --- a/b2g/gaia/moz.build +++ b/b2g/gaia/moz.build @@ -4,5 +4,3 @@ # 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'] - diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in index 9c00d1f2324..16744f1bab3 100644 --- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -33,6 +33,7 @@ DEFINES += \ DEFINES += -DJAREXT= +include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) # Set MSVC dlls version to package, if any. diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in index 199f8746d01..bba59abe217 100644 --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in @@ -43,6 +43,8 @@ endif #} LIBXUL_SDK # Build a binary bootstrapping with XRE_main +PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX) + CPPSRCS = nsBrowserApp.cpp LOCAL_INCLUDES += \ diff --git a/browser/app/moz.build b/browser/app/moz.build index dc284bc8006..d616e1c4aa5 100644 --- a/browser/app/moz.build +++ b/browser/app/moz.build @@ -5,6 +5,3 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += ['profile/extensions'] - -PROGRAM = CONFIG['MOZ_APP_NAME'] - diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 5bc058ef5ed..1411a8b454b 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -69,6 +69,7 @@ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) endif +include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) # Set MSVC dlls version to package, if any. diff --git a/browser/metro/shell/commandexecutehandler/Makefile.in b/browser/metro/shell/commandexecutehandler/Makefile.in index 21436e930ee..20d72365b43 100644 --- a/browser/metro/shell/commandexecutehandler/Makefile.in +++ b/browser/metro/shell/commandexecutehandler/Makefile.in @@ -16,6 +16,7 @@ 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 diff --git a/browser/metro/shell/commandexecutehandler/moz.build b/browser/metro/shell/commandexecutehandler/moz.build index 68ce1ccdd4a..895d11993cf 100644 --- a/browser/metro/shell/commandexecutehandler/moz.build +++ b/browser/metro/shell/commandexecutehandler/moz.build @@ -4,4 +4,3 @@ # 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' diff --git a/browser/metro/shell/linktool/Makefile.in b/browser/metro/shell/linktool/Makefile.in index 3373c0b80b1..56bee83fd97 100644 --- a/browser/metro/shell/linktool/Makefile.in +++ b/browser/metro/shell/linktool/Makefile.in @@ -15,6 +15,8 @@ include $(topsrcdir)/config/config.mk DIST_SUBDIR = metro/install +PROGRAM = linktool$(BIN_SUFFIX) + CPPSRCS = linktool.cpp OS_LIBS = \ diff --git a/browser/metro/shell/linktool/moz.build b/browser/metro/shell/linktool/moz.build index e50ad540264..895d11993cf 100644 --- a/browser/metro/shell/linktool/moz.build +++ b/browser/metro/shell/linktool/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/browser/metro/shell/testing/Makefile.in b/browser/metro/shell/testing/Makefile.in index de3fec1e7bb..6cbe3b1f791 100644 --- a/browser/metro/shell/testing/Makefile.in +++ b/browser/metro/shell/testing/Makefile.in @@ -23,6 +23,8 @@ include $(topsrcdir)/config/config.mk # We want this exe in dist/bin DIST_SUBDIR = +PROGRAM = metrotestharness$(BIN_SUFFIX) + CPPSRCS = \ metrotestharness.cpp \ $(NULL) diff --git a/browser/metro/shell/testing/moz.build b/browser/metro/shell/testing/moz.build index a1387ba6e84..895d11993cf 100644 --- a/browser/metro/shell/testing/moz.build +++ b/browser/metro/shell/testing/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/build/win32/Makefile.in b/build/win32/Makefile.in index 1a77a7b2864..f006392a24c 100644 --- a/build/win32/Makefile.in +++ b/build/win32/Makefile.in @@ -13,6 +13,7 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1 ifdef ENABLE_TESTS +PROGRAM = crashinject$(BIN_SUFFIX) USE_STATIC_LIBS = 1 CPPSRCS = crashinject.cpp diff --git a/build/win32/moz.build b/build/win32/moz.build index c22520393c3..dd27849c930 100644 --- a/build/win32/moz.build +++ b/build/win32/moz.build @@ -9,5 +9,3 @@ if CONFIG['_MSC_VER'] and CONFIG['OS_TEST'] != 'x86_64': TEST_DIRS += ['crashinjectdll'] -if CONFIG['ENABLE_TESTS']: - PROGRAM = 'crashinject' diff --git a/configure.in b/configure.in index 8138823dd57..96771218feb 100644 --- a/configure.in +++ b/configure.in @@ -8650,23 +8650,6 @@ fi AC_DEFINE_UNQUOTED(MOZ_MACBUNDLE_ID,$MOZ_MACBUNDLE_ID) AC_SUBST(MOZ_MACBUNDLE_ID) -dnl ======================================================== -dnl = Child Process Name for IPC -dnl ======================================================== -if test "$MOZ_WIDGET_TOOLKIT" != "android"; then - MOZ_CHILD_PROCESS_NAME="plugin-container${BIN_SUFFIX}" -else - # We want to let Android unpack the file at install time, but it only does - # so if the file is named libsomething.so. The lib/ path is also required - # because the unpacked file will be under the lib/ subdirectory and will - # need to be executed from that path. - MOZ_CHILD_PROCESS_NAME="lib/libplugin-container.so" -fi -MOZ_CHILD_PROCESS_BUNDLE="plugin-container.app/Contents/MacOS/" - -AC_SUBST(MOZ_CHILD_PROCESS_NAME) -AC_SUBST(MOZ_CHILD_PROCESS_BUNDLE) - # The following variables are available to branding and application # configuration ($BRANDING/configure.sh and $APPLICATION/confvars.sh): # - MOZ_APP_VENDOR: Used for application.ini's "Vendor" field, which also diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in index 791497649bb..3cb772db3b0 100644 --- a/dom/plugins/ipc/hangui/Makefile.in +++ b/dom/plugins/ipc/hangui/Makefile.in @@ -15,6 +15,8 @@ CPPSRCS = \ PluginHangUIChild.cpp \ $(NULL) +PROGRAM = plugin-hang-ui$(BIN_SUFFIX) + OS_LIBS = $(call EXPAND_LIBNAME,comctl32) RCINCLUDE = HangUIDlg.rc diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build index 76f993ab180..895d11993cf 100644 --- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/embedding/tests/winEmbed/Makefile.in b/embedding/tests/winEmbed/Makefile.in index 5b3976dda95..80ee7489ce2 100644 --- a/embedding/tests/winEmbed/Makefile.in +++ b/embedding/tests/winEmbed/Makefile.in @@ -36,6 +36,7 @@ include $(DEPTH)/config/autoconf.mk XPI_NAME = winembed +PROGRAM = winEmbed$(BIN_SUFFIX) RESFILE = winEmbed.res CPPSRCS = \ diff --git a/embedding/tests/winEmbed/moz.build b/embedding/tests/winEmbed/moz.build index cf87423e7e3..4c81706e270 100644 --- a/embedding/tests/winEmbed/moz.build +++ b/embedding/tests/winEmbed/moz.build @@ -6,5 +6,3 @@ MODULE = 'winEmbed' -PROGRAM = 'winEmbed' - diff --git a/intl/unicharutil/tools/Makefile.in b/intl/unicharutil/tools/Makefile.in index 5879baff2ad..59732899319 100644 --- a/intl/unicharutil/tools/Makefile.in +++ b/intl/unicharutil/tools/Makefile.in @@ -10,6 +10,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = ucgendat + CSRCS = ucgendat.c # XXX need configure test diff --git a/intl/unicharutil/tools/moz.build b/intl/unicharutil/tools/moz.build index b1c8c8fdd8e..32799034288 100644 --- a/intl/unicharutil/tools/moz.build +++ b/intl/unicharutil/tools/moz.build @@ -6,5 +6,3 @@ MODULE = 'ucgendat' -PROGRAM = 'ucgendat' - diff --git a/ipc/app/Makefile.in b/ipc/app/Makefile.in index 4525b3e1f0d..193fada19ee 100644 --- a/ipc/app/Makefile.in +++ b/ipc/app/Makefile.in @@ -9,6 +9,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +include $(topsrcdir)/ipc/app/defs.mk +PROGRAM = $(MOZ_CHILD_PROCESS_NAME) + ifneq ($(dir $(PROGRAM)),./) GENERATED_DIRS = $(dir $(PROGRAM)) endif diff --git a/ipc/app/defs.mk b/ipc/app/defs.mk new file mode 100644 index 00000000000..4a236761a52 --- /dev/null +++ b/ipc/app/defs.mk @@ -0,0 +1,14 @@ +# 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/. + +ifneq (android,$(MOZ_WIDGET_TOOLKIT)) +MOZ_CHILD_PROCESS_NAME := plugin-container$(BIN_SUFFIX) +else +# We want to let Android unpack the file at install time, but it only does +# so if the file is named libsomething.so. The lib/ path is also required +# because the unpacked file will be under the lib/ subdirectory and will +# need to be executed from that path. +MOZ_CHILD_PROCESS_NAME := lib/libplugin-container.so +endif +MOZ_CHILD_PROCESS_BUNDLE := plugin-container.app/Contents/MacOS/ diff --git a/ipc/app/moz.build b/ipc/app/moz.build index 7ae35f48cd9..4e3b1f2e0c8 100644 --- a/ipc/app/moz.build +++ b/ipc/app/moz.build @@ -6,5 +6,3 @@ MODULE = 'ipc' -PROGRAM = CONFIG['MOZ_CHILD_PROCESS_NAME'] - diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index 93b4717fad5..3e554d55226 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -61,6 +61,7 @@ else CPPSRCS += ProcessUtils_none.cpp endif +include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\" DEFINES += -DMOZ_CHILD_PROCESS_BUNDLE=\"$(MOZ_CHILD_PROCESS_BUNDLE)\" @@ -68,3 +69,7 @@ include $(topsrcdir)/config/config.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk + +# Since we get the value of MOZ_CHILD_PROCESS_NAME from another file make sure +# to rebuild if that file changes. +$(CPPSRCS:%.cpp=%.$(OBJ_SUFFIX)): $(topsrcdir)/ipc/app/defs.mk diff --git a/ipc/ipdl/test/cxx/app/Makefile.in b/ipc/ipdl/test/cxx/app/Makefile.in index fd2b73fcf90..4c8b02ad20e 100644 --- a/ipc/ipdl/test/cxx/app/Makefile.in +++ b/ipc/ipdl/test/cxx/app/Makefile.in @@ -9,6 +9,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = $(MODULE)$(BIN_SUFFIX) + NSDISTMODE = copy LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre diff --git a/ipc/ipdl/test/cxx/app/moz.build b/ipc/ipdl/test/cxx/app/moz.build index 38e0f079f86..35efc0c9c3c 100644 --- a/ipc/ipdl/test/cxx/app/moz.build +++ b/ipc/ipdl/test/cxx/app/moz.build @@ -6,5 +6,3 @@ MODULE = 'ipdlunittest' -PROGRAM = 'ipdlunittest' - diff --git a/js/src/gdb/Makefile.in b/js/src/gdb/Makefile.in index b840feb5caf..eb24dc9c20b 100644 --- a/js/src/gdb/Makefile.in +++ b/js/src/gdb/Makefile.in @@ -11,6 +11,7 @@ VPATH = @srcdir@ @srcdir@/tests include $(DEPTH)/config/autoconf.mk +PROGRAM = gdb-tests$(BIN_SUFFIX) CPPSRCS = \ gdb-tests.cpp \ test-jsid.cpp \ diff --git a/js/src/gdb/moz.build b/js/src/gdb/moz.build index 8b10555b36a..895d11993cf 100644 --- a/js/src/gdb/moz.build +++ b/js/src/gdb/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/js/src/jsapi-tests/Makefile.in b/js/src/jsapi-tests/Makefile.in index 66b690a5133..14b27763222 100644 --- a/js/src/jsapi-tests/Makefile.in +++ b/js/src/jsapi-tests/Makefile.in @@ -11,6 +11,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = jsapi-tests$(BIN_SUFFIX) + CPPSRCS = \ tests.cpp \ selfTest.cpp \ diff --git a/js/src/jsapi-tests/moz.build b/js/src/jsapi-tests/moz.build index 1ab7ea6173e..895d11993cf 100644 --- a/js/src/jsapi-tests/moz.build +++ b/js/src/jsapi-tests/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/js/src/shell/Makefile.in b/js/src/shell/Makefile.in index 5872a7f042e..690e8d10395 100644 --- a/js/src/shell/Makefile.in +++ b/js/src/shell/Makefile.in @@ -11,6 +11,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = $(JS_SHELL_NAME)$(BIN_SUFFIX) CPPSRCS = \ js.cpp \ jsoptparse.cpp \ diff --git a/js/src/shell/moz.build b/js/src/shell/moz.build index 1de39bc6a21..895d11993cf 100644 --- a/js/src/shell/moz.build +++ b/js/src/shell/moz.build @@ -4,5 +4,3 @@ # 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'] - diff --git a/js/xpconnect/shell/Makefile.in b/js/xpconnect/shell/Makefile.in index 0ac21bc7d75..5e1673e35f3 100644 --- a/js/xpconnect/shell/Makefile.in +++ b/js/xpconnect/shell/Makefile.in @@ -10,6 +10,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = xpcshell$(BIN_SUFFIX) SDK_BINARY = $(PROGRAM) CPPSRCS = xpcshell.cpp diff --git a/js/xpconnect/shell/moz.build b/js/xpconnect/shell/moz.build index 3a1b3a49696..18de96425f0 100644 --- a/js/xpconnect/shell/moz.build +++ b/js/xpconnect/shell/moz.build @@ -6,5 +6,3 @@ MODULE = 'xpcshell' -PROGRAM = 'xpcshell' - diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in index 51761b45ba6..3b4d9ae3e66 100644 --- a/mobile/android/app/Makefile.in +++ b/mobile/android/app/Makefile.in @@ -16,6 +16,7 @@ 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 diff --git a/mobile/android/app/moz.build b/mobile/android/app/moz.build index 63b9bbf004d..895d11993cf 100644 --- a/mobile/android/app/moz.build +++ b/mobile/android/app/moz.build @@ -4,6 +4,3 @@ # 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'] diff --git a/mobile/android/base/Makefile.in b/mobile/android/base/Makefile.in index 4728ad3cec5..1aac89da49f 100644 --- a/mobile/android/base/Makefile.in +++ b/mobile/android/base/Makefile.in @@ -8,6 +8,7 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +include $(topsrcdir)/ipc/app/defs.mk DIST_FILES = package-name.txt diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in index 39e2c013767..d5a1f20dd51 100644 --- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -37,6 +37,8 @@ DEFINES += \ $(NULL) DEFINES += -DJAREXT= + +include $(topsrcdir)/ipc/app/defs.mk DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) ifdef MOZ_PKG_MANIFEST_P diff --git a/modules/libmar/tool/Makefile.in b/modules/libmar/tool/Makefile.in index 03aa096ddc3..ea39cf4109a 100644 --- a/modules/libmar/tool/Makefile.in +++ b/modules/libmar/tool/Makefile.in @@ -20,6 +20,10 @@ 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 = diff --git a/modules/libmar/tool/moz.build b/modules/libmar/tool/moz.build index ab0bd2f8f31..02d8ccf62a7 100644 --- a/modules/libmar/tool/moz.build +++ b/modules/libmar/tool/moz.build @@ -6,5 +6,3 @@ MODULE = 'mar' -if CONFIG['MOZ_ENABLE_SIGNMAR']: - PROGRAM = 'signmar' diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in index 879a3672d9e..a9fdf234df5 100644 --- a/netwerk/streamconv/test/Makefile.in +++ b/netwerk/streamconv/test/Makefile.in @@ -11,6 +11,8 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk +PROGRAM = TestStreamConv$(BIN_SUFFIX) + CPPSRCS = \ Converters.cpp \ TestStreamConv.cpp \ diff --git a/netwerk/streamconv/test/moz.build b/netwerk/streamconv/test/moz.build index 8776ec023ab..07c98b824e2 100644 --- a/netwerk/streamconv/test/moz.build +++ b/netwerk/streamconv/test/moz.build @@ -6,5 +6,3 @@ MODULE = 'TestStreamConv' -PROGRAM = 'TestStreamConv' - diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py index d7ff370fb4c..39e298ee077 100644 --- a/python/mozbuild/mozbuild/backend/recursivemake.py +++ b/python/mozbuild/mozbuild/backend/recursivemake.py @@ -16,7 +16,6 @@ from ..frontend.data import ( SandboxDerived, VariablePassthru, Exports, - Program, XpcshellManifests, ) from ..util import FileAvoidWrite @@ -215,9 +214,6 @@ class RecursiveMakeBackend(BuildBackend): 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) @@ -329,8 +325,5 @@ 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)) diff --git a/python/mozbuild/mozbuild/frontend/data.py b/python/mozbuild/mozbuild/frontend/data.py index 287a8a3e2a1..cec24227033 100644 --- a/python/mozbuild/mozbuild/frontend/data.py +++ b/python/mozbuild/mozbuild/frontend/data.py @@ -149,24 +149,6 @@ 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). diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py index 5f08aee2bd8..553820e2c9c 100644 --- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py +++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py @@ -167,14 +167,6 @@ 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). diff --git a/python/mozbuild/mozbuild/test/frontend/data/program/moz.build b/python/mozbuild/mozbuild/test/frontend/data/program/moz.build deleted file mode 100644 index 90eeba80af4..00000000000 --- a/python/mozbuild/mozbuild/test/frontend/data/program/moz.build +++ /dev/null @@ -1,4 +0,0 @@ -# Any copyright is dedicated to the Public Domain. -# http://creativecommons.org/publicdomain/zero/1.0/ - -PROGRAM = 'test_program' diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index a0f7394dd60..ec82f5e3297 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -15,7 +15,6 @@ from mozbuild.frontend.data import ( ReaderSummary, VariablePassthru, Exports, - Program, XpcshellManifests, ) from mozbuild.frontend.emitter import TreeMetadataEmitter @@ -32,7 +31,6 @@ 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'] = '.prog' return BuildReader(config) @@ -172,17 +170,6 @@ 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.prog') - def test_xpcshell_manifests(self): reader = self.reader('xpcshell_manifests') objs = self.read_topsrcdir(reader) diff --git a/rdf/tests/rdfcat/Makefile.in b/rdf/tests/rdfcat/Makefile.in index 7795d91e62b..df0d1c2d367 100644 --- a/rdf/tests/rdfcat/Makefile.in +++ b/rdf/tests/rdfcat/Makefile.in @@ -10,6 +10,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = rdfcat$(BIN_SUFFIX) + CPPSRCS = rdfcat.cpp LIBS = \ diff --git a/rdf/tests/rdfcat/moz.build b/rdf/tests/rdfcat/moz.build index eec80ce6bbc..895d11993cf 100644 --- a/rdf/tests/rdfcat/moz.build +++ b/rdf/tests/rdfcat/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/rdf/tests/rdfpoll/Makefile.in b/rdf/tests/rdfpoll/Makefile.in index e7cc6011301..a6265d84e8c 100644 --- a/rdf/tests/rdfpoll/Makefile.in +++ b/rdf/tests/rdfpoll/Makefile.in @@ -10,6 +10,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = rdfpoll$(BIN_SUFFIX) CPPSRCS = rdfpoll.cpp diff --git a/rdf/tests/rdfpoll/moz.build b/rdf/tests/rdfpoll/moz.build index a82aadc53a3..895d11993cf 100644 --- a/rdf/tests/rdfpoll/moz.build +++ b/rdf/tests/rdfpoll/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/rdf/tests/triplescat/Makefile.in b/rdf/tests/triplescat/Makefile.in index 096ac9ef9c1..196e1fe9767 100644 --- a/rdf/tests/triplescat/Makefile.in +++ b/rdf/tests/triplescat/Makefile.in @@ -10,6 +10,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = triplescat$(BIN_SUFFIX) + CPPSRCS = triplescat.cpp LIBS = \ diff --git a/rdf/tests/triplescat/moz.build b/rdf/tests/triplescat/moz.build index da6280dfed2..895d11993cf 100644 --- a/rdf/tests/triplescat/moz.build +++ b/rdf/tests/triplescat/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/testing/mochitest/ssltunnel/Makefile.in b/testing/mochitest/ssltunnel/Makefile.in index 98a35a2b317..9cd67b6b293 100644 --- a/testing/mochitest/ssltunnel/Makefile.in +++ b/testing/mochitest/ssltunnel/Makefile.in @@ -14,6 +14,8 @@ include $(DEPTH)/config/autoconf.mk # wrappers STL_FLAGS = +PROGRAM = ssltunnel$(BIN_SUFFIX) + CPPSRCS = ssltunnel.cpp LIBS = \ diff --git a/testing/mochitest/ssltunnel/moz.build b/testing/mochitest/ssltunnel/moz.build index ac250113dd1..895d11993cf 100644 --- a/testing/mochitest/ssltunnel/moz.build +++ b/testing/mochitest/ssltunnel/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/testing/tools/screenshot/Makefile.in b/testing/tools/screenshot/Makefile.in index 8ffb9d0a5ae..d5e0846cd42 100644 --- a/testing/tools/screenshot/Makefile.in +++ b/testing/tools/screenshot/Makefile.in @@ -12,6 +12,7 @@ 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) @@ -21,6 +22,7 @@ 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 = diff --git a/testing/tools/screenshot/moz.build b/testing/tools/screenshot/moz.build index 92192296c94..895d11993cf 100644 --- a/testing/tools/screenshot/moz.build +++ b/testing/tools/screenshot/moz.build @@ -4,7 +4,3 @@ # 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' diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in index b4249ab8602..45ad492bb6e 100644 --- a/toolkit/components/maintenanceservice/Makefile.in +++ b/toolkit/components/maintenanceservice/Makefile.in @@ -21,6 +21,7 @@ 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 diff --git a/toolkit/components/maintenanceservice/moz.build b/toolkit/components/maintenanceservice/moz.build index a37da1f4bcd..895d11993cf 100644 --- a/toolkit/components/maintenanceservice/moz.build +++ b/toolkit/components/maintenanceservice/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in index b39da8f2da9..caa1223dde2 100644 --- a/toolkit/crashreporter/client/Makefile.in +++ b/toolkit/crashreporter/client/Makefile.in @@ -16,6 +16,7 @@ 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. diff --git a/toolkit/crashreporter/client/moz.build b/toolkit/crashreporter/client/moz.build index 1726547bbf0..c6dbe4973e6 100644 --- a/toolkit/crashreporter/client/moz.build +++ b/toolkit/crashreporter/client/moz.build @@ -6,8 +6,6 @@ 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'] diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 06a9990743c..71abbb2fba3 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -307,6 +307,8 @@ NON_DIST_FILES = \ UPLOAD_EXTRA_FILES += gecko-unsigned-unaligned.apk +include $(MOZILLA_DIR)/ipc/app/defs.mk + DIST_FILES += $(MOZ_CHILD_PROCESS_NAME) ifeq ($(CPU_ARCH),x86) diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index e6d38c413ff..7a8284f71ae 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -22,6 +22,8 @@ CPPSRCS += \ $(NULL) endif +PROGRAM = updater$(BIN_SUFFIX) + # Don't link the updater against libmozglue. See bug 687139 MOZ_GLUE_LDFLAGS = MOZ_GLUE_PROGRAM_LDFLAGS = diff --git a/toolkit/mozapps/update/updater/moz.build b/toolkit/mozapps/update/updater/moz.build index 43f8edcc08a..895d11993cf 100644 --- a/toolkit/mozapps/update/updater/moz.build +++ b/toolkit/mozapps/update/updater/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/tools/jprof/Makefile.in b/tools/jprof/Makefile.in index f77cd053155..7155efd6d45 100644 --- a/tools/jprof/Makefile.in +++ b/tools/jprof/Makefile.in @@ -11,6 +11,8 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +PROGRAM = jprof + CPPSRCS = \ bfd.cpp \ coff.cpp \ diff --git a/tools/jprof/moz.build b/tools/jprof/moz.build index 010aca0bb4c..ea30023fffc 100644 --- a/tools/jprof/moz.build +++ b/tools/jprof/moz.build @@ -5,6 +5,3 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += ['stub'] - -PROGRAM = 'jprof' - diff --git a/tools/trace-malloc/Makefile.in b/tools/trace-malloc/Makefile.in index ac61159a713..e1e7b400320 100644 --- a/tools/trace-malloc/Makefile.in +++ b/tools/trace-malloc/Makefile.in @@ -30,6 +30,7 @@ EXTRACSRCS = tmreader.c EXTRACPPSRCS = adreader.cpp ifndef MOZ_PROFILE_GENERATE +PROGRAM = spacetrace$(BIN_SUFFIX) PROGCSRCS = \ spacetrace.c \ diff --git a/tools/trace-malloc/moz.build b/tools/trace-malloc/moz.build index 3dfb77c4783..895d11993cf 100644 --- a/tools/trace-malloc/moz.build +++ b/tools/trace-malloc/moz.build @@ -4,5 +4,3 @@ # 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' diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in index 9e8f1495faf..31e1e73efed 100644 --- a/webapprt/gtk2/Makefile.in +++ b/webapprt/gtk2/Makefile.in @@ -11,6 +11,8 @@ FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk # Build a binary bootstrapping with XRE_main +PROGRAM = webapprt-stub + CPPSRCS = webapprt.cpp LOCAL_INCLUDES += \ diff --git a/webapprt/gtk2/moz.build b/webapprt/gtk2/moz.build index 7e67568325d..895d11993cf 100644 --- a/webapprt/gtk2/moz.build +++ b/webapprt/gtk2/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/webapprt/mac/Makefile.in b/webapprt/mac/Makefile.in index 9f67ef7664f..d1c10639894 100644 --- a/webapprt/mac/Makefile.in +++ b/webapprt/mac/Makefile.in @@ -13,6 +13,8 @@ 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?) diff --git a/webapprt/mac/moz.build b/webapprt/mac/moz.build index 7e67568325d..895d11993cf 100644 --- a/webapprt/mac/moz.build +++ b/webapprt/mac/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/webapprt/win/Makefile.in b/webapprt/win/Makefile.in index 497ca0bba26..6448bbe0b29 100644 --- a/webapprt/win/Makefile.in +++ b/webapprt/win/Makefile.in @@ -10,6 +10,8 @@ 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 diff --git a/webapprt/win/moz.build b/webapprt/win/moz.build index 7e67568325d..895d11993cf 100644 --- a/webapprt/win/moz.build +++ b/webapprt/win/moz.build @@ -4,5 +4,3 @@ # 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' - diff --git a/widget/xremoteclient/Makefile.in b/widget/xremoteclient/Makefile.in index d0deda98c78..258bc58e205 100644 --- a/widget/xremoteclient/Makefile.in +++ b/widget/xremoteclient/Makefile.in @@ -28,6 +28,8 @@ EXTRA_DSO_LDOPTS = \ $(MOZ_COMPONENT_LIBS) \ $(NULL) +PROGRAM = mozilla-xremote-client$(BIN_SUFFIX) + PROGCPPSRCS = \ mozilla-xremote-client.cpp \ XRemoteClient.cpp \ diff --git a/widget/xremoteclient/moz.build b/widget/xremoteclient/moz.build index 69537384c61..468420d43fc 100644 --- a/widget/xremoteclient/moz.build +++ b/widget/xremoteclient/moz.build @@ -6,5 +6,3 @@ MODULE = 'xremoteclient' -PROGRAM = 'mozilla-xremote-client' - diff --git a/xulrunner/app/Makefile.in b/xulrunner/app/Makefile.in index 682c0f7ed86..b9f1bb18e2b 100644 --- a/xulrunner/app/Makefile.in +++ b/xulrunner/app/Makefile.in @@ -15,6 +15,8 @@ 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 diff --git a/xulrunner/app/moz.build b/xulrunner/app/moz.build index e04698d04a5..a25b363c6a5 100644 --- a/xulrunner/app/moz.build +++ b/xulrunner/app/moz.build @@ -5,6 +5,3 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. DIRS += ['profile'] - -PROGRAM = 'xulrunner' - diff --git a/xulrunner/stub/Makefile.in b/xulrunner/stub/Makefile.in index 9a986de4a2f..87273dd14d0 100644 --- a/xulrunner/stub/Makefile.in +++ b/xulrunner/stub/Makefile.in @@ -16,6 +16,12 @@ 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= 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 \ diff --git a/xulrunner/stub/moz.build b/xulrunner/stub/moz.build index fa5010a619c..c85f94c657f 100644 --- a/xulrunner/stub/moz.build +++ b/xulrunner/stub/moz.build @@ -6,9 +6,3 @@ 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= 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'] - diff --git a/xulrunner/tools/redit/Makefile.in b/xulrunner/tools/redit/Makefile.in index 059bf89c6d9..c4e9b7e9a0f 100644 --- a/xulrunner/tools/redit/Makefile.in +++ b/xulrunner/tools/redit/Makefile.in @@ -11,6 +11,7 @@ include $(DEPTH)/config/autoconf.mk ifeq ($(OS_ARCH),WINNT) CPPSRCS = redit.cpp +PROGRAM = redit$(BIN_SUFFIX) SDK_BINARY = \ $(PROGRAM) \ diff --git a/xulrunner/tools/redit/moz.build b/xulrunner/tools/redit/moz.build index f72e38e3e81..9ee15dd9c95 100644 --- a/xulrunner/tools/redit/moz.build +++ b/xulrunner/tools/redit/moz.build @@ -6,5 +6,3 @@ MODULE = 'redit' -if CONFIG['OS_ARCH'] == 'WINNT': - PROGRAM = 'redit'