From bac66db7417b8b6684d420f0c12516cf33cdfc39 Mon Sep 17 00:00:00 2001
From: Dave Townsend <dtownsend@oxymoronical.com>
Date: Wed, 23 Nov 2011 15:10:06 -0800
Subject: [PATCH] Bug 652376: Migrate XPInstall Packager to the installer
 directory. r=robstrong, r=khuey.

--HG--
rename : xpinstall/packager/Packager.pm => toolkit/mozapps/installer/Packager.pm
rename : xpinstall/packager/pkgcp.pl => toolkit/mozapps/installer/pkgcp.pl
rename : xpinstall/packager/xptlink.pl => toolkit/mozapps/installer/xptlink.pl
---
 {xpinstall/packager => toolkit/mozapps/installer}/Packager.pm | 0
 toolkit/mozapps/installer/packager.mk                         | 4 ++--
 {xpinstall/packager => toolkit/mozapps/installer}/pkgcp.pl    | 2 +-
 {xpinstall/packager => toolkit/mozapps/installer}/xptlink.pl  | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename {xpinstall/packager => toolkit/mozapps/installer}/Packager.pm (100%)
 rename {xpinstall/packager => toolkit/mozapps/installer}/pkgcp.pl (99%)
 rename {xpinstall/packager => toolkit/mozapps/installer}/xptlink.pl (100%)

diff --git a/xpinstall/packager/Packager.pm b/toolkit/mozapps/installer/Packager.pm
similarity index 100%
rename from xpinstall/packager/Packager.pm
rename to toolkit/mozapps/installer/Packager.pm
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index d5c20c7161b..c8672031dc5 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -631,7 +631,7 @@ 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
 
@@ -685,7 +685,7 @@ ifdef MOZ_PKG_MANIFEST
 	$(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))
diff --git a/xpinstall/packager/pkgcp.pl b/toolkit/mozapps/installer/pkgcp.pl
similarity index 99%
rename from xpinstall/packager/pkgcp.pl
rename to toolkit/mozapps/installer/pkgcp.pl
index 64530930a65..48a69d63ce4 100755
--- a/xpinstall/packager/pkgcp.pl
+++ b/toolkit/mozapps/installer/pkgcp.pl
@@ -95,7 +95,7 @@ if (! $return)
 }
 
 # 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;
diff --git a/xpinstall/packager/xptlink.pl b/toolkit/mozapps/installer/xptlink.pl
similarity index 100%
rename from xpinstall/packager/xptlink.pl
rename to toolkit/mozapps/installer/xptlink.pl