wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 897909 - Cleanup some SIMPLE_PROGRAMS; r=gps

Browse Source 
* * *
FOLD
This commit is contained in:
Ms2ger 2013-08-14 09:00:13 +02:00
parent 22cd3d5e7d
commit 93933b0de8
22 changed files with 186 additions and 172 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
intl/uconv/tools/Makefile.in
View File

@ -10,17 +10,8 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DISABLED_CSRCS = \
umaptable.c \
$(NULL)
SIMPLE_PROGRAMS = $(DISABLED_CSRCS:.c=$(BIN_SUFFIX))
include $(topsrcdir)/config/rules.mk
INCLUDES += \
$(NULL)
# needed for mac linux
ifeq ($(OS_ARCH),Linux)
ifneq ($(OS_RELEASE),1.2)

9
intl/uconv/tools/moz.build
View File

@ -4,11 +4,16 @@
# 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/.
sources = [
'umaptable',
]
CSRCS += [
'umaptable.c',
'%s.c' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
"%s%s" % (fyl[0:-2], bin_suffix) for fyl in CSRCS
'%s%s' % (s, bin_suffix) for s in sources
]

34
netwerk/test/Makefile.in
View File

@ -12,40 +12,6 @@ relativesrcdir = @relativesrcdir@
FAIL_ON_WARNINGS := 1
include $(DEPTH)/config/autoconf.mk
cppsrcs = \
TestIncrementalDownload.cpp \
TestStreamLoader.cpp \
PropertiesTest.cpp \
urltest.cpp \
TestCallbacks.cpp \
TestPageLoad.cpp \
TestURLParser.cpp \
TestStandardURL.cpp \
TestUpload.cpp \
TestBlockingSocket.cpp \
TestDNS.cpp \
TestOpen.cpp \
TestCookie.cpp \
TestServ.cpp \
ReadNTLM.cpp \
TestProtocols.cpp \
$(NULL)
DISABLED_SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX))
# XXX Make this work in libxul builds.
#SIMPLE_PROGRAMS += \
# TestPerf$(BIN_SUFFIX) \
# TestIDN$(BIN_SUFFIX) \
# TestSocketTransport$(BIN_SUFFIX) \
# TestStreamTransport$(BIN_SUFFIX) \
# TestStreamChannel$(BIN_SUFFIX) \
# TestStreamPump$(BIN_SUFFIX) \
# TestIOThreads$(BIN_SUFFIX) \
# TestUDPSocketProvider$(BIN_SUFFIX) \
# $(NULL)
include $(topsrcdir)/config/config.mk
LIBS = $(XPCOM_LIBS) \

50
netwerk/test/moz.build
View File

@ -14,28 +14,44 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
if CONFIG['OS_ARCH'] != 'Darwin':
XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
sources = [
'PropertiesTest',
'ReadNTLM',
'TestBlockingSocket',
'TestCallbacks',
'TestCookie',
'TestDNS',
'TestIncrementalDownload',
'TestOpen',
'TestPageLoad',
'TestProtocols',
'TestServ',
'TestStandardURL',
'TestStreamLoader',
'TestURLParser',
'TestUpload',
'urltest',
]
# XXX Make this work in libxul builds.
#sources += [
# TestIDN',
# TestIOThreads',
# TestPerf',
# TestSocketTransport',
# TestStreamChannel',
# TestStreamPump',
# TestStreamTransport',
# TestUDPSocketProvider',
#]
CPP_SOURCES += [
'PropertiesTest.cpp',
'ReadNTLM.cpp',
'TestBlockingSocket.cpp',
'TestCallbacks.cpp',
'TestCookie.cpp',
'TestDNS.cpp',
'TestIncrementalDownload.cpp',
'TestOpen.cpp',
'TestPageLoad.cpp',
'TestProtocols.cpp',
'TestServ.cpp',
'TestStandardURL.cpp',
'TestStreamLoader.cpp',
'TestURLParser.cpp',
'TestUpload.cpp',
'urltest.cpp',
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
"%s%s" % (x[0:-4], bin_suffix) for x in CPP_SOURCES
'%s%s' % (s, bin_suffix) for s in sources
]
CPP_UNIT_TESTS += [

6
security/manager/ssl/tests/unit/test_ocsp_stapling/Makefile.in
View File

@ -13,12 +13,6 @@ FAIL_ON_WARNINGS := 1
include $(DEPTH)/config/autoconf.mk
CPPSRCS = \
OCSPStaplingServer.cpp \
$(NULL)
SIMPLE_PROGRAMS := $(CPPSRCS:.cpp=$(BIN_SUFFIX))
include $(topsrcdir)/config/config.mk
LIBS = \

12
security/manager/ssl/tests/unit/test_ocsp_stapling/moz.build
View File

@ -6,3 +6,15 @@
MODULE = 'pipnss'
sources = [
'OCSPStaplingServer',
]
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]

