bug 872086: move SIMPLE_PROGRAMS to moz.build (file batch #1) r=mshal

UltraBlame original commit: fa6b60d827d4795c00be982b2d26f014e110f66d
marco-c · Sep 29, 2019 · 0f53e4b · 0f53e4b
1 parent ee254ca
commit 0f53e4b
Show file tree

Hide file tree

Showing 17 changed files with 47 additions and 8 deletions.
diff --git a/intl/uconv/tools/moz.build b/intl/uconv/tools/moz.build
@@ -7,3 +7,8 @@
 CSRCS += [
     'umaptable.c',
 ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (fyl[0:-2], bin_suffix) for fyl in CSRCS
+]
diff --git a/intl/unicharutil/tests/Makefile.in b/intl/unicharutil/tests/Makefile.in
@@ -13,7 +13,7 @@ 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) \

diff --git a/intl/unicharutil/tests/moz.build b/intl/unicharutil/tests/moz.build
@@ -12,3 +12,8 @@ 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
+]
diff --git a/netwerk/test/Makefile.in b/netwerk/test/Makefile.in
@@ -32,7 +32,7 @@ cppsrcs = \
   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 += \

diff --git a/netwerk/test/moz.build b/netwerk/test/moz.build
@@ -32,3 +32,8 @@ CPP_SOURCES += [
     'TestUpload.cpp',
     'urltest.cpp',
 ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (x[0:-4], bin_suffix) for x in CPP_SOURCES
+]
diff --git a/tools/codesighs/Makefile.in b/tools/codesighs/Makefile.in
@@ -27,7 +27,7 @@ DISABLED_CSRCS += \
 		$(NULL)
 endif
 
-SIMPLE_PROGRAMS	= $(CSRCS:.c=$(BIN_SUFFIX))
+DISABLED_SIMPLE_PROGRAMS = $(CSRCS:.c=$(BIN_SUFFIX))
 
 include $(topsrcdir)/config/config.mk
 

diff --git a/tools/codesighs/moz.build b/tools/codesighs/moz.build
@@ -18,3 +18,8 @@ else:
     CSRCS += [
         'nm2tsv.c',
     ]
+
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "%s%s" % (x[0:-2], bin_suffix) for x in CSRCS
+]
diff --git a/xpcom/reflect/xptcall/src/md/test/Makefile.in b/xpcom/reflect/xptcall/src/md/test/Makefile.in
@@ -10,7 +10,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS	= stub_test
+DISABLED_SIMPLE_PROGRAMS = stub_test
 
 include $(topsrcdir)/config/rules.mk
 
diff --git a/xpcom/reflect/xptcall/src/md/test/moz.build b/xpcom/reflect/xptcall/src/md/test/moz.build
@@ -10,3 +10,6 @@ CPP_SOURCES += [
     'stub_test.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    'stub_test',
+]
diff --git a/xpcom/reflect/xptinfo/tests/Makefile.in b/xpcom/reflect/xptinfo/tests/Makefile.in
@@ -10,7 +10,7 @@ VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-SIMPLE_PROGRAMS	= TestInterfaceInfo$(BIN_SUFFIX)
+DISABLED_SIMPLE_PROGRAMS = TestInterfaceInfo$(BIN_SUFFIX)
 
 LIBS		= \
 		$(XPCOM_GLUE_LDOPTS) \

diff --git a/xpcom/reflect/xptinfo/tests/moz.build b/xpcom/reflect/xptinfo/tests/moz.build
@@ -10,3 +10,6 @@ CPP_SOURCES += [
     'TestInterfaceInfo.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    "TestInterfaceInfo%s" % (CONFIG['BIN_SUFFIX']),
+]
diff --git a/xpcom/sample/program/Makefile.in b/xpcom/sample/program/Makefile.in
@@ -11,7 +11,7 @@ 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

diff --git a/xpcom/sample/program/moz.build b/xpcom/sample/program/moz.build
@@ -12,3 +12,7 @@ CPP_SOURCES += [
     'nsTestSample.cpp',
 ]
 
+# SIMPLE_PROGRAMS compiles a single .cpp file into an executable
+SIMPLE_PROGRAMS += [
+    "nsTestSample%s" % (CONFIG['BIN_SUFFIX']),
+]
diff --git a/xpcom/typelib/xpt/tests/Makefile.in b/xpcom/typelib/xpt/tests/Makefile.in
@@ -10,7 +10,7 @@ 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
 

diff --git a/xpcom/typelib/xpt/tests/moz.build b/xpcom/typelib/xpt/tests/moz.build
@@ -6,3 +6,9 @@
 
 MODULE = 'xpcom'
 
+bin_suffix = CONFIG['BIN_SUFFIX']
+SIMPLE_PROGRAMS += [
+    "PrimitiveTest%s" % (bin_suffix),
+    "SimpleTypeLib%s" % (bin_suffix),
+]
+
diff --git a/xpcom/windbgdlg/Makefile.in b/xpcom/windbgdlg/Makefile.in
@@ -10,7 +10,7 @@ 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

diff --git a/xpcom/windbgdlg/moz.build b/xpcom/windbgdlg/moz.build
@@ -8,3 +8,6 @@ CPP_SOURCES += [
     'windbgdlg.cpp',
 ]
 
+SIMPLE_PROGRAMS += [
+    "windbgdlg%s" % (CONFIG['BIN_SUFFIX'])
+]
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ DISABLED_CSRCS += \ @@
     		$(NULL)
     endif
-    SIMPLE_PROGRAMS	= $(CSRCS:.c=$(BIN_SUFFIX))
+    DISABLED_SIMPLE_PROGRAMS = $(CSRCS:.c=$(BIN_SUFFIX))
     include $(topsrcdir)/config/config.mk
@@ Expand Down @@