[Windows only] use absolute paths for Bug 575838 - Build scripts should be able to handle @BINPATH@/extensions/testpilot@labs.mozilla.com/* in package-manifest.in for the installer. r=ted.mielczarek, approval2.0=benjamin
authorRobert Strong <robert.bugzilla@gmail.com>
Thu, 29 Jul 2010 22:46:47 -0700
changeset 48396 bf4cec83e4d242cf2aea5869b349743f5cf8ed3f
parent 48395 e1161df6af197e9ac4ac337b74a020b31f59459f
child 48397 aee9fa2b6e9dc0bc688e9fcda37500f1edf2bacd
push id14712
push userrstrong@mozilla.com
push dateFri, 30 Jul 2010 05:47:51 +0000
treeherdermozilla-central@aee9fa2b6e9d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted.mielczarek
bugs575838
milestone2.0b3pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
[Windows only] use absolute paths for Bug 575838 - Build scripts should be able to handle @BINPATH@/extensions/testpilot@labs.mozilla.com/* in package-manifest.in for the installer. r=ted.mielczarek, approval2.0=benjamin
browser/installer/Makefile.in
toolkit/mozapps/installer/packager.mk
--- a/browser/installer/Makefile.in
+++ b/browser/installer/Makefile.in
@@ -60,20 +60,16 @@ endif
 
 MOZ_NONLOCALIZED_PKG_LIST = \
 	xpcom \
 	browser \
 	$(NULL)
 
 MOZ_LOCALIZED_PKG_LIST = $(AB_CD)
 
-MOZ_OPTIONAL_PKG_LIST = \
-	adt \
-	$(NULL)
-
 DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR)
 ifdef MOZ_ENABLE_GNOME_COMPONENT
 DEFINES += -DMOZ_ENABLE_GNOME_COMPONENT=1
 endif
 
 ifeq (gtk2, $(MOZ_WIDGET_TOOLKIT))
 DEFINES += -DMOZ_GTK2=1
 endif
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -344,29 +344,29 @@ ifndef MOZ_PKG_MANIFEST
 	$(error MOZ_PKG_MANIFEST unspecified!)
 endif
 	@rm -rf $(DEPTH)/installer-stage $(DIST)/xpt
 	@echo "Staging installer files..."
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/nonlocalized
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/localized
 	@$(NSINSTALL) -D $(DEPTH)/installer-stage/optional
 	@$(NSINSTALL) -D $(DIST)/xpt
-	$(call PACKAGER_COPY, "$(DIST)",\
-		"$(DEPTH)/installer-stage/nonlocalized", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-		$(foreach pkg,$(MOZ_NONLOCALIZED_PKG_LIST),$(PKG_ARG)) )
-	$(call PACKAGER_COPY, "$(DIST)",\
-		"$(DEPTH)/installer-stage/localized", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-		$(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) )
+	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+	  "$(call core_abspath,$(DEPTH)/installer-stage/nonlocalized)", \
+	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
+	  $(foreach pkg,$(MOZ_NONLOCALIZED_PKG_LIST),$(PKG_ARG)) )
+	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
+	  "$(call core_abspath,$(DEPTH)/installer-stage/localized)", \
+	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
+	  $(foreach pkg,$(MOZ_LOCALIZED_PKG_LIST),$(PKG_ARG)) )
 ifdef MOZ_OPTIONAL_PKG_LIST
-	$(call PACKAGER_COPY, "$(DIST)",\
-		"$(DEPTH)/installer-stage/optional", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1 \
-		$(foreach pkg,$(MOZ_OPTIONAL_PKG_LIST),$(PKG_ARG)) )
+	$(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)) )
 endif
 	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DEPTH)/installer-stage/nonlocalized/components -v -x "$(XPIDL_LINK)"
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py $(DIST)/manifests $(DEPTH)/installer-stage/nonlocalized
 
 
 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
@@ -374,18 +374,18 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ
 	@echo "Creating package directory..."
 	@mkdir $(DIST)/$(MOZ_PKG_DIR)
 ifndef UNIVERSAL_BINARY
 # If UNIVERSAL_BINARY, the package will be made from an already-prepared
 # STAGEPATH
 ifdef MOZ_PKG_MANIFEST
 	$(RM) -rf $(DIST)/xpt $(RM) -rf $(DIST)/manifests
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
-		 "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
-		"$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
+	  "$(call core_abspath,$(DIST)/$(MOZ_PKG_DIR))", \
+	  "$(MOZ_PKG_MANIFEST)", "$(PKGCP_OS)", 1, 0, 1)
 	$(PERL) $(MOZILLA_DIR)/xpinstall/packager/xptlink.pl -s $(DIST) -d $(DIST)/xpt -f $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/components -v -x "$(XPIDL_LINK)"
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py $(DIST)/manifests $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)
 else # !MOZ_PKG_MANIFEST
 ifeq ($(MOZ_PKG_FORMAT),DMG)
 ifndef STAGE_SDK
 	@cd $(DIST) && rsync -auv --copy-unsafe-links $(_APPNAME) $(MOZ_PKG_DIR)
 	@echo "Linking XPT files..."
 	@rm -rf $(DIST)/xpt