Bug 604266. (Dv1-CC) Remove MOZ_INSTALLER support. r=Callek.
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 25 Mar 2012 04:32:45 +0200
changeset 11451 4d16576d3332648ba832762becc3eb68bdd4ad72
parent 11450 2e56855407931796a3af2aecc49c274a51e8d6b6
child 11452 aaaf94452b0787a603dcd880ee7518c78a3d0eab
push idunknown
push userunknown
push dateunknown
reviewersCallek
bugs604266
Bug 604266. (Dv1-CC) Remove MOZ_INSTALLER support. r=Callek.
calendar/sunbird/Makefile.in
config/autoconf.mk.in
configure.in
mail/Makefile.in
suite/Makefile.in
--- a/calendar/sunbird/Makefile.in
+++ b/calendar/sunbird/Makefile.in
@@ -42,20 +42,17 @@ topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS = base locales app
 
 ifeq ($(OS_ARCH),WINNT)
-ifdef MOZ_INSTALLER
 DIRS += ../installer/windows
 
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C ../installer/windows uninstaller
-
-endif
 endif
 
 include $(topsrcdir)/config/rules.mk
--- a/config/autoconf.mk.in
+++ b/config/autoconf.mk.in
@@ -113,17 +113,16 @@ MOZ_CALENDAR	= @MOZ_CALENDAR@
 MOZ_PLAINTEXT_EDITOR_ONLY = @MOZ_PLAINTEXT_EDITOR_ONLY@
 MOZ_COMPOSER = @MOZ_COMPOSER@
 ENABLE_TESTS	= @ENABLE_TESTS@
 IBMBIDI = @IBMBIDI@
 MOZ_UNIVERSALCHARDET = @MOZ_UNIVERSALCHARDET@
 ACCESSIBILITY = @ACCESSIBILITY@
 MOZ_LDAP_XPCOM = @MOZ_LDAP_XPCOM@
 MOZ_BRANDING_DIRECTORY = @MOZ_BRANDING_DIRECTORY@
-MOZ_INSTALLER	= @MOZ_INSTALLER@
 MOZ_UPDATER	= @MOZ_UPDATER@
 MOZ_UPDATE_CHANNEL = @MOZ_UPDATE_CHANNEL@
 MOZ_UPDATE_PACKAGING	= @MOZ_UPDATE_PACKAGING@
 MOZ_NO_ACTIVEX_SUPPORT = @MOZ_NO_ACTIVEX_SUPPORT@
 MOZ_SPELLCHECK = @MOZ_SPELLCHECK@
 MOZ_PROFILELOCKING = @MOZ_PROFILELOCKING@
 MOZ_FEEDS = @MOZ_FEEDS@
 MOZ_PLACES = @MOZ_PLACES@
--- a/configure.in
+++ b/configure.in
@@ -4465,17 +4465,16 @@ dnl ====================================
 
 MOZ_ARG_HEADER(Application)
 
 ENABLE_TESTS=1
 MOZ_BRANDING_DIRECTORY=
 MOZ_OFFICIAL_BRANDING=
 MOZ_CALENDAR=
 MOZ_FEEDS=1
-MOZ_INSTALLER=1
 MOZ_JSDEBUGGER=1
 MOZ_LDAP_XPCOM=
 MOZ_MORK=
 MOZ_MORKREADER=1
 MOZ_AUTH_EXTENSION=1
 MOZ_NO_ACTIVEX_SUPPORT=1
 MOZ_NO_FAST_LOAD=
 MOZ_OGG=1
@@ -5354,17 +5353,17 @@ if test -n "$MOZ_TREE_FREETYPE"; then
    CAIRO_FT_LIBS='$(call EXPAND_LIBNAME_PATH,freetype2,$(LIBXUL_DIST)/lib)'
 fi
 
 dnl ========================================================
 dnl Installer
 dnl ========================================================
 dnl Abort Windows build if the required major version and
 dnl minimum minor version of Unicode NSIS isn't in the path.
-if test -n "$MOZ_INSTALLER" -a "$OS_ARCH" = "WINNT"; then
+if test "$OS_ARCH" = "WINNT"; then
     REQ_NSIS_MAJOR_VER=2
     MIN_NSIS_MINOR_VER=33
     MOZ_PATH_PROGS(MAKENSISU, $MAKENSISU makensisu-2.46 makensisu makensis)
     if test -z "$MAKENSISU" -o "$MAKENSISU" = ":"; then
         AC_MSG_ERROR([To build the installer you must have the latest MozillaBuild or Unicode NSIS with a major version of $REQ_NSIS_MAJOR_VER and a minimum minor version of $MIN_NSIS_MINOR_VER in your path.])
     fi
     changequote(,)
     MAKENSISU_VER=`"$MAKENSISU" -version 2>/dev/null | sed -e '/-Unicode/!s/.*//g' -e 's/^v\([0-9]\+\.[0-9]\+\)\-Unicode$/\1/g'`
@@ -6728,17 +6727,16 @@ AC_SUBST(MOZ_JS_LIBS)
 AC_SUBST(MOZ_PSM)
 AC_SUBST(MOZ_DEBUG)
 AC_SUBST(MOZ_DEBUG_SYMBOLS)
 AC_SUBST(MOZ_DEBUG_ENABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_DISABLE_DEFS)
 AC_SUBST(MOZ_DEBUG_FLAGS)
 AC_SUBST(MOZ_DEBUG_LDFLAGS)
 AC_SUBST(WARNINGS_AS_ERRORS)
-AC_SUBST(MOZ_INSTALLER)
 AC_SUBST(MOZ_JSDEBUGGER)
 AC_SUBST(MOZ_PLUGINS)
 AC_SUBST(MOZ_LOG_REFCNT)
 AC_SUBST(MOZ_JPROF)
 AC_SUBST(MOZ_SHARK)
 AC_SUBST(MOZ_PROFILING)
 AC_SUBST(MOZ_QUANTIFY)
 AC_SUBST(MOZ_LDAP_XPCOM)
--- a/mail/Makefile.in
+++ b/mail/Makefile.in
@@ -41,30 +41,24 @@ srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
 # app is always last as it packages up the built files on mac
 DIRS += base locales extensions steel themes jquery app
 
 ifeq ($(OS_ARCH),WINNT)
-ifdef MOZ_INSTALLER
 # though some lasts are more last than others
 DIRS += installer/windows
 endif
-endif
 
 ifdef ENABLE_TESTS
 DIRS += test/mozmill
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 ifeq ($(OS_ARCH),WINNT)
-ifdef MOZ_INSTALLER
-
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
 	$(MAKE) -C installer/windows uninstaller
-
 endif
-endif
--- a/suite/Makefile.in
+++ b/suite/Makefile.in
@@ -62,26 +62,22 @@ PARALLEL_DIRS	+= \
 		profile \
 		security \
 		shell/public \
 		shell/src \
 		smile \
 		$(NULL)
 
 ifeq ($(OS_ARCH),WINNT)
-ifdef MOZ_INSTALLER
 PARALLEL_DIRS += installer/windows
 endif
-endif
 
 # app is always last as it packages up the built files on mac
 DIRS = build app
 
 include $(topsrcdir)/config/rules.mk
 
+ifeq ($(OS_ARCH),WINNT)
 # For Windows build the uninstaller during the application build since the
 # uninstaller is included with the application for mar file generation.
 libs::
-ifeq ($(OS_ARCH),WINNT)
-ifdef MOZ_INSTALLER
 	$(MAKE) -C installer/windows uninstaller
 endif
-endif