Fixed bug #21426 - Core.xpi has been broken up into core.xpi and browser.xpi

r=cathleen
2000-02-10 07:11:36 +00:00 · 2000-02-10 07:11:36 +00:00 · b22d34fe12
--- a/xpinstall/packager/packages-win
+++ b/xpinstall/packager/packages-win
@ -9,28 +9,32 @@
 ;

 [core]
-bin\component.reg
+; files required to initialize xpinstall for Install Wizard
+bin\js3250.dll
+bin\mozreg.dll
+bin\nspr3.dll
+bin\plc3.dll
+bin\plds3.dll
+bin\xpcom.dll
+bin\xpistub.dll
+bin\zlib.dll
+bin\components\jar50.dll
+bin\components\xpinstal.dll
+
+[browser]
+; files listed in core (missing in this section) will be installed as part of the browser
 bin\gkgfxwin.dll
 bin\gkplugin.dll
 bin\gkweb.dll
 bin\gkwidget.dll
 bin\img3250.dll
 bin\jpeg3250.dll
-bin\js3250.dll
 bin\jsdom.dll
 bin\jsj3250.dll
 bin\mozilla.exe
-bin\mozreg.dll
 bin\netscape.cfg
-bin\nspr3.dll
-bin\nsreg.dll
 bin\oji.dll
-bin\plc3.dll
-bin\plds3.dll
 bin\prstrms3.dll
-bin\xpcom.dll
-bin\xpistub.dll
-bin\zlib.dll
 bin\components\AcctIdl.dll
 bin\components\AcctIdl.xpt
 bin\components\appshell.xpt
@ -60,7 +64,6 @@ bin\components\history.dll
 bin\components\history.xpt
 bin\components\intl.xpt
 bin\components\jar.xpt
-bin\components\jar50.dll
 bin\components\jsloader.dll
 bin\components\jsurl.dll
 bin\components\jsurl.xpt
@ -82,7 +85,6 @@ bin\components\necko.xpt
 bin\components\necko_about.xpt
 bin\components\necko_data.xpt
 bin\components\necko_dns.xpt
-bin\components\necko_file.xpt
 bin\components\necko_ftp.xpt
 bin\components\necko_http.xpt
 bin\components\nkabout.dll
@ -104,11 +106,8 @@ bin\components\nsprefm.dll
 bin\components\nsSidebar.js
 bin\components\oji.dll
 bin\components\oji.xpt
-bin\components\pics.dll
 bin\components\pref.xpt
 bin\components\prefmigr.xpt
-bin\components\prefwind.dll
-bin\components\prefwindow.xpt
 bin\components\profile.dll
 bin\components\profile.xpt
 bin\components\proxyObjInst.xpt
@ -120,7 +119,6 @@ bin\components\related.dll
 bin\components\related.xpt
 bin\components\search.dll
 bin\components\search.xpt
-bin\components\sidebar.dll
 bin\components\sidebar.xpt
 bin\components\signonviewer.xpt
 bin\components\streamconv.xpt
@ -158,7 +156,6 @@ bin\components\xpcom_nativeapp.xpt
 bin\components\xpcom_thread.xpt
 bin\components\xpconnect.xpt
 bin\components\xpiflash.dll
-bin\components\xpinstal.dll
 bin\components\xpinstall.xpt
 bin\components\xppref32.dll
 bin\chrome\bookmarks\*
@ -185,7 +182,6 @@ bin\chrome\related\*
 bin\chrome\sidebar\*
 bin\chrome\wallet\*
 bin\chrome\xpinstall\*
-bin\chrome\registry.rdf
 bin\chrome\xul.css
 bin\chrome\xulBindings.xml
 bin\chrome\htmlBindings.xml
