Bug 474978 Move generation of install.rdf for default theme to be alongside theme files. r=mkmelin
authorMark Banner <bugzilla@standard8.plus.com>
Sun, 25 Jan 2009 19:03:02 +0000
changeset 1750 1824ae4b67d7a0b5067f5275058d4d0248e24d6e
parent 1749 59f3bf19689779c036920d3a5519c6aeb95f330a
child 1751 f2ec73c00ef5a5c4f40642aaacd0e5cc4d6babfd
push idunknown
push userunknown
push dateunknown
reviewersmkmelin
bugs474978
Bug 474978 Move generation of install.rdf for default theme to be alongside theme files. r=mkmelin
mail/Makefile.in
mail/app/profile/Makefile.in
mail/app/profile/extensions/Makefile.in
mail/app/profile/extensions/installed-extensions.txt
mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
mail/makefiles.sh
mail/themes/Makefile.in
mail/themes/install.rdf
--- a/mail/Makefile.in
+++ b/mail/Makefile.in
@@ -37,38 +37,18 @@
 
 DEPTH		= ..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(topsrcdir)/config/config.mk
 
-DIRS		= base locales components extensions
-
-#
-# Theme Selection
-#
-# Linux                   Gnomesripe
-# Windows                 Qute
-# MacOS X                 Pinstripe
-#
-
-ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
-DIRS += themes/gnomestripe
-else
-ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
-DIRS += themes/pinstripe
-else
-DIRS += themes/qute
-endif
-endif
-
 # app is always last as it packages up the built files on mac
-DIRS += app
+DIRS		= base locales components extensions themes app
 
 ifeq ($(OS_ARCH),WINNT)
 ifdef MOZ_INSTALLER
 # though some lasts are more last than others
 DIRS += installer/windows
 endif
 endif
 
--- a/mail/app/profile/Makefile.in
+++ b/mail/app/profile/Makefile.in
@@ -37,26 +37,20 @@
 
 DEPTH		= ../../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
-DIRS = extensions
-
 include $(topsrcdir)/config/rules.mk
 
 FILES := \
 	mimeTypes.rdf \
 	localstore.rdf \
 	$(NULL)
 
 libs:: $(FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DIST)/bin/defaults/profile
 
 install:: $(FILES)
 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile
-
-ifneq (,$(filter gtk2 mac cocoa, $(MOZ_WIDGET_TOOLKIT)))
-DEFINES += -DHAVE_SHELL_SERVICE=1
-endif
deleted file mode 100644
--- a/mail/app/profile/extensions/Makefile.in
+++ /dev/null
@@ -1,47 +0,0 @@
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 2001
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 2 or later (the "GPL"), or
-# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-DEPTH		= ../../../..
-topsrcdir	= @top_srcdir@
-srcdir		= @srcdir@
-VPATH		= @srcdir@
-
-include $(DEPTH)/config/autoconf.mk
-
-DIRS = {972ce4c6-7e08-4474-a285-3208198ce6fd}
-
-include $(topsrcdir)/config/rules.mk
deleted file mode 100644
--- a/mail/app/profile/extensions/installed-extensions.txt
+++ /dev/null
@@ -1,1 +0,0 @@
-theme,{972ce4c6-7e08-4474-a285-3208198ce6fd}
--- a/mail/makefiles.sh
+++ b/mail/makefiles.sh
@@ -51,16 +51,17 @@ mail/components/preferences/Makefile
 mail/components/build/Makefile
 mail/components/shell/Makefile
 mail/components/shell/public/Makefile
 mail/components/phishing/Makefile
 mail/extensions/Makefile
 mail/extensions/smime/Makefile
 mail/installer/Makefile
 mail/installer/windows/Makefile
+mail/themes/Makefile
 mail/themes/pinstripe/Makefile
 mail/themes/qute/Makefile
 mail/themes/gnomestripe/Makefile
 "
 
 if test -n "$MOZ_BRANDING_DIRECTORY"; then
   add_makefiles "
     $MOZ_BRANDING_DIRECTORY/Makefile
rename from mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
rename to mail/themes/Makefile.in
--- a/mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/Makefile.in
+++ b/mail/themes/Makefile.in
@@ -1,9 +1,8 @@
-#
 # ***** BEGIN LICENSE BLOCK *****
 # Version: MPL 1.1/GPL 2.0/LGPL 2.1
 #
 # The contents of this file are subject to the Mozilla Public License Version
 # 1.1 (the "License"); you may not use this file except in compliance with
 # the License. You may obtain a copy of the License at
 # http://www.mozilla.org/MPL/
 #
@@ -30,28 +29,46 @@
 # use your version of this file under the terms of the MPL, indicate your
 # decision by deleting the provisions above and replace them with the notice
 # and other provisions required by the GPL or the LGPL. If you do not delete
 # the provisions above, a recipient may use your version of this file under
 # the terms of any one of the MPL, the GPL or the LGPL.
 #
 # ***** END LICENSE BLOCK *****
 
-DEPTH		= ../../../../..
+DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
-include $(DEPTH)/config/autoconf.mk
+include $(topsrcdir)/config/config.mk
+
+#
+# Theme Selection
+#
+# Linux                   Gnomesripe
+# Windows                 Qute
+# MacOS X                 Pinstripe
+#
+
+ifneq (,$(filter gtk2 qt,$(MOZ_WIDGET_TOOLKIT)))
+DIRS += gnomestripe
+else
+ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+DIRS += pinstripe
+else
+DIRS += qute
+endif
+endif
+
 include $(topsrcdir)/config/rules.mk
 
+CLASSIC_EXTENSION_DIR = {972ce4c6-7e08-4474-a285-3208198ce6fd}
+
 DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION)
 
-FILES := \
-	install.rdf \
-	$(NULL)
+libs::
+	$(NSINSTALL) -D $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)
+	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf > $(DIST)/bin/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf
 
-libs::
-	$(PERL) $(MOZILLA_DIR)/config/preprocessor.pl $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf.in > install.rdf
-	$(INSTALL) $(FILES) $(DIST)/bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
- 
 install::
-	$(SYSINSTALL) $(IFLAGS1) $(FILES) $(DESTDIR)$(mozappdir)/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
+	$(NSINSTALL) -D $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)
+	$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/install.rdf > $(DESTDIR)$(mozappdir)/extensions/$(CLASSIC_EXTENSION_DIR)/install.rdf
rename from mail/app/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf.in
rename to mail/themes/install.rdf