Bug 649810 - SeaMonkey 2.1pre Windows installer ignores extension choices. r=khuey,Mitch. a=LegNeato (for relbranch) GECKO201_2011041321_RELBRANCH SEAMONKEY_2_1rc1_BUILD1 SEAMONKEY_2_1rc1_BUILD2 SEAMONKEY_2_1rc1_RELEASE SEAMONKEY_2_1rc2_BUILD1
authorFrank Wein <bugzilla@mcsmurf.de>
Mon, 25 Apr 2011 05:27:00 -0400
branchGECKO201_2011041321_RELBRANCH
changeset 63439 ac9cf29de0d2d421d5501469a5c0f43ca63a50b2
parent 63436 92c31a20a425e294426c13372b37e6a3aec53e91
child 63441 63fd826af7ae76c7ee86e7aba49af3cbc038d907
push id77
push userCallek@gmail.com
push dateSun, 01 May 2011 17:19:10 +0000
reviewerskhuey, Mitch, LegNeato
bugs649810
milestone2.0.1
Bug 649810 - SeaMonkey 2.1pre Windows installer ignores extension choices. r=khuey,Mitch. a=LegNeato (for relbranch)
toolkit/mozapps/installer/packager.mk
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -485,17 +485,22 @@ ifdef MOZ_OMNIJAR
 endif
 	@cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core
 ifdef MOZ_OPTIONAL_PKG_LIST
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/optional
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 	  "$(call core_abspath,$(DEPTH)/installer-stage/optional)", \
 	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
 	  $(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
-	@cd $(DEPTH)/installer-stage/optional/extensions; find -maxdepth 1 -mindepth 1 -exec rm -r ../../core/extensions/{} \;
+	if test -d $(DEPTH)/installer-stage/optional/extensions ; then \
+		cd $(DEPTH)/installer-stage/optional/extensions; find -maxdepth 1 -mindepth 1 -exec rm -r ../../core/extensions/{} \; ; \
+	fi
+	if test -d $(DEPTH)/installer-stage/optional/distribution/extensions/ ; then \
+		cd $(DEPTH)/installer-stage/optional/distribution/extensions/; find -maxdepth 1 -mindepth 1 -exec rm -r ../../../core/distribution/extensions/{} \; ; \
+	fi
 endif
 
 stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_REMOVALS_GEN)
 	@rm -rf $(DIST)/$(MOZ_PKG_DIR) $(DIST)/$(PKG_PATH)$(PKG_BASENAME).tar $(DIST)/$(PKG_PATH)$(PKG_BASENAME).dmg $@ $(EXCLUDE_LIST)
 # NOTE: this must be a tar now that dist links into the tree so that we
 # do not strip the binaries actually in the tree.
 	@echo "Creating package directory..."
 	@mkdir $(DIST)/$(MOZ_PKG_DIR)