Part of Bug 366673 - SeaMonkey no longer needs to use installed-chrome.txt. r=KaiRo
authorMark Banner <bugzilla@standard8.plus.com>
Mon, 29 Sep 2008 11:50:03 +0100
changeset 459 f8499aaeeba17b796910b8943bb567bb0b058024
parent 458 7fe8dc6fc848247b3df68fb7c6cbcd7c4665d497
child 460 4e502622d8b1bbbc5f03842812e0914c30a58ccc
push idunknown
push userunknown
push dateunknown
reviewersKaiRo
bugs366673
Part of Bug 366673 - SeaMonkey no longer needs to use installed-chrome.txt. r=KaiRo
suite/installer/removed-files.in
suite/installer/unix/packages
suite/installer/windows/nsis/installer.nsi
suite/installer/windows/packages
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -1,11 +1,13 @@
+chrome/app-chrome.manifest
 chrome/chatzilla.jar
 chrome/debugqa.jar
 chrome/debugqa.manifest
+chrome/installed-chrome.txt
 chrome/icons/default/abcardWindow.xpm
 chrome/icons/default/abcardWindow16.xpm
 chrome/icons/default/ablistWindow.xpm
 chrome/icons/default/addressbookWindow.xpm
 chrome/icons/default/addressbookWindow16.xpm
 chrome/icons/default/bmPropsWindow.xpm
 chrome/icons/default/bmPropsWindow16.xpm
 chrome/icons/default/bookmark-window.xpm
--- a/suite/installer/unix/packages
+++ b/suite/installer/unix/packages
@@ -325,17 +325,16 @@ bin/chrome/icons/default/JSConsoleWindow
 bin/chrome/icons/default/main-window.png
 bin/chrome/icons/default/main-window16.png
 bin/chrome/icons/default/main-window48.png
 bin/chrome/icons/default/seamonkey.png
 ; Although venkman-window is an extension, its icon is still suite-specific
 bin/chrome/icons/default/venkman-window.png
 bin/chrome/icons/default/venkman-window16.png
 bin/chrome/icons/default/venkman-window48.png
-bin/chrome/installed-chrome.txt
 bin/chrome/toolkit.jar
 bin/chrome/toolkit.manifest
 
 ; classic theme
 bin/chrome/classic.jar
 bin/chrome/classic.manifest
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
 bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
--- a/suite/installer/windows/nsis/installer.nsi
+++ b/suite/installer/windows/nsis/installer.nsi
@@ -394,19 +394,16 @@ Section "-Application" Section1
   ${LogUninstall} "File: \components\compreg.dat"
   ${LogUninstall} "File: \components\xpti.dat"
   ${LogUninstall} "File: \.autoreg"
   ${LogUninstall} "File: \active-update.xml"
   ${LogUninstall} "File: \install.log"
   ${LogUninstall} "File: \install_status.log"
   ${LogUninstall} "File: \install_wizard.log"
   ${LogUninstall} "File: \updates.xml"
-  ; As soon as installed-chrome.txt is removed from the build, this line can be
-  ; deleted and a new entry can be added to removed-files.in
-  ${LogUninstall} "File: \chrome\app-chrome.manifest"
 
   SetDetailsPrint textonly
   DetailPrint $(STATUS_INSTALL_LANG)
   SetDetailsPrint none
   ${LogHeader} "Installing Localized Files"
   StrCpy $R0 "$EXEDIR\localized"
   StrCpy $R1 "$INSTDIR"
   Call DoCopyFiles
--- a/suite/installer/windows/packages
+++ b/suite/installer/windows/packages
@@ -309,17 +309,16 @@ bin\extensions\modern@themes.mozilla.org
 bin\extensions\modern@themes.mozilla.org\install.rdf
 bin\extensions\modern@themes.mozilla.org\preview.png
 
 ; chrome stuff
 bin\chrome\comm.jar
 bin\chrome\comm.manifest
 bin\chrome\toolkit.jar
 bin\chrome\toolkit.manifest
-bin\chrome\installed-chrome.txt
 bin\chrome\chromelist.txt
 bin\chrome\icons\default\bmPropsWindow.ico
 bin\chrome\icons\default\bookmark-window.ico
 bin\chrome\icons\default\downloadManager.ico
 bin\chrome\icons\default\editorWindow.ico
 bin\chrome\icons\default\findBookmarkWindow.ico
 bin\chrome\icons\default\findHistoryWindow.ico
 bin\chrome\icons\default\history-window.ico