diff options
Diffstat (limited to 'browser')
| -rw-r--r-- | browser/base/content/aboutDialog.xul | 8 | ||||
| -rw-r--r-- | browser/components/BrowserComponents.manifest | 2 | ||||
| -rw-r--r-- | browser/installer/Makefile.in | 4 | ||||
| -rw-r--r-- | browser/installer/package-manifest.in | 4 | ||||
| -rw-r--r-- | browser/installer/windows/Makefile.in | 2 |
5 files changed, 8 insertions, 12 deletions
diff --git a/browser/base/content/aboutDialog.xul b/browser/base/content/aboutDialog.xul index f64e79681..5780e5ec1 100644 --- a/browser/base/content/aboutDialog.xul +++ b/browser/base/content/aboutDialog.xul @@ -122,12 +122,18 @@ &warningDesc.version; </description> </vbox> +#ifdef MC_PRIVATE_BUILD +<description class="text-blurb" id="communityDesc"> + This is a private build of Basilisk. If you did not manually build this copy from source yourself, then please download an official version from the <label class="text-link" href="http://www.basilisk-browser.org/">Basilisk website</label>. + </description> +#else <description class="text-blurb" id="communityDesc"> Basilisk is community software released by <label class="text-link" href="http://www.palemoon.org/">the Pale Moon team</label> and Mozilla developers. Learn <label class="text-link" useoriginprincipal="true" href="about:credits">who contributed</label> to this software. </description> <description class="text-blurb" id="contributeDesc"> - Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://github.com/MoonchildProductions/moebius">development</label> of the Unified XUL Platform. + Want to help? Please consider <label class="text-link" href="https://www.palemoon.org/donations.shtml">donating</label> or get involved with our <label class="text-link" href="https://github.com/MoonchildProductions/UXP">development</label> of the Unified XUL Platform. </description> +#endif </vbox> </vbox> </hbox> diff --git a/browser/components/BrowserComponents.manifest b/browser/components/BrowserComponents.manifest index dbfc3d2ec..0c80006be 100644 --- a/browser/components/BrowserComponents.manifest +++ b/browser/components/BrowserComponents.manifest @@ -39,6 +39,4 @@ component {eab9012e-5f74-4cbc-b2b5-a590235513cc} nsBrowserGlue.js contract @mozilla.org/browser/browserglue;1 {eab9012e-5f74-4cbc-b2b5-a590235513cc} category app-startup nsBrowserGlue service,@mozilla.org/browser/browserglue;1 application={3c2e2abc-06d4-11e1-ac3b-374f68613e61} application={ec8030f7-c20a-464f-9b0e-13a3a9e97384} application={aa3c5121-dab2-40e2-81ca-7ea25febc110} application={a23983c0-fd0e-11dc-95ff-0800200c9a66} application={d1bfe7d9-c01e-4237-998b-7b5f960a4314} component {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} nsBrowserGlue.js -#ifndef MOZ_MULET contract @mozilla.org/content-permission/prompt;1 {d8903bf6-68d5-4e97-bcd1-e4d3012f721a} -#endif diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index ccfce3cd9..4a934fe45 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -13,11 +13,7 @@ MOZ_PKG_MANIFEST = $(srcdir)/package-manifest.in MOZ_PKG_DUPEFLAGS = -f $(srcdir)/allowed-dupes.mn # Some files have been already bundled with xulrunner -ifndef MOZ_MULET MOZ_PKG_FATAL_WARNINGS = 1 -else -DEFINES += -DMOZ_MULET -endif # When packaging an artifact build not all xpt files expected by the # packager will be present. diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index dee6a3faa..015daa8c7 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -831,7 +831,3 @@ bin/libfreebl_32int64_3.so @RESPATH@/components/GfxSanityTest.manifest @RESPATH@/components/SanityTest.js #endif - -#ifdef MOZ_MULET -#include ../../b2g/installer/package-manifest.in -#endif diff --git a/browser/installer/windows/Makefile.in b/browser/installer/windows/Makefile.in index a8305d077..600bdfeb6 100644 --- a/browser/installer/windows/Makefile.in +++ b/browser/installer/windows/Makefile.in @@ -5,7 +5,7 @@ include $(topsrcdir)/toolkit/mozapps/installer/package-name.mk CONFIG_DIR = instgen -SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/firefox/7zSD.sfx +SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/uxp/7zSD.sfx INSTALLER_FILES = \ app.tag \ |