summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2018-06-28 16:19:27 -0400
committerMatt A. Tobin <email@mattatobin.com>2018-06-28 16:19:27 -0400
commitf47536f5706b036aa410636b74e1a96b1d58430a (patch)
tree26c4cbe2254af17c16ba9fc38bde7870656db216
parentee4ef87724fda6c474e7e69b519acd58a574679d (diff)
parent7664308ab16560fc25622ef68810300233d39fa9 (diff)
downloadUXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar
UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.gz
UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.lz
UXP-f47536f5706b036aa410636b74e1a96b1d58430a.tar.xz
UXP-f47536f5706b036aa410636b74e1a96b1d58430a.zip
Merge branch 'define-work'
-rw-r--r--application/basilisk/configure.in3
-rw-r--r--application/basilisk/confvars.sh1
-rw-r--r--devtools/client/framework/devtools-browser.js12
-rw-r--r--toolkit/components/passwordmgr/content/passwordManager.js4
-rw-r--r--toolkit/components/passwordmgr/content/passwordManager.xul4
-rw-r--r--toolkit/modules/NewTabUtils.jsm2
-rw-r--r--toolkit/mozapps/installer/package-name.mk12
-rw-r--r--toolkit/themes/linux/global/global.css2
-rw-r--r--toolkit/themes/windows/global/global.css2
9 files changed, 29 insertions, 13 deletions
diff --git a/application/basilisk/configure.in b/application/basilisk/configure.in
index 9638c1e4d..8527d218c 100644
--- a/application/basilisk/configure.in
+++ b/application/basilisk/configure.in
@@ -8,6 +8,9 @@ dnl Things we need to carry from confvars.sh
AC_DEFINE(MOZ_PHOENIX)
AC_SUBST(MOZ_PHOENIX)
+AC_DEFINE(MOZ_AUSTRALIS)
+AC_SUBST(MOZ_AUSTRALIS)
+
AC_DEFINE(MC_BASILISK)
AC_SUBST(MC_BASILISK)
diff --git a/application/basilisk/confvars.sh b/application/basilisk/confvars.sh
index 0343034a4..48985f16a 100644
--- a/application/basilisk/confvars.sh
+++ b/application/basilisk/confvars.sh
@@ -6,6 +6,7 @@
MOZ_APP_BASENAME=Basilisk
MOZ_APP_VENDOR=Moonchild
MOZ_PHOENIX=1
+MOZ_AUSTRALIS=1
MC_BASILISK=1
MOZ_UPDATER=1
diff --git a/devtools/client/framework/devtools-browser.js b/devtools/client/framework/devtools-browser.js
index f032f82aa..4d7176b4c 100644
--- a/devtools/client/framework/devtools-browser.js
+++ b/devtools/client/framework/devtools-browser.js
@@ -28,7 +28,7 @@ loader.lazyRequireGetter(this, "DebuggerClient", "devtools/shared/client/main",
loader.lazyRequireGetter(this, "BrowserMenus", "devtools/client/framework/browser-menus");
loader.lazyImporter(this, "AppConstants", "resource://gre/modules/AppConstants.jsm");
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
loader.lazyImporter(this, "CustomizableUI", "resource:///modules/CustomizableUI.jsm");
#endif
@@ -335,7 +335,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
* Install Developer widget
*/
installDeveloperWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
let id = "developer-button";
let widget = CustomizableUI.getWidget(id);
if (widget && widget.provider == CustomizableUI.PROVIDER_API) {
@@ -394,7 +394,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
*/
// Used by itself
installWebIDEWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
if (this.isWebIDEWidgetInstalled()) {
return;
}
@@ -422,7 +422,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
},
isWebIDEWidgetInstalled: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
let widgetWrapper = CustomizableUI.getWidget("webide-button");
return !!(widgetWrapper && widgetWrapper.provider == CustomizableUI.PROVIDER_API);
#else
@@ -439,7 +439,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
* Uninstall WebIDE widget
*/
uninstallWebIDEWidget: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
if (this.isWebIDEWidgetInstalled()) {
CustomizableUI.removeWidgetFromArea("webide-button");
}
@@ -454,7 +454,7 @@ var gDevToolsBrowser = exports.gDevToolsBrowser = {
*/
// Used by webide.js
moveWebIDEWidgetInNavbar: function () {
-#ifdef MC_BASILISK
+#ifdef MOZ_AUSTRALIS
CustomizableUI.addWidgetToArea("webide-button", CustomizableUI.AREA_NAVBAR);
#else
return;
diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js
index bd5cebfc4..327ebbdf8 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.js
+++ b/toolkit/components/passwordmgr/content/passwordManager.js
@@ -727,10 +727,12 @@ function escapeKeyHandler() {
window.close();
}
-#if defined(MC_BASILISK) && defined(XP_WIN)
+#ifdef XP_WIN
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
function OpenMigrator() {
const { MigrationUtils } = Cu.import("resource:///modules/MigrationUtils.jsm", {});
// We pass in the type of source we're using for use in telemetry:
MigrationUtils.showMigrationWizard(window, [MigrationUtils.MIGRATION_ENTRYPOINT_PASSWORDS]);
}
#endif
+#endif
diff --git a/toolkit/components/passwordmgr/content/passwordManager.xul b/toolkit/components/passwordmgr/content/passwordManager.xul
index c0a10bf8e..8590d96ac 100644
--- a/toolkit/components/passwordmgr/content/passwordManager.xul
+++ b/toolkit/components/passwordmgr/content/passwordManager.xul
@@ -112,11 +112,13 @@
<button id="removeAllSignons" icon="clear"
oncommand="DeleteAllSignons();"/>
<spacer flex="1"/>
-#if defined(MC_BASILISK) && defined(XP_WIN)
+#ifdef XP_WIN
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
<button accesskey="&import.accesskey;"
label="&import.label;"
oncommand="OpenMigrator();"/>
#endif
+#endif
<button id="togglePasswords"
oncommand="TogglePasswordVisible();"/>
</hbox>
diff --git a/toolkit/modules/NewTabUtils.jsm b/toolkit/modules/NewTabUtils.jsm
index e452a6fb2..548d87dda 100644
--- a/toolkit/modules/NewTabUtils.jsm
+++ b/toolkit/modules/NewTabUtils.jsm
@@ -249,7 +249,7 @@ var AllPages = {
* Returns whether the history tiles are enhanced.
*/
get enhanced() {
-#ifdef MC_BASILISK
+#if defined(MC_BASILISK) || defined(HYPE_ICEWEASEL)
// Hard-block the use of sponsored tiles.
return false;
#else
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
index d88975f36..1a8728088 100644
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
@@ -12,10 +12,18 @@ ifndef PACKAGE_NAME_MK_INCLUDED
PACKAGE_NAME_MK_INCLUDED := 1
ifndef MOZ_PKG_VERSION
+# Normally MOZ_PKG_VERSION is set to the application version
+MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
+
+# This overrides it with the BUILDID for Basilisk and IceWeasel
+# We do it this way because makefile's conditional checking is very
+# primitive or else very cryptic
ifdef MC_BASILISK
MOZ_PKG_VERSION = $(BUILDID)
-else
-MOZ_PKG_VERSION = $(MOZ_APP_VERSION)
+endif
+
+ifdef HYPE_ICEWEASEL
+MOZ_PKG_VERSION = $(BUILDID)
endif
endif
diff --git a/toolkit/themes/linux/global/global.css b/toolkit/themes/linux/global/global.css
index 9553725d6..9328f7a66 100644
--- a/toolkit/themes/linux/global/global.css
+++ b/toolkit/themes/linux/global/global.css
@@ -316,7 +316,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
-%ifdef MC_BASILISK
+%ifdef MOZ_AUSTRALIS
.close-icon {
-moz-appearance: none;
height: 16px;
diff --git a/toolkit/themes/windows/global/global.css b/toolkit/themes/windows/global/global.css
index 416321041..6b6a21ca3 100644
--- a/toolkit/themes/windows/global/global.css
+++ b/toolkit/themes/windows/global/global.css
@@ -331,7 +331,7 @@ popupnotificationcontent {
/* :::::: Close button icons ::::: */
-%ifdef MC_BASILISK
+%ifdef MOZ_AUSTRALIS
.close-icon {
list-style-image: url("chrome://global/skin/icons/close.png");
-moz-image-region: rect(0, 20px, 20px, 0);