Bug 862986 - Migrate PROGRAM to moz.build files, c-c edition. r=gps
authorBrian O'Keefe <bokeefe@alum.wpi.edu>
Fri, 10 May 2013 10:20:32 -0400
changeset 15508 16f11f7df3c5ba0dc48c656eed4da9ea5f9a1598
parent 15507 0bf5ed8e19a0fae3a444a06cdaaabdce5a2dc54f
child 15509 3ca1770cc64312e83d1020cbe47357076665dc95
push idunknown
push userunknown
push dateunknown
reviewersgps
bugs862986
Bug 862986 - Migrate PROGRAM to moz.build files, c-c edition. r=gps
calendar/sunbird/app/Makefile.in
calendar/sunbird/app/moz.build
mail/app/Makefile.in
mail/app/moz.build
mail/components/search/wsenable/Makefile.in
mail/components/search/wsenable/moz.build
suite/app/Makefile.in
suite/app/moz.build
--- a/calendar/sunbird/app/Makefile.in
+++ b/calendar/sunbird/app/Makefile.in
@@ -39,23 +39,16 @@ endif
 SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
 ifdef SOURCE_REPO
 DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
 endif
  
 ifndef LIBXUL_SDK
 # Build a binary bootstrapping with XRE_main
 
-ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-else
-PROGRAM = $(MOZ_APP_NAME)-bin$(BIN_SUFFIX)
-endif
-
-
 CPPSRCS = nsCalendarApp.cpp
 
 LOCAL_INCLUDES += \
   -I$(MOZILLA_SRCDIR)/toolkit/xre \
   -I$(MOZILLA_SRCDIR)/xpcom/base \
   $(NULL)
 
 ifdef BUILD_STATIC_LIBS
--- a/calendar/sunbird/app/moz.build
+++ b/calendar/sunbird/app/moz.build
@@ -1,7 +1,12 @@
 # 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/.
 
 DIRS += ['profile/extensions']
 
+if not CONFIG['LIBXUL_SDK']:
+    if CONFIG['OS_ARCH'] == "OS2" or CONFIG['OS_ARCH'] == "WINNT":
+        PROGRAM = CONFIG['MOZ_APP_NAME']
+    else
+        PROGRAM = CONFIG['MOZ_APP_NAME'] + '-bin'
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -41,18 +41,16 @@ DEFINES += \
   -DGRE_BUILDID=$(GRE_BUILDID) \
    $(NULL)
 
 ifdef LIBXUL_SDK
 include $(topsrcdir)/config/rules.mk
 else
 # Build a binary bootstrapping with XRE_main
 
-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-
 CPPSRCS = nsMailApp.cpp
 
 DIST_FILES = application.ini
 
 LOCAL_INCLUDES += \
   -I$(MOZILLA_SRCDIR)/toolkit/xre \
   -I$(MOZILLA_SRCDIR)/xpcom/base \
   -I$(MOZILLA_SRCDIR)/xpcom/build \
--- a/mail/app/moz.build
+++ b/mail/app/moz.build
@@ -1,7 +1,9 @@
 # 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/.
 
 DIRS += ['profile']
 
+if not CONFIG['LIBXUL_SDK']:
+    PROGRAM = CONFIG['MOZ_APP_NAME']
--- a/mail/components/search/wsenable/Makefile.in
+++ b/mail/components/search/wsenable/Makefile.in
@@ -8,16 +8,15 @@ srcdir    = @srcdir@
 VPATH     = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 CPPSRCS = \
   WSEnable.cpp \
   $(NULL)
 
-PROGRAM = WSEnable$(BIN_SUFFIX)
 RCINCLUDE = WSEnable.rc
 OS_LIBS += ole32.lib shell32.lib
 
 # This isn't XPCOM code, but it wants to use STL so disable STL wrappers
 STL_FLAGS =
 
 include $(topsrcdir)/config/rules.mk
--- a/mail/components/search/wsenable/moz.build
+++ b/mail/components/search/wsenable/moz.build
@@ -1,4 +1,7 @@
 # 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/.
+
+PROGRAM = 'WSEnable'
+
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -18,18 +18,16 @@ DEFINES += \
 	-DNO_BLOCKLIST_CRASHREPORTER \
 	$(NULL)
 
 ifdef LIBXUL_SDK
 include $(topsrcdir)/config/rules.mk
 else
 # Build a binary bootstrapping with XRE_main
 
-PROGRAM = $(MOZ_APP_NAME)$(BIN_SUFFIX)
-
 CPPSRCS = nsSuiteApp.cpp
 
 LOCAL_INCLUDES += \
   -I$(MOZILLA_SRCDIR)/toolkit/xre \
   -I$(MOZILLA_SRCDIR)/xpcom/base \
   -I$(MOZILLA_SRCDIR)/xpcom/build \
   -I$(DEPTH)/mozilla/build \
   $(NULL)
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -1,4 +1,7 @@
 # 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/.
+
+if not CONFIG['LIBXUL_SDK']:
+    PROGRAM = CONFIG['MOZ_APP_NAME']