Bug 736864. (Av2) packaging: Add 'MOZ_UPDATER' condition for 3 files, Sort '[@AB_CD@]' files, Sync' removed-files.in. r+a=Callek
authorSerge Gautherie <sgautherie.bz@free.fr>
Sun, 25 Mar 2012 08:28:00 -0400
changeset 10720 9b0476ac8947002992c9e1144ca50422855a9697
parent 10719 df26107591e11a2bc18f80e12e831ba55b2b008d
child 10721 3d8ebd263312d29b9a8739f7664ee7e511fb96d2
push idunknown
push userunknown
push dateunknown
bugs736864
Bug 736864. (Av2) packaging: Add 'MOZ_UPDATER' condition for 3 files, Sort '[@AB_CD@]' files, Sync' removed-files.in. r+a=Callek
suite/installer/package-manifest.in
suite/installer/removed-files.in
--- a/suite/installer/package-manifest.in
+++ b/suite/installer/package-manifest.in
@@ -28,28 +28,30 @@
 @APPNAME@/Contents/Resources/
 #endif
 
 [@AB_CD@]
 @BINPATH@/chrome/@AB_CD@@JAREXT@
 @BINPATH@/chrome/@AB_CD@.manifest
 @BINPATH@/defaults/messenger/mailViews.dat
 @BINPATH@/defaults/profile/bookmarks.html
+@BINPATH@/defaults/profile/chrome/*
 @BINPATH@/defaults/profile/localstore.rdf
 @BINPATH@/defaults/profile/mimeTypes.rdf
 @BINPATH@/defaults/profile/panels.rdf
-@BINPATH@/defaults/profile/chrome/*
-@BINPATH@/@PREF_DIR@/suite-l10n.js
 @BINPATH@/dictionaries/*
 @BINPATH@/hyphenation/*
+@BINPATH@/@PREF_DIR@/suite-l10n.js
 @BINPATH@/searchplugins/*
+#ifdef XP_WIN32
+@BINPATH@/uninstall/helper.exe
+#endif
+#ifdef MOZ_UPDATER
 @BINPATH@/update.locale
 @BINPATH@/updater.ini
-#ifdef XP_WIN32
-@BINPATH@/uninstall/helper.exe
 #endif
 
 [xpcom]
 @BINPATH@/dependentlibs.list
 #ifdef XP_WIN32
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
 @BINPATH@/@DLL_PREFIX@mozalloc@DLL_SUFFIX@
@@ -610,21 +612,23 @@ bin/libfreebl_32int64_3.so
 #else
 @BINPATH@/@DLL_PREFIX@ldap60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@ldif60@DLL_SUFFIX@
 @BINPATH@/@DLL_PREFIX@prldap60@DLL_SUFFIX@
 #endif
 
 ; [Updater]
 ;
+#ifdef MOZ_UPDATER
 #ifdef XP_MACOSX
 @BINPATH@/updater.app/
 #else
 @BINPATH@/updater@BIN_SUFFIX@
 #endif
+#endif
 
 ; [Crash Reporter]
 ;
 #ifdef MOZ_CRASHREPORTER
 #ifdef XP_MACOSX
 @BINPATH@/crashreporter.app/
 #else
 @BINPATH@/crashreporter@BIN_SUFFIX@
--- a/suite/installer/removed-files.in
+++ b/suite/installer/removed-files.in
@@ -516,18 +516,24 @@ searchplugins/zoznam-sk.src
 @DLL_PREFIX@sqlite3@DLL_SUFFIX@
 #ifndef MOZ_CRASHREPORTER
 #ifdef XP_UNIX
 #ifndef XP_MACOSX
 Throbber-small.gif
 #endif
 #endif
 #endif
-#ifdef XP_MACOSX
-updater.app/Contents/MacOS/updater.ini
+#ifndef MOZ_UPDATER
+  update.locale
+  #ifdef XP_MACOSX
+    updater.app/
+  #else
+    updater@BIN_SUFFIX@
+  #endif
+  updater.ini
 #endif
 #ifdef XP_OS2
   @DLL_PREFIX@xpcomcor@DLL_SUFFIX@
 #else
   @DLL_PREFIX@xpcom_core@DLL_SUFFIX@
 #endif
 xpicleanup@BIN_SUFFIX@
 @DLL_PREFIX@xpistub@DLL_SUFFIX@
@@ -1024,17 +1030,19 @@ xpicleanup@BIN_SUFFIX@
   res/html/folder.png
   res/entityTables/
   res/entityTables/html40Latin1.properties
   res/entityTables/html40Special.properties
   res/entityTables/html40Symbols.properties
   res/entityTables/htmlEntityVersions.properties
   res/entityTables/mathml20.properties
   res/entityTables/transliterate.properties
-  update.locale
+  #ifdef MOZ_UPDATER
+    update.locale
+  #endif
 #else
   components/binary.manifest
   omni.jar
   omni.ja
 #endif
 
 ; pre-libxul static mail library
 components/@DLL_PREFIX@mail@DLL_SUFFIX@