Bug 436719: Read updater.ini from app dir, not gre. r=bsmedberg, r=philor
authorDave Townsend <dtownsend@oxymoronical.com>
Thu, 14 Aug 2008 17:09:21 +0100
changeset 100 afd9373bce4d89eabc21392022ee6e4c7e2fb0be
parent 99 e666b8f2c874da04693d582489a4dc90fbe61726
child 101 50e6655f95eb5685d9bd98a1ffcd1cfec3f6932b
push idunknown
push userunknown
push dateunknown
reviewersbsmedberg, philor
bugs436719
Bug 436719: Read updater.ini from app dir, not gre. r=bsmedberg, r=philor
mail/installer/removed-files.in
mail/locales/Makefile.in
suite/installer/removed-files.in
suite/locales/Makefile.in
--- a/mail/installer/removed-files.in
+++ b/mail/installer/removed-files.in
@@ -284,16 +284,17 @@ extensions/talkback@mozilla.org/componen
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/info.nib
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/English.lproj/SendingSettings.nib/objects.nib
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoKeys.plist
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/KeyInfoSections.plist
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/send.tiff
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_ascending.tiff
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/sort_descending.tiff
 extensions/talkback@mozilla.org/components/talkback/Talkback.app/Contents/Resources/Talkback.icns
+updater.app/Contents/MacOS/updater.ini
 #else
 extensions/talkback@mozilla.org/components/talkback/talkback
 extensions/talkback@mozilla.org/components/talkback/XTalkback.ad
 extensions/talkback@mozilla.org/components/master.ini
 extensions/talkback@mozilla.org/components/talkback.so
 #endif
 #endif
 components/airbag.xpt
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -244,15 +244,11 @@ endif
 	@$(MAKE) repackage-zip-$*
 
 ifdef MOZ_UPDATER
 libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
 ifeq ($(OS_ARCH),WINNT)
 	cat $< $(srcdir)/../installer/windows/nsis/updater_append.ini | \
 	  iconv -f UTF-8 -t $(WIN_INSTALLER_CHARSET) > $(FINAL_TARGET)/updater.ini
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/updater.app/Contents/MacOS
-else
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 endif
-endif
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -48,16 +48,19 @@ extensions/talkback@mozilla.org/componen
 extensions/talkback@mozilla.org/components/fullsoft.dll
 extensions/talkback@mozilla.org/components/master.ini
 extensions/talkback@mozilla.org/components/talkback-l10n.ini
 extensions/talkback@mozilla.org/components/talkback.cnt
 extensions/talkback@mozilla.org/components/talkback.exe
 extensions/talkback@mozilla.org/components/talkback.hlp
 extensions/talkback@mozilla.org/InstallDisabled
 #endif
+#ifdef XP_MACOSX
+updater.app/Contents/MacOS/updater.ini
+#endif
 components/airbag.xpt
 components/@DLL_PREFIX@bookmark@DLL_SUFFIX@
 components/bookmarks.xpt
 components/chatzilla-service.js
 components/crashreporter.xpt
 components/nsCloseAllWindows.js
 components/nsKillAll.js
 components/nsScriptableIO.js
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -266,15 +266,11 @@ ifeq (WINNT,$(OS_ARCH))
 endif
 	@$(MAKE) repackage-zip-$*
 
 ifdef MOZ_UPDATER
 libs:: $(addprefix $(LOCALE_SRCDIR)/,updater/updater.ini)
 ifeq ($(OS_ARCH),WINNT)
 	iconv -f UTF-8 -t $(WIN_INSTALLER_CHARSET) $< > $(FINAL_TARGET)/updater.ini
 else
-ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
-	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/updater.app/Contents/MacOS
-else
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)
 endif
 endif
-endif