diff options
Diffstat (limited to 'toolkit/mozapps/update/updater')
5 files changed, 61 insertions, 2 deletions
diff --git a/toolkit/mozapps/update/updater/Makefile.in b/toolkit/mozapps/update/updater/Makefile.in index ec3ad9773a..f93a374428 100644 --- a/toolkit/mozapps/update/updater/Makefile.in +++ b/toolkit/mozapps/update/updater/Makefile.in @@ -5,6 +5,12 @@ # For changes here, also consider ./updater-xpcshell/Makefile.in +# In a compile build, the moz.build stanzas produce the binary named +# `UpdateSettings`; we just need it in the correct place. +# +# In an artifact build, we copy upstream artifacts from +# `dist/update_framework_artifacts/UpdateSettings-localbuild.framework` + ifndef MOZ_WINCONSOLE ifdef MOZ_DEBUG MOZ_WINCONSOLE = 1 @@ -26,6 +32,11 @@ libs:: $(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS $(NSINSTALL) $(DIST)/bin/org.mozilla.updater $(DIST)/bin/updater.app/Contents/MacOS $(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/Frameworks +ifneq (,$(COMPILE_ENVIRONMENT)) $(NSINSTALL) $(DIST)/bin/UpdateSettings $(DIST)/bin/updater.app/Contents/Frameworks/UpdateSettings.framework +endif # COMPILE_ENVIRONMENT +ifneq (,$(MOZ_ARTIFACT_BUILDS)) + $(NSINSTALL) $(DIST)/update_framework_artifacts/UpdateSettings-localbuild.framework/UpdateSettings $(DIST)/bin/updater.app/Contents/Frameworks/UpdateSettings.framework +endif # MOZ_ARTIFACT_BUILDS $(NSINSTALL) $(srcdir)/macos-frameworks/UpdateSettings/Info.plist $(DIST)/bin/updater.app/Contents/Frameworks/UpdateSettings.framework/Resources endif diff --git a/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings-localbuild/Makefile.in b/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings-localbuild/Makefile.in new file mode 100644 index 0000000000..2798eecd64 --- /dev/null +++ b/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings-localbuild/Makefile.in @@ -0,0 +1,25 @@ +# vim:set ts=8 sw=8 sts=8 noet: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +include $(topsrcdir)/config/rules.mk + +# In a compile build, the moz.build stanzas produce a binary named +# `UpdateSettings-localbuild`. We need to produce +# `dist/update_framework_artifacts/UpdateSettings-localbuild.framework/UpdateSettings` +# for consumption by artifact builds. +# +# In an artifact build, we already have upstream artifacts in +# `dist/update_framework_artifacts/UpdateSettings-localbuild.framework`. + +ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) +libs:: +ifneq (,$(COMPILE_ENVIRONMENT)) + rm -rf $(FINAL_TARGET)/UpdateSettings-localbuild.framework + $(NSINSTALL) -D $(FINAL_TARGET)/UpdateSettings-localbuild.framework + cp $(FINAL_TARGET)/UpdateSettings-localbuild UpdateSettings + $(NSINSTALL) UpdateSettings $(FINAL_TARGET)/UpdateSettings-localbuild.framework +endif # COMPILE_ENVIRONMENT + $(NSINSTALL) $(srcdir)/../UpdateSettings/Info.plist $(FINAL_TARGET)/UpdateSettings-localbuild.framework/Resources +endif # MOZ_WIDGET_TOOLKIT diff --git a/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings-localbuild/moz.build b/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings-localbuild/moz.build new file mode 100644 index 0000000000..ca3a0c9f1c --- /dev/null +++ b/toolkit/mozapps/update/updater/macos-frameworks/UpdateSettings-localbuild/moz.build @@ -0,0 +1,18 @@ +# -*- Mode: python; indent-tabs-mode: nil; tab-width: 40 -*- +# vim: set filetype=python: +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +Framework("UpdateSettings-localbuild") +FINAL_TARGET = "dist/update_framework_artifacts" + +DEFINES["ACCEPTED_MAR_CHANNEL_IDS"] = '""' + +UNIFIED_SOURCES += [ + "../UpdateSettings/UpdateSettings.mm", +] + +OS_LIBS += [ + "-framework Foundation", +] diff --git a/toolkit/mozapps/update/updater/macos-frameworks/moz.build b/toolkit/mozapps/update/updater/macos-frameworks/moz.build index 19fa11942e..cb49b680c0 100644 --- a/toolkit/mozapps/update/updater/macos-frameworks/moz.build +++ b/toolkit/mozapps/update/updater/macos-frameworks/moz.build @@ -7,7 +7,12 @@ with Files("**"): BUG_COMPONENT = ("Toolkit", "Application Update") -DIRS += ["UpdateSettings", "UpdateSettings-xpcshell", "UpdateSettings-WrongChannel"] +DIRS += [ + "UpdateSettings", + "UpdateSettings-localbuild", + "UpdateSettings-WrongChannel", + "UpdateSettings-xpcshell", +] EXPORTS += [ "UpdateSettingsUtil.h", diff --git a/toolkit/mozapps/update/updater/updater.cpp b/toolkit/mozapps/update/updater/updater.cpp index 084945dc44..81702d74bc 100644 --- a/toolkit/mozapps/update/updater/updater.cpp +++ b/toolkit/mozapps/update/updater/updater.cpp @@ -2992,7 +2992,7 @@ int NS_main(int argc, NS_tchar** argv) { #ifdef MOZ_VERIFY_MAR_SIGNATURE int rv = PopulategMARStrings(); if (rv == OK) { - printf("Channels Allowed: %s\n", gMARStrings.MARChannelID.get()); + printf("Channels Allowed: '%s'\n", gMARStrings.MARChannelID.get()); return 0; } printf("Error: %d\n", rv); |