From c4eb48bfc1fe281e9322799600e695575dcd833d Mon Sep 17 00:00:00 2001
From: "curt%netscape.com"
 <curt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 29 Aug 2002 03:39:59 +0000
Subject: [PATCH] Getting xpcom.xpi from the wrong place.   (Not yet in build)

git-svn-id: svn://10.0.0.236/trunk@128433 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/xpinstall/packager/win_mre/makeall.pl | 16 ++++------------
 mozilla/xpinstall/packager/win_mre/runapp.bat |  7 -------
 2 files changed, 4 insertions(+), 19 deletions(-)
 delete mode 100755 mozilla/xpinstall/packager/win_mre/runapp.bat

diff --git a/mozilla/xpinstall/packager/win_mre/makeall.pl b/mozilla/xpinstall/packager/win_mre/makeall.pl
index c47216b3d73..ecc2f5e87aa 100644
--- a/mozilla/xpinstall/packager/win_mre/makeall.pl
+++ b/mozilla/xpinstall/packager/win_mre/makeall.pl
@@ -69,14 +69,6 @@ print "The raw version id is:  $inDefaultVersion\n";
 $inStagePath          = $ARGV[1];
 $inDistPath           = $ARGV[2];
 
-# Until we really figure out what to do with this batch file, this will get it
-#   into the installer, at least
-print "\n Copying runapp.bat $inStagePath\\mfcembed\\bin\n";
-if(system("copy runapp.bat $inStagePath\\mfcembed\\bin"))
-{
-  die "\n Error: copy runapp.bat $inStagePath\\mfcembed\\bin\n";
-}
-
 $inXpiURL = "";
 $inRedirIniURL = "";
 
@@ -178,13 +170,13 @@ if(MakeXpiFile())
 }
 
 # Grab xpcom from mozilla build
-if(system("copy $inDistPath\\..\\install\\xpcom.xpi $inDistPath"))
+if(system("copy $inDistPath\\..\\install\\xpi\\xpcom.xpi $inDistPath"))
 {
-  die "\n Error: copy $inDistPath\\..\\install\\xpcom.xpi $inDistPath\n";
+  die "\n Error: copy $inDistPath\\..\\install\\xpi\\xpcom.xpi $inDistPath\n";
 }
-if(system("copy $inDistPath\\..\\install\\xpcom.xpi $inDistPath\\xpi"))
+if(system("copy $inDistPath\\..\\install\\xpi\\xpcom.xpi $inDistPath\\xpi"))
 {
-  die "\n Error: copy $inDistPath\\..\\install\\xpcom.xpi $inDistPath\\xpi\n";
+  die "\n Error: copy $inDistPath\\..\\install\\xpi\\xpcom.xpi $inDistPath\\xpi\n";
 }
 
 
diff --git a/mozilla/xpinstall/packager/win_mre/runapp.bat b/mozilla/xpinstall/packager/win_mre/runapp.bat
deleted file mode 100755
index 1464543ce3f..00000000000
--- a/mozilla/xpinstall/packager/win_mre/runapp.bat
+++ /dev/null
@@ -1,7 +0,0 @@
-@echo OFF
-REM --------------------------------------------------------
-REM Modify MRE_DIR below to match your MRE install location
-REM --------------------------------------------------------
-set MRE_DIR="c:\Program Files\Mozilla\MRE\1.0"
-set PATH=%PATH%;%MRE_DIR%;%MRE_DIR%\components
-mfcembed.exe -console
\ No newline at end of file