--- a/xpinstall/packager/windows/browser.jst
+++ b/xpinstall/packager/windows/browser.jst
@ -0,0 +1,80 @@
+function updateWinReg()
+{
+  //Notes:
+  // can't use a double backslash before subkey - Windows already puts it in.
+  // subkeys have to exist before values can be put in.
+  var winreg = getWinRegistry();
+  var subkey;  //the name of the subkey you are poking around in
+  var valname; // the name of the value you want to look at
+  var value;   //the data in the value you want to look at.
+
+  if(winreg != null) 
+  {
+    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
+    subkey  = "SOFTWARE\\Netscape\\Netscape Seamonkey";
+    winreg.createKey(subkey,"");
+    valname = "CurrentVersion";
+    value   = "$UserAgent$";
+    err     = winreg.setValueString(subkey, valname, value);
+
+    subkey  = "SOFTWARE\\Netscape\\Netscape Seamonkey\\$UserAgent$\\Main";
+    winreg.createKey(subkey,"");
+    valname = "Install Directory";
+    value   = communicatorFolder;
+    err     = winreg.setValueString(subkey, valname, value);
+
+    // set the App Paths key here
+    subkey  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\mozilla.exe";
+    winreg.createKey(subkey,"");
+    valname = "";
+    value   = communicatorFolder + "\\mozilla.exe";
+    err     = winreg.setValueString(subkey, valname, value);
+
+    valname = "Path";
+    value   = communicatorFolder;
+    err     = winreg.setValueString(subkey, valname, value);
+  }
+}
+
+// main
+var srDest;
+var err;
+var communicatorFolder;
+var fWindowsSystem;
+var fileComponentRegStr;
+var fileComponentReg;
+
+srDest = $SpaceRequired$:bin;
+err    = startInstall("Mozilla Seamonkey", "", "$Version$"); 
+logComment("startInstall: " + err);
+
+communicatorFolder = getFolder("Communicator");
+fWindowsSystem     = getFolder("Win System");
+logComment("communicatorFolder: " + communicatorFolder);
+
+if(verifyDiskSpace(communicatorFolder, srDest) == true)
+{
+  err = addDirectory("Program",
+                     "$Version$",
+                     "bin",              // dir name in jar to extract 
+                     communicatorFolder, // Where to put this file (Returned from GetFolder) 
+                     "",                 // subdir name to create relative to communicatorFolder
+                     true);              // Force Flag 
+  logComment("addDirectory() of Program returned: " + err);
+
+  // check return value
+  if(!checkError(err))
+  {
+    fileComponentRegStr = communicatorFolder + "\\component.reg";
+    fileComponentReg    = getFolder("file:///", fileComponentRegStr);
+    err                 = fileDelete(fileComponentReg);
+    logComment("fileDelete() returned: " + err);
+
+    updateWinReg();
+
+    err = finalizeInstall(); 
+    logComment("finalizeInstall() returned: " + err);
+  }
+}
+
+// end main
--- a/xpinstall/packager/windows/config.it
+++ b/xpinstall/packager/windows/config.it
@ -105,6 +105,7 @@ Description Long=Program will be installed with the minimal options.
 ; All other components not listed here will be disabled if
 ; this Setup Type is selected.
 C0=Component0
+C1=Component1

 [Setup Type1]
 Description Short=C&omplete
@ -115,6 +116,7 @@ Description Long=Program will be installed with the most common options.
 ; this Setup Type is selected.
 C0=Component0
 C1=Component1
+C2=Component2

 [Setup Type2]
 Description Short=C&ustom
@ -127,6 +129,7 @@ Description Long=You may choose the options you want to install.  Recommended fo
 ; this Setup Type is selected.
 C0=Component0
 C1=Component1
+C2=Component2

 ;[Setup Type3]
 ;Description Short=C&ustom
@ -215,8 +218,8 @@ Message=Setup has detected that an instance of Seamonkey is currently running.
 ; Components dialog) for installation.
 ; There is no limit to the number of components to install.
 [Component0]
-Description Short=Mozilla Seamonkey
-Description Long=Browser software for the internet
+Description Short=Mozilla Xpinstall Engine
+Description Long=Install Engine
 Archive=core.xpi
 $InstallSize$:core
 $InstallSizeSystem$
@ -224,6 +227,24 @@ $InstallSizeArchive$:core.xpi
 ; Attributes can be the following values:
 ;   SELECTED  - the component is selected to be installed by default.
 ;   INVISIBLE - the component is not shown in the Select Components dialog.
