mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Backed out changesets c7937fb5f4bb and cf8db9b6bd61 (bug 862986) for bustage.
CLOSED TREE
This commit is contained in:
Ryan VanderMeulen
parent
9305158b76
commit
a940e46079
@ -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
|
||||
|
||||
|
||||
@ -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']
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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']
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -5,6 +5,3 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += ['profile/extensions']
|
||||
|
||||
PROGRAM = CONFIG['MOZ_APP_NAME']
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -15,6 +15,8 @@ include $(topsrcdir)/config/config.mk
|
||||
|
||||
DIST_SUBDIR = metro/install
|
||||
|
||||
PROGRAM = linktool$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = linktool.cpp
|
||||
|
||||
OS_LIBS = \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ NO_PROFILE_GUIDED_OPTIMIZE = 1
|
||||
|
||||
ifdef ENABLE_TESTS
|
||||
|
||||
PROGRAM = crashinject$(BIN_SUFFIX)
|
||||
USE_STATIC_LIBS = 1
|
||||
CPPSRCS = crashinject.cpp
|
||||
|
||||
|
||||
@ -9,5 +9,3 @@ if CONFIG['_MSC_VER'] and CONFIG['OS_TEST'] != 'x86_64':
|
||||
|
||||
TEST_DIRS += ['crashinjectdll']
|
||||
|
||||
if CONFIG['ENABLE_TESTS']:
|
||||
PROGRAM = 'crashinject'
|
||||
|
||||
17
configure.in
17
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
|
||||
|
||||
@ -15,6 +15,8 @@ CPPSRCS = \
|
||||
PluginHangUIChild.cpp \
|
||||
$(NULL)
|
||||
|
||||
PROGRAM = plugin-hang-ui$(BIN_SUFFIX)
|
||||
|
||||
OS_LIBS = $(call EXPAND_LIBNAME,comctl32)
|
||||
|
||||
RCINCLUDE = HangUIDlg.rc
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -36,6 +36,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
XPI_NAME = winembed
|
||||
|
||||
PROGRAM = winEmbed$(BIN_SUFFIX)
|
||||
RESFILE = winEmbed.res
|
||||
|
||||
CPPSRCS = \
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'winEmbed'
|
||||
|
||||
PROGRAM = 'winEmbed'
|
||||
|
||||
|
||||
@ -10,6 +10,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = ucgendat
|
||||
|
||||
CSRCS = ucgendat.c
|
||||
|
||||
# XXX need configure test
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'ucgendat'
|
||||
|
||||
PROGRAM = 'ucgendat'
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
14
ipc/app/defs.mk
Normal file
14
ipc/app/defs.mk
Normal file
@ -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/
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'ipc'
|
||||
|
||||
PROGRAM = CONFIG['MOZ_CHILD_PROCESS_NAME']
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -9,6 +9,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = $(MODULE)$(BIN_SUFFIX)
|
||||
|
||||
NSDISTMODE = copy
|
||||
|
||||
LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'ipdlunittest'
|
||||
|
||||
PROGRAM = 'ipdlunittest'
|
||||
|
||||
|
||||
@ -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 \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -11,6 +11,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = jsapi-tests$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = \
|
||||
tests.cpp \
|
||||
selfTest.cpp \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = $(JS_SHELL_NAME)$(BIN_SUFFIX)
|
||||
CPPSRCS = \
|
||||
js.cpp \
|
||||
jsoptparse.cpp \
|
||||
|
||||
@ -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']
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = xpcshell$(BIN_SUFFIX)
|
||||
SDK_BINARY = $(PROGRAM)
|
||||
|
||||
CPPSRCS = xpcshell.cpp
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'xpcshell'
|
||||
|
||||
PROGRAM = 'xpcshell'
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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']
|
||||
|
||||
@ -8,6 +8,7 @@ srcdir = @srcdir@
|
||||
VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
include $(topsrcdir)/ipc/app/defs.mk
|
||||
|
||||
DIST_FILES = package-name.txt
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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 =
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'mar'
|
||||
|
||||
if CONFIG['MOZ_ENABLE_SIGNMAR']:
|
||||
PROGRAM = 'signmar'
|
||||
|
||||
@ -11,6 +11,8 @@ FAIL_ON_WARNINGS := 1
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = TestStreamConv$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = \
|
||||
Converters.cpp \
|
||||
TestStreamConv.cpp \
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'TestStreamConv'
|
||||
|
||||
PROGRAM = 'TestStreamConv'
|
||||
|
||||
|
||||
@ -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))
|
||||
|
||||
@ -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).
|
||||
|
||||
|
||||
@ -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).
|
||||
|
||||
@ -1,4 +0,0 @@
|
||||
# Any copyright is dedicated to the Public Domain.
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/
|
||||
|
||||
PROGRAM = 'test_program'
|
||||
@ -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)
|
||||
|
||||
@ -10,6 +10,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = rdfcat$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = rdfcat.cpp
|
||||
|
||||
LIBS = \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -10,6 +10,7 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = rdfpoll$(BIN_SUFFIX)
|
||||
CPPSRCS = rdfpoll.cpp
|
||||
|
||||
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -10,6 +10,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = triplescat$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = triplescat.cpp
|
||||
|
||||
LIBS = \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -14,6 +14,8 @@ include $(DEPTH)/config/autoconf.mk
|
||||
# wrappers
|
||||
STL_FLAGS =
|
||||
|
||||
PROGRAM = ssltunnel$(BIN_SUFFIX)
|
||||
|
||||
CPPSRCS = ssltunnel.cpp
|
||||
|
||||
LIBS = \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -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 =
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -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']
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -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 =
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -11,6 +11,8 @@ VPATH = @srcdir@
|
||||
|
||||
include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
PROGRAM = jprof
|
||||
|
||||
CPPSRCS = \
|
||||
bfd.cpp \
|
||||
coff.cpp \
|
||||
|
||||
@ -5,6 +5,3 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += ['stub']
|
||||
|
||||
PROGRAM = 'jprof'
|
||||
|
||||
|
||||
@ -30,6 +30,7 @@ EXTRACSRCS = tmreader.c
|
||||
EXTRACPPSRCS = adreader.cpp
|
||||
|
||||
ifndef MOZ_PROFILE_GENERATE
|
||||
PROGRAM = spacetrace$(BIN_SUFFIX)
|
||||
|
||||
PROGCSRCS = \
|
||||
spacetrace.c \
|
||||
|
||||
@ -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'
|
||||
|
||||
@ -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 += \
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -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?)
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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'
|
||||
|
||||
|
||||
@ -28,6 +28,8 @@ EXTRA_DSO_LDOPTS = \
|
||||
$(MOZ_COMPONENT_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
PROGRAM = mozilla-xremote-client$(BIN_SUFFIX)
|
||||
|
||||
PROGCPPSRCS = \
|
||||
mozilla-xremote-client.cpp \
|
||||
XRemoteClient.cpp \
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'xremoteclient'
|
||||
|
||||
PROGRAM = 'mozilla-xremote-client'
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
@ -5,6 +5,3 @@
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += ['profile']
|
||||
|
||||
PROGRAM = 'xulrunner'
|
||||
|
||||
|
||||
@ -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=<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 \
|
||||
|
||||
@ -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=<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']
|
||||
|
||||
|
||||
@ -11,6 +11,7 @@ include $(DEPTH)/config/autoconf.mk
|
||||
|
||||
ifeq ($(OS_ARCH),WINNT)
|
||||
CPPSRCS = redit.cpp
|
||||
PROGRAM = redit$(BIN_SUFFIX)
|
||||
|
||||
SDK_BINARY = \
|
||||
$(PROGRAM) \
|
||||
|
||||
@ -6,5 +6,3 @@
|
||||
|
||||
MODULE = 'redit'
|
||||
|
||||
if CONFIG['OS_ARCH'] == 'WINNT':
|
||||
PROGRAM = 'redit'
|
||||
|
||||
Loading…
Reference in New Issue
Block a user