10
toolkit/mozapps/plugins/tests/Makefile.in
View File

@ -21,17 +21,15 @@ MOCHITEST_BROWSER_FILES = \
BadExtension.xpi \
$(NULL)
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
PROGRAMS = $(SIMPLE_PROGRAMS:%$(BIN_SUFFIX)=$(TESTROOT)/%)
programs = $(SIMPLE_PROGRAMS:%$(BIN_SUFFIX)=$(TESTROOT)/%)
include $(topsrcdir)/config/rules.mk
$(PROGRAMS): $(TESTROOT)
$(programs): $(TESTROOT)
$(TESTROOT):
$(NSINSTALL) -D $@
$(PROGRAMS): $(TESTROOT)/% : %$(BIN_SUFFIX)
$(programs): $(TESTROOT)/% : %$(BIN_SUFFIX)
cp $< $@
libs:: $(PROGRAMS)
libs:: $(programs)

14
toolkit/mozapps/plugins/tests/moz.build
View File

@ -6,8 +6,16 @@
MODULE = 'test_plugins'
CPP_SOURCES += [
'BadPlugin.cpp',
'GoodPlugin.cpp',
sources = [
'BadPlugin',
'GoodPlugin',
]
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]

2
toolkit/xre/test/win/Makefile.in
View File

@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk
OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32)
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
LOCAL_INCLUDES += \
-I$(srcdir) \
-I$(topsrcdir)/toolkit/xre \

15
toolkit/xre/test/win/moz.build
View File

@ -6,8 +6,17 @@
MODULE = 'test_xulapp'
CPP_SOURCES += [
'TestDllInterceptor.cpp',
'TestXREMakeCommandLineWin.cpp',
sources = [
'TestDllInterceptor',
'TestXREMakeCommandLineWin',
]
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]

20
tools/trace-malloc/Makefile.in
View File

@ -10,22 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
SIMPLECSRCS += \
leakstats.c \
tmstats.c \
$(NULL)
SIMPLECPPSRCS = \
leaksoup.cpp \
bloatblame.cpp \
$(NULL)
SIMPLE_PROGRAMS = \
$(SIMPLECSRCS:.c=$(BIN_SUFFIX)) \
$(SIMPLECPPSRCS:.cpp=$(BIN_SUFFIX)) \
$(NULL)
EXTRACSRCS = tmreader.c
EXTRACPPSRCS = adreader.cpp
@ -40,7 +24,9 @@ PROGCSRCS = \
PROGOBJS = $(PROGCSRCS:.c=.$(OBJ_SUFFIX))
endif
CSRCS = $(SIMPLECSRCS) $(EXTRACSRCS) $(PROGCSRCS)
CSRCS += $(EXTRACSRCS) $(PROGCSRCS)
CPPSRCS += $(EXTRACPPSRCS)
ifeq ($(OS_ARCH),WINNT)
LOCAL_INCLUDES += -I$(topsrcdir)/config/os2
endif

32
tools/trace-malloc/moz.build
View File

@ -7,7 +7,33 @@
if not CONFIG['MOZ_PROFILE_GENERATE']:
PROGRAM = 'spacetrace'
CPP_SOURCES += [
'$(EXTRACPPSRCS)',
'$(SIMPLECPPSRCS)',
bin_suffix = CONFIG['BIN_SUFFIX']
simple_c_sources = [
'leakstats',
'tmstats',
]
CSRCS += [
'%s.c' % s for s in simple_c_sources
]
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in simple_c_sources
]
simple_cpp_sources = [
'bloatblame',
'leaksoup',
]
CPP_SOURCES += [
'%s.cpp' % s for s in simple_cpp_sources
]
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in simple_cpp_sources
]

2
uriloader/exthandler/tests/Makefile.in
View File

@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk
FAIL_ON_WARNINGS = 1
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
include $(topsrcdir)/config/config.mk
LIBS += \

14
uriloader/exthandler/tests/moz.build
View File

@ -14,6 +14,16 @@ XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
if CONFIG['OS_ARCH'] != 'Darwin':
XPCSHELL_TESTS_MANIFESTS += ['unit_ipc/xpcshell.ini']
CPP_SOURCES += [
'WriteArgument.cpp',
sources = [
'WriteArgument',
]
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]

2
xpcom/reflect/xptcall/tests/Makefile.in
View File

@ -10,8 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
SIMPLE_PROGRAMS = TestXPTCInvoke$(BIN_SUFFIX)
LIBS = \
$(XPCOM_GLUE_LDOPTS) \
$(NSPR_LIBS) \