+Attributes=SELECTED|INVISIBLE
+; url keys can be as many as needed.  url0 is attempted first.  if it fails,
+; the next url key is tried in sequential order.
+; The url should not contain the filename.  Setup will assemble the complete url
+; using the url keys and the Archive key.
+url0=$URLPath$
+
+[Component1]
+Description Short=Mozilla Seamonkey
+Description Long=Browser software for the internet
+Archive=browser.xpi
+$InstallSize$:browser
+$InstallSizeSystem$
+$InstallSizeArchive$:browser.xpi
+Dependency0=Mozilla Xpinstall Engine
+; Attributes can be the following values:
+;   SELECTED  - the component is selected to be installed by default.
+;   INVISIBLE - the component is not shown in the Select Components dialog.
 Attributes=SELECTED
 ; url keys can be as many as needed.  url0 is attempted first.  if it fails,
 ; the next url key is tried in sequential order.
@ -231,14 +252,14 @@ Attributes=SELECTED
 ; using the url keys and the Archive key.
 url0=$URLPath$

-[Component1]
+[Component2]
 Description Short=Mail&News
 Description Long=Seamonkey Mail&News
 Archive=mail.xpi
 $InstallSize$:mail
 $InstallSizeSystem$
 $InstallSizeArchive$:mail.xpi
-;Dependency0=Mozilla Seamonkey
+Dependency0=Mozilla Xpinstall Engine
 ; Attributes can be the following values:
 ;   SELECTED  - the component is selected to be installed by default.
 ;   INVISIBLE - the component is not shown in the Select Components dialog.
--- a/xpinstall/packager/windows/core.jst
+++ b/xpinstall/packager/windows/core.jst
@ -1,41 +1,3 @@
-function updateWinReg()
-{
-  //Notes:
-  // can't use a double backslash before subkey - Windows already puts it in.
-  // subkeys have to exist before values can be put in.
-  var winreg = getWinRegistry();
-  var subkey;  //the name of the subkey you are poking around in
-  var valname; // the name of the value you want to look at
-  var value;   //the data in the value you want to look at.
-
-  if(winreg != null) 
-  {
-    winreg.setRootKey(winreg.HKEY_LOCAL_MACHINE);
-    subkey  = "SOFTWARE\\Netscape\\Netscape Seamonkey";
-    winreg.createKey(subkey,"");
-    valname = "CurrentVersion";
-    value   = "$UserAgent$";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    subkey  = "SOFTWARE\\Netscape\\Netscape Seamonkey\\$UserAgent$\\Main";
-    winreg.createKey(subkey,"");
-    valname = "Install Directory";
-    value   = communicatorFolder;
-    err     = winreg.setValueString(subkey, valname, value);
-
-    // set the App Paths key here
-    subkey  = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\App Paths\\mozilla.exe";
-    winreg.createKey(subkey,"");
-    valname = "";
-    value   = communicatorFolder + "\\mozilla.exe";
-    err     = winreg.setValueString(subkey, valname, value);
-
-    valname = "Path";
-    value   = communicatorFolder;
-    err     = winreg.setValueString(subkey, valname, value);
-  }
-}
-
 // main
 var srDest;
 var err;
@ -45,7 +7,7 @@ var fileComponentRegStr;
 var fileComponentReg;

 srDest = $SpaceRequired$:bin;
-err    = startInstall("Netscape Seamonkey", "", "$Version$"); 
+err    = startInstall("Mozilla Xpinstall Engine", "", "$Version$"); 
 logComment("startInstall: " + err);

 communicatorFolder = getFolder("Communicator");
@ -70,8 +32,6 @@ if(verifyDiskSpace(communicatorFolder, srDest) == true)
    err                 = fileDelete(fileComponentReg);
    logComment("fileDelete() returned: " + err);

-    updateWinReg();
-
    err = finalizeInstall(); 
    logComment("finalizeInstall() returned: " + err);
  }
--- a/xpinstall/packager/windows/makeall.pl
+++ b/xpinstall/packager/windows/makeall.pl
@ -66,10 +66,12 @@ if(!(-e "$inDistPath"))

 # Make .js files
 MakeJsFile("core");
+MakeJsFile("browser");
 MakeJsFile("mail");

 # Make .xpi files
 MakeXpiFile("core");
+MakeXpiFile("browser");
 MakeXpiFile("mail");

 MakeConfigFile();