386653 Remove dependency on nsBuildID.h, whose recent death is causing build failures. Introduce CmXULAppInfo, an nsIXULAppInfo implementation, and build system support to maintain the build ID ourselves. r=smorgan, also examined by ardisonne, sr=me for camino, checking in now to clear the build failures
authormark@moxienet.com
Tue, 10 Jul 2007 20:48:04 -0700
changeset 3318 e3463b77b01963903138c935e6bb075935238299
parent 3317 7bcd7a075d3a9113a4fcef0c7d117aa3eaab3731
child 3319 7b00ea498a60f1e92977e987d353a8aca9e26039
push idunknown
push userunknown
push dateunknown
reviewerssmorgan, also, me
bugs386653
milestone1.9a7pre
386653 Remove dependency on nsBuildID.h, whose recent death is causing build failures. Introduce CmXULAppInfo, an nsIXULAppInfo implementation, and build system support to maintain the build ID ourselves. r=smorgan, also examined by ardisonne, sr=me for camino, checking in now to clear the build failures
xpfe/global/Makefile.in
xpfe/global/build.dtd.in
xpfe/global/jar.mn
--- a/xpfe/global/Makefile.in
+++ b/xpfe/global/Makefile.in
@@ -39,35 +39,29 @@ DEPTH		= ../..
 topsrcdir	= @top_srcdir@
 srcdir		= @srcdir@
 VPATH		= @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
 DIRS		= resources
 
-CHROME_DEPS	= build.dtd buildconfig.html
+CHROME_DEPS	= buildconfig.html
 
 include $(topsrcdir)/config/rules.mk
 
 DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 CHROME_PLATFORM = mac
 else
 ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
 CHROME_PLATFORM = win
 else
 CHROME_PLATFORM = unix
 endif
 endif
 
-GARBAGE		+= build.dtd
-
-build.dtd: build.dtd.in $(DEPTH)/config/build_number
-	@$(RM) -f $@
-	$(PERL) -I$(topsrcdir)/config $(topsrcdir)/config/aboutime.pl $@ $(DEPTH)/config/build_number $(srcdir)/build.dtd.in
-
 libs realchrome::
 	@$(REGCHROME) locale en-US/global-platform/$(CHROME_PLATFORM) en-US.jar
 
 install::
 	@$(REGCHROME_INSTALL) locale en-US/global-platform/$(CHROME_PLATFORM) en-US.jar
deleted file mode 100644
--- a/xpfe/global/build.dtd.in
+++ /dev/null
@@ -1,1 +0,0 @@
-<!ENTITY  buildId.label               "Build ID: 0000000000">
--- a/xpfe/global/jar.mn
+++ b/xpfe/global/jar.mn
@@ -75,17 +75,16 @@ toolkit.jar:
         content/global/about.xul                    (resources/content/about.xul) 
 #ifdef MOZ_SUITE
         content/global/logo.gif                     (/suite/branding/content/logo.gif) 
 #else
         content/global/logo.gif                     (resources/content/logo.gif) 
         content/global/aboutAbout.html              (resources/content/aboutAbout.html) 
         content/global/hiddenWindow.xul             (resources/content/hiddenWindow.xul) 
         content/global/fullScreen.js                (resources/content/fullScreen.js)
-        content/global/build.dtd                    (build.dtd)
         content/global/nsWidgetStateManager.js      (resources/content/nsWidgetStateManager.js)
 #endif
 
 en-US.jar:
 *   locale/en-US/global/contents.rdf                (resources/locale/en-US/contents.rdf) 
     locale/en-US/global/intl.css                    (resources/locale/en-US/intl.css) 
     locale/en-US/global/dialogOverlay.dtd           (resources/locale/en-US/dialogOverlay.dtd) 
     locale/en-US/global/commonDialog.dtd            (resources/locale/en-US/commonDialog.dtd)