Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 448155 - builds should have changeset ID in about:buildconfig when possible. r=bsmedberg

Browse Source 
--HG--
rename : toolkit/content/buildconfig.html.in => toolkit/content/buildconfig.html
This commit is contained in:
Ted Mielczarek 2008-09-22 14:00:38 -04:00
parent 97309c11e4
commit c2e30f605a
5 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/autoconf.mk.in
View File

@ -41,6 +41,8 @@
INCLUDED_AUTOCONF_MK = 1
USE_AUTOCONF = 1
MOZILLA_CLIENT = 1
target = @target@
ac_configure_args = @ac_configure_args@
BUILD_MODULES = @BUILD_MODULES@
MOZILLA_VERSION = @MOZILLA_VERSION@
FIREFOX_VERSION = @FIREFOX_VERSION@

30
toolkit/content/Makefile.in
View File

@ -45,7 +45,32 @@ CHROME_DEPS = buildconfig.html
include $(DEPTH)/config/autoconf.mk
DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
DEFINES += \
-DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \
-Dtarget="$(target)" \
-Dac_configure_args="$(ac_configure_args)" \
-DCC="$(CC)" \
-DCC_VERSION="$(CC_VERSION)" \
-DCFLAGS="$(CFLAGS)" \
-DCXX="$(CXX)" \
-DCXX_VERSION="$(CXX_VERSION)" \
-DCXXFLAGS="$(CXXFLAGS)" \
-DCPPFLAGS="$(CPPFLAGS)" \
$(NULL)
CHANGESET := $(shell hg identify -i $(topsrcdir) 2>/dev/null)
ifdef CHANGESET
DEFINES += -DSOURCE_CHANGESET="$(CHANGESET)"
endif
# strip a trailing slash from the repo URL because it's not always present,
# and we want to construct a working URL in buildconfig.html
# make+shell+sed = awful
_dollar=$$
SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
ifdef SOURCE_REPO
DEFINES += -DSOURCE_REPO="$(SOURCE_REPO)"
endif
ifdef ENABLE_TESTS
DIRS += tests
@ -55,6 +80,3 @@ EXTRA_JS_MODULES = debug.js
EXTRA_PP_JS_MODULES = debug.js
include $(topsrcdir)/config/rules.mk
distclean::
$(RM) -f buildconfig.html

7
toolkit/content/buildconfig.html.in → toolkit/content/buildconfig.html
View File

@ -1,4 +1,5 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
#filter substitution
<html>
<head>
<title>about:buildconfig</title>
@ -7,6 +8,12 @@
<body class="aboutPageWideContainer">
<h1>about:buildconfig</h1>
<p> </p>
#ifdef SOURCE_REPO
#ifdef SOURCE_CHANGESET
<h2>Source</h2>
<p>Built from <a href="@SOURCE_REPO@/rev/@SOURCE_CHANGESET@">@SOURCE_REPO@/rev/@SOURCE_CHANGESET@</a></p>
#endif
#endif
<h2>Build platform</h2>
<table>
<tbody>

2
toolkit/content/jar.mn
View File

@ -11,7 +11,7 @@ toolkit.jar:
* content/global/about.xhtml (about.xhtml)
content/global/plugins.html
content/global/plugins.css
+ content/global/buildconfig.html (buildconfig.html)
*+ content/global/buildconfig.html (buildconfig.html)
+ content/global/charsetOverlay.js (charsetOverlay.js)
+ content/global/charsetOverlay.xul (charsetOverlay.xul)
*+ content/global/commonDialog.js (commonDialog.js)

1
toolkit/toolkit-makefiles.sh
View File

@ -646,7 +646,6 @@ MAKEFILES_xulapp="
toolkit/crashreporter/google-breakpad/src/common/windows/Makefile
toolkit/crashreporter/google-breakpad/src/tools/mac/dump_syms/Makefile
toolkit/content/Makefile
toolkit/content/buildconfig.html
toolkit/obsolete/Makefile
toolkit/components/alerts/Makefile
toolkit/components/alerts/public/Makefile