bug 872086: move SIMPLE_PROGRAMS to moz.build (file batch #1) r=mshal
authorJoey Armstrong <joey@mozilla.com>
Thu, 13 Jun 2013 12:02:02 -0400
changeset 146437 fa6b60d827d4795c00be982b2d26f014e110f66d
parent 146436 0b35a9fc88b840d3280cd5ae42024c1070b38596
child 146438 76a9571e528338a2749d29abf14df2c49aa23629
push idunknown
push userunknown
push dateunknown
reviewersmshal
bugs872086
milestone24.0a1
bug 872086: move SIMPLE_PROGRAMS to moz.build (file batch #1) r=mshal
intl/uconv/tools/moz.build
intl/unicharutil/tests/Makefile.in
intl/unicharutil/tests/moz.build
netwerk/test/Makefile.in
netwerk/test/moz.build
tools/codesighs/Makefile.in
tools/codesighs/moz.build
xpcom/reflect/xptcall/src/md/test/Makefile.in
xpcom/reflect/xptcall/src/md/test/moz.build
xpcom/reflect/xptinfo/tests/Makefile.in
xpcom/reflect/xptinfo/tests/moz.build
xpcom/sample/program/Makefile.in
xpcom/sample/program/moz.build
xpcom/typelib/xpt/tests/Makefile.in
xpcom/typelib/xpt/tests/moz.build
xpcom/windbgdlg/Makefile.in
xpcom/windbgdlg/moz.build
--- a/intl/uconv/tools/moz.build
+++ b/intl/uconv/tools/moz.build
@@ -2,8 +2,13 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 CSRCS += [
     'umaptable.c',
 ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (fyl[0:-2], bin_suffix) for fyl in CSRCS
+]
--- a/intl/unicharutil/tests/Makefile.in
+++ b/intl/unicharutil/tests/Makefile.in
@@ -8,17 +8,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 USE_STATIC_LIBS = 1
 
-SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
+DISABLE_SIMPLE_PROGRAMS	= $(CPPSRCS:.cpp=$(BIN_SUFFIX))
 
 LIBS		= \
 	$(XPCOM_STATICRUNTIME_GLUE_LDOPTS) \
 	$(DIST)/lib/$(LIB_PREFIX)unicharutil_external_s.$(LIB_SUFFIX) \
 	$(XPCOM_LIBS) \
 	$(NSPR_LIBS) \
 	$(NULL)
 
--- a/intl/unicharutil/tests/moz.build
+++ b/intl/unicharutil/tests/moz.build
@@ -7,8 +7,13 @@
 MODULE = 'test_intl_unicharutil'
 
 XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini']
 
 CPP_SOURCES += [
     'NormalizationTest.cpp',
     'UnicharSelfTest.cpp',
 ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (fyl[0:-4], bin_suffix) for fyl in CPP_SOURCES
+]
--- a/netwerk/test/Makefile.in
+++ b/netwerk/test/Makefile.in
@@ -27,17 +27,17 @@ cppsrcs = \
   TestDNS.cpp \
   TestOpen.cpp \
   TestCookie.cpp \
   TestServ.cpp \
   ReadNTLM.cpp \
   TestProtocols.cpp \
   $(NULL)
 
-SIMPLE_PROGRAMS := $(cppsrcs:.cpp=$(BIN_SUFFIX))
+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) \
--- a/netwerk/test/moz.build
+++ b/netwerk/test/moz.build
@@ -27,8 +27,13 @@ CPP_SOURCES += [
     'TestProtocols.cpp',
     'TestServ.cpp',
     'TestStandardURL.cpp',
     'TestStreamLoader.cpp',
     'TestURLParser.cpp',
     'TestUpload.cpp',
     'urltest.cpp',
 ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (x[0:-4], bin_suffix) for x in CPP_SOURCES
+]
--- a/tools/codesighs/Makefile.in
+++ b/tools/codesighs/Makefile.in
@@ -22,17 +22,17 @@ DISABLED_CSRCS += \
 		msdump2symdb.c \
 		$(NULL)
 else
 DISABLED_CSRCS += \
 		nm2tsv.c \
 		$(NULL)
 endif
 
-SIMPLE_PROGRAMS	= $(CSRCS:.c=$(BIN_SUFFIX))
+DISABLED_SIMPLE_PROGRAMS = $(CSRCS:.c=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/config.mk
 
 ifeq ($(OS_ARCH),WINNT)
 OS_LIBS += \
 		imagehlp.lib \
 		$(NULL)
 endif
--- a/tools/codesighs/moz.build
+++ b/tools/codesighs/moz.build
@@ -13,8 +13,13 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     CSRCS += [
         'msdump2symdb.c',
         'msmap2tsv.c',
     ]
 else:
     CSRCS += [
         'nm2tsv.c',
     ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (x[0:-2], bin_suffix) for x in CSRCS
+]
--- a/xpcom/reflect/xptcall/src/md/test/Makefile.in
+++ b/xpcom/reflect/xptcall/src/md/test/Makefile.in
@@ -5,12 +5,12 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS	= stub_test
+DISABLED_SIMPLE_PROGRAMS = stub_test
 
 include $(topsrcdir)/config/rules.mk
 
--- a/xpcom/reflect/xptcall/src/md/test/moz.build
+++ b/xpcom/reflect/xptcall/src/md/test/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom'
 
 CPP_SOURCES += [
     'stub_test.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    'stub_test',
+]
--- a/xpcom/reflect/xptinfo/tests/Makefile.in
+++ b/xpcom/reflect/xptinfo/tests/Makefile.in
@@ -5,16 +5,16 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS	= TestInterfaceInfo$(BIN_SUFFIX)
+DISABLED_SIMPLE_PROGRAMS = TestInterfaceInfo$(BIN_SUFFIX)
 
 LIBS		= \
 		$(XPCOM_GLUE_LDOPTS) \
 		$(NSPR_LIBS) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/xpcom/reflect/xptinfo/tests/moz.build
+++ b/xpcom/reflect/xptinfo/tests/moz.build
@@ -5,8 +5,11 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom'
 
 CPP_SOURCES += [
     'TestInterfaceInfo.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    "TestInterfaceInfo%s" % (CONFIG['BIN_SUFFIX']),
+]
--- a/xpcom/sample/program/Makefile.in
+++ b/xpcom/sample/program/Makefile.in
@@ -6,17 +6,17 @@
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 # SIMPLE_PROGRAMS compiles a single .cpp file into an executable
-SIMPLE_PROGRAMS = nsTestSample$(BIN_SUFFIX)
+DISABLED_SIMPLE_PROGRAMS = nsTestSample$(BIN_SUFFIX)
 
 # LIBS specifies linker flags when building an executable program from
 # this Makefile. We link against the "standalone glue" which does not require
 # that the application be linked against the XPCOM dynamic library or the NSPR
 # dynamic libraries.
 LIBS            = \
 		$(XPCOM_STANDALONE_GLUE_LDOPTS) \
 		$(NULL)
--- a/xpcom/sample/program/moz.build
+++ b/xpcom/sample/program/moz.build
@@ -7,8 +7,12 @@
 MODULE = 'xpcomsample'
 
 # We must specify CPP_SOURCES in order to link using the proper c++ linker
 # on certain platforms.
 CPP_SOURCES += [
     'nsTestSample.cpp',
 ]
 
+# SIMPLE_PROGRAMS compiles a single .cpp file into an executable
+SIMPLE_PROGRAMS += [
+    "nsTestSample%s" % (CONFIG['BIN_SUFFIX']),
+]
--- a/xpcom/typelib/xpt/tests/Makefile.in
+++ b/xpcom/typelib/xpt/tests/Makefile.in
@@ -5,17 +5,17 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS	= PrimitiveTest$(BIN_SUFFIX) SimpleTypeLib$(BIN_SUFFIX)
+DISABLED_SIMPLE_PROGRAMS = PrimitiveTest$(BIN_SUFFIX) SimpleTypeLib$(BIN_SUFFIX)
 
 CSRCS		= PrimitiveTest.c SimpleTypeLib.c
 
 LIBS		= \
 		$(DIST)/lib/$(LIB_PREFIX)xpt.$(LIB_SUFFIX) \
 		$(NULL)
 
 include $(topsrcdir)/config/rules.mk
--- a/xpcom/typelib/xpt/tests/moz.build
+++ b/xpcom/typelib/xpt/tests/moz.build
@@ -1,8 +1,14 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 MODULE = 'xpcom'
 
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "PrimitiveTest%s" % (bin_suffix),
+    "SimpleTypeLib%s" % (bin_suffix),
+]
+
--- a/xpcom/windbgdlg/Makefile.in
+++ b/xpcom/windbgdlg/Makefile.in
@@ -5,13 +5,13 @@
 
 DEPTH		= @DEPTH@
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS	= windbgdlg$(BIN_SUFFIX)
+DISABLED_SIMPLE_PROGRAMS = windbgdlg$(BIN_SUFFIX)
 
 MOZ_WINCONSOLE = 0
 include $(topsrcdir)/config/rules.mk
 
--- a/xpcom/windbgdlg/moz.build
+++ b/xpcom/windbgdlg/moz.build
@@ -3,8 +3,11 @@
 # 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/.
 
 CPP_SOURCES += [
     'windbgdlg.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    "windbgdlg%s" % (CONFIG['BIN_SUFFIX'])
+]