12
xpcom/reflect/xptcall/tests/moz.build
View File

@ -6,7 +6,15 @@
MODULE = 'TestXPTC'
CPP_SOURCES += [
'TestXPTCInvoke.cpp',
sources = [
'TestXPTCInvoke',
]
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]

29
xpcom/tests/Makefile.in
View File

@ -14,35 +14,6 @@ FAIL_ON_WARNINGS = 1
VPATH += $(topsrcdir)/build
# This can be deleted when SIMPLE_PROGRAMS is in moz.build
cppsrcs = \
nsIFileEnumerator.cpp \
TestCallTemplates.cpp \
TestINIParser.cpp \
TestPRIntN.cpp \
TestRacingServiceManager.cpp \
TestRegistrationOrder.cpp \
TestThreadPoolListener.cpp \
TestTimers.cpp \
TestBlockingProcess.cpp \
TestQuickReturn.cpp \
TestArguments.cpp \
TestUnicodeArguments.cpp \
$(NULL)
# This can be deleted when SIMPLE_PROGRAMS is in moz.build
ifeq ($(OS_TARGET),WINNT)
cppsrcs += TestBase64.cpp
endif
# This can be deleted when SIMPLE_PROGRAMS is in moz.build
ifdef WRAP_STL_INCLUDES
cppsrcs += TestSTLWrappers.cpp
endif
# TODO: Use CPPSRCS from moz.build
SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX))
include $(topsrcdir)/config/config.mk
LIBS += $(XPCOM_LIBS)

2
xpcom/tests/external/Makefile.in vendored
View File

@ -9,8 +9,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX))
include $(topsrcdir)/config/rules.mk
LIBS += \

12
xpcom/tests/external/moz.build vendored
View File

@ -6,7 +6,15 @@
MODULE = 'xpcom'
CPP_SOURCES += [
'TestMinStringAPI.cpp',
sources = [
'TestMinStringAPI',
]
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]

53
xpcom/tests/moz.build
View File

@ -14,42 +14,53 @@ DIRS += [
if CONFIG['OS_ARCH'] == 'WINNT':
DIRS += ['windows']
if CONFIG['DEHYDRA_PATH']:
DIRS += ['static-checker']
EXPORTS.testing += [
'TestHarness.h',
]
sources = [
'TestArguments',
'TestBlockingProcess',
'TestCallTemplates',
'TestINIParser',
'TestPRIntN',
'TestQuickReturn',
'TestRacingServiceManager',
'TestRegistrationOrder',
'TestThreadPoolListener',
'TestTimers',
'TestUnicodeArguments',
'nsIFileEnumerator',
]
if CONFIG['OS_TARGET'] == 'WINNT':
CPP_SOURCES += [
'TestBase64.cpp',
sources += [
'TestBase64',
]
if CONFIG['WRAP_STL_INCLUDES']:
CPP_SOURCES += [
'TestSTLWrappers.cpp',
sources += [
'TestSTLWrappers',
]
if CONFIG['DEHYDRA_PATH']:
DIRS += ['static-checker']
sources.sort()
CPP_SOURCES += [
'%s.cpp' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]
MODULE = 'xpcom'
XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
CPP_SOURCES += [
'TestArguments.cpp',
'TestBlockingProcess.cpp',
'TestCallTemplates.cpp',
'TestINIParser.cpp',
'TestPRIntN.cpp',
'TestQuickReturn.cpp',
'TestRacingServiceManager.cpp',
'TestRegistrationOrder.cpp',
'TestThreadPoolListener.cpp',
'TestTimers.cpp',
'TestUnicodeArguments.cpp',
'nsIFileEnumerator.cpp',
]
CPP_UNIT_TESTS += [
'ShowAlignments.cpp',
'TestAutoPtr.cpp',

4
xpcom/typelib/xpt/tests/Makefile.in
View File

@ -10,10 +10,6 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
DISABLED_SIMPLE_PROGRAMS = PrimitiveTest$(BIN_SUFFIX) SimpleTypeLib$(BIN_SUFFIX)
CSRCS = PrimitiveTest.c SimpleTypeLib.c
LIBS = \
$(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \
$(NULL)

15
xpcom/typelib/xpt/tests/moz.build
View File

@ -6,9 +6,16 @@
MODULE = 'xpcom'
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
"PrimitiveTest%s" % (bin_suffix),
"SimpleTypeLib%s" % (bin_suffix),
sources = [
'PrimitiveTest',
'SimpleTypeLib',
]
CSRCS += [
'%s.c' % s for s in sources
]
bin_suffix = CONFIG['BIN_SUFFIX']
SIMPLE_PROGRAMS += [
'%s%s' % (s, bin_suffix) for s in sources
]