Bug 652376: Migrate XPInstall Packager to the installer directory. r=robstrong, r=khuey.
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 23 Nov 2011 15:10:06 -0800
changeset 80717 79b80511d57702f6638e64084cf0890f729f02de
parent 80716 c7e620a0c5b5a7f45dfd61377db7325a2b4ae618
child 80718 e5229443d6a2433cccf12e8e2d2aa3e247784e3e
push id21525
push userbmo@edmorley.co.uk
push dateThu, 24 Nov 2011 15:52:31 +0000
treeherdermozilla-central@bde1e4123b03 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrobstrong, khuey
bugs652376
milestone11.0a1
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
Bug 652376: Migrate XPInstall Packager to the installer directory. r=robstrong, r=khuey.
toolkit/mozapps/installer/Packager.pm
toolkit/mozapps/installer/packager.mk
toolkit/mozapps/installer/pkgcp.pl
toolkit/mozapps/installer/xptlink.pl
xpinstall/packager/Packager.pm
xpinstall/packager/pkgcp.pl
xpinstall/packager/xptlink.pl
rename from xpinstall/packager/Packager.pm
rename to toolkit/mozapps/installer/Packager.pm
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -626,17 +626,17 @@ endif
 # MOZ_NONLOCALIZED_PKG_LIST
 # MOZ_LOCALIZED_PKG_LIST
 # MOZ_OPTIONAL_PKG_LIST
 
 PKG_ARG = , "$(pkg)"
 
 # Define packager macro to work around make 3.81 backslash issue (bug #339933)
 define PACKAGER_COPY
-$(PERL) -I$(MOZILLA_DIR)/xpinstall/packager -e 'use Packager; \
+$(PERL) -I$(MOZILLA_DIR)/toolkit/mozapps/installer -e 'use Packager; \
        Packager::Copy($1,$2,$3,$4,$5,$6,$7);'
 endef
 
 installer-stage: stage-package
 ifndef MOZ_PKG_MANIFEST
 	$(error MOZ_PKG_MANIFEST unspecified!)
 endif
 	@rm -rf $(DEPTH)/installer-stage $(DIST)/xpt
@@ -680,17 +680,17 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ
 ifndef UNIVERSAL_BINARY
 # If UNIVERSAL_BINARY, the package will be made from an already-prepared
 # STAGEPATH
 ifdef MOZ_PKG_MANIFEST
 	$(RM) -rf $(DIST)/xpt $(DIST)/manifests
 	$(call PACKAGER_COPY, "$(call core_abspath,$(DIST))",\
 	  "$(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)"
+	$(PERL) $(MOZILLA_DIR)/toolkit/mozapps/installer/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)/$(MOZ_PKG_DIR)/$(_BINPATH)/components/components.manifest \
 	  $(patsubst %,$(DIST)/manifests/%/components,$(MOZ_NONLOCALIZED_PKG_LIST))
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
 	  $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/nonlocalized.manifest \
 	  $(patsubst %,$(DIST)/manifests/%/chrome,$(MOZ_NONLOCALIZED_PKG_LIST))
 	$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/link-manifests.py \
 	  $(DIST)/$(MOZ_PKG_DIR)/$(_BINPATH)/chrome/localized.manifest \
rename from xpinstall/packager/pkgcp.pl
rename to toolkit/mozapps/installer/pkgcp.pl
--- a/xpinstall/packager/pkgcp.pl
+++ b/toolkit/mozapps/installer/pkgcp.pl
@@ -90,17 +90,17 @@ if ($verbose && !($debug)) {
 
 # check usage
 if (! $return)
 {
 	die "Error: couldn't parse command line options.  See \'$0 --help' for options.\nExiting...\n";
 }
 
 # ensure that Packager.pm is in @INC, since we might not be called from
-# mozilla/xpinstall/packager.
+# mozilla/toolkit/mozapps/installer.
 $top_path = $0;
 if ( $os eq "dos" ) {
   $top_path =~ s/\\/\//g;
 }
 push(@INC, dirname($top_path));
 require Packager;
 
 if ( $os eq "os2" ) {
rename from xpinstall/packager/xptlink.pl
rename to toolkit/mozapps/installer/xptlink.pl