diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2022-04-29 15:46:35 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2022-04-29 15:46:35 -0500 |
| commit | 34458ce9099bd5e38b83b1d437391476f3acb109 (patch) | |
| tree | 82ee1565589f0633c9fa15eeda56553c3fc34864 | |
| parent | 60882e8de5630fa7e6737e1fa369330d512be0a3 (diff) | |
| download | aura-central-34458ce9099bd5e38b83b1d437391476f3acb109.tar.gz | |
[Calendar:Lightning] Remove the last of mozinstaller except for what calendar needs to package.. Also make calendar package.
27 files changed, 6 insertions, 3508 deletions
diff --git a/Makefile.in b/Makefile.in index 45f6a1566..54f16383b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -186,8 +186,6 @@ run-tests-deps: $(install_manifest_depends) install-test-files: $(call py_action,process_install_manifest,--no-remove _tests _build_manifests/install/_test_files) -include $(topsrcdir)/build/moz-automation.mk - # dist and _tests should be purged during cleaning. However, we don't want them # purged during PGO builds because they contain some auto-generated files. ifneq ($(filter-out maybe_clobber_profiledbuild,$(MAKECMDGOALS)),) @@ -228,7 +226,7 @@ endif endif default all:: - $(call BUILDSTATUS,TIERS $(TIERS) $(if $(MOZ_AUTOMATION),$(MOZ_AUTOMATION_TIERS))) + $(call BUILDSTATUS,TIERS $(TIERS)) include $(topsrcdir)/config/rules.mk diff --git a/build/moz-automation.mk b/build/moz-automation.mk deleted file mode 100644 index 10d02ac40..000000000 --- a/build/moz-automation.mk +++ /dev/null @@ -1,122 +0,0 @@ -# -# 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/. - -ifneq (,$(filter automation/%,$(MAKECMDGOALS))) -ifeq (4.0,$(firstword $(sort 4.0 $(MAKE_VERSION)))) -MAKEFLAGS += --output-sync=target -else -.NOTPARALLEL: -endif -endif - -ifndef JS_STANDALONE -include $(topsrcdir)/system/installer/package-name.mk -include $(topsrcdir)/system/installer/upload-files.mk - -# Clear out DIST_FILES if it was set -DIST_FILES = -endif - -# Helper variables to convert from MOZ_AUTOMATION_* variables to the -# corresponding the make target -tier_MOZ_AUTOMATION_BUILD_SYMBOLS = buildsymbols -tier_MOZ_AUTOMATION_L10N_CHECK = l10n-check -tier_MOZ_AUTOMATION_PRETTY_L10N_CHECK = pretty-l10n-check -tier_MOZ_AUTOMATION_INSTALLER = installer -tier_MOZ_AUTOMATION_PRETTY_INSTALLER = pretty-installer -tier_MOZ_AUTOMATION_PACKAGE = package -tier_MOZ_AUTOMATION_PRETTY_PACKAGE = pretty-package -tier_MOZ_AUTOMATION_PACKAGE_TESTS = package-tests -tier_MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS = pretty-package-tests -tier_MOZ_AUTOMATION_UPDATE_PACKAGING = update-packaging -tier_MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING = pretty-update-packaging -tier_MOZ_AUTOMATION_UPLOAD_SYMBOLS = uploadsymbols -tier_MOZ_AUTOMATION_UPLOAD = upload -tier_MOZ_AUTOMATION_SDK = sdk - -# Automation build steps. Everything in MOZ_AUTOMATION_TIERS also gets used in -# TIERS for mach display. As such, the MOZ_AUTOMATION_TIERS are roughly sorted -# here in the order that they will be executed (since mach doesn't know of the -# dependencies between them). -moz_automation_symbols = \ - MOZ_AUTOMATION_PACKAGE_TESTS \ - MOZ_AUTOMATION_PRETTY_PACKAGE_TESTS \ - MOZ_AUTOMATION_BUILD_SYMBOLS \ - MOZ_AUTOMATION_UPLOAD_SYMBOLS \ - MOZ_AUTOMATION_PACKAGE \ - MOZ_AUTOMATION_PRETTY_PACKAGE \ - MOZ_AUTOMATION_INSTALLER \ - MOZ_AUTOMATION_PRETTY_INSTALLER \ - MOZ_AUTOMATION_UPDATE_PACKAGING \ - MOZ_AUTOMATION_PRETTY_UPDATE_PACKAGING \ - MOZ_AUTOMATION_L10N_CHECK \ - MOZ_AUTOMATION_PRETTY_L10N_CHECK \ - MOZ_AUTOMATION_UPLOAD \ - MOZ_AUTOMATION_SDK \ - $(NULL) -MOZ_AUTOMATION_TIERS := $(foreach sym,$(moz_automation_symbols),$(if $(filter 1,$($(sym))),$(tier_$(sym)))) - -# Dependencies between automation build steps -automation/uploadsymbols: automation/buildsymbols - -automation/update-packaging: automation/package -automation/update-packaging: automation/installer -automation/pretty-update-packaging: automation/pretty-package -automation/pretty-update-packaging: automation/pretty-installer - -automation/l10n-check: automation/package -automation/l10n-check: automation/installer -automation/pretty-l10n-check: automation/pretty-package -automation/pretty-l10n-check: automation/pretty-installer - -automation/upload: automation/installer -automation/upload: automation/package -automation/upload: automation/package-tests -automation/upload: automation/buildsymbols -automation/upload: automation/update-packaging -automation/upload: automation/sdk - -# automation/{pretty-}package should depend on build (which is implicit due to -# the way client.mk invokes automation/build), but buildsymbols changes the -# binaries/libs, and that's what we package/test. -automation/pretty-package: automation/buildsymbols - -# The installer, sdk and packager all run stage-package, and may conflict -# with each other. -automation/installer: automation/package -automation/sdk: automation/installer automation/package - -# The 'pretty' versions of targets run before the regular ones to avoid -# conflicts in writing to the same files. -automation/installer: automation/pretty-installer -automation/package: automation/pretty-package -automation/package-tests: automation/pretty-package-tests -automation/l10n-check: automation/pretty-l10n-check -automation/update-packaging: automation/pretty-update-packaging - -automation/build: $(addprefix automation/,$(MOZ_AUTOMATION_TIERS)) - @echo Automation steps completed. - -# Note: We have to force -j1 here, at least until bug 1036563 is fixed. -AUTOMATION_EXTRA_CMDLINE-l10n-check = -j1 -AUTOMATION_EXTRA_CMDLINE-pretty-l10n-check = -j1 - -# The commands only run if the corresponding MOZ_AUTOMATION_* variable is -# enabled. This means, for example, if we enable MOZ_AUTOMATION_UPLOAD, then -# 'buildsymbols' will only run if MOZ_AUTOMATION_BUILD_SYMBOLS is also set. -# However, the target automation/buildsymbols will still be executed in this -# case because it is a prerequisite of automation/upload. -define automation_commands -@+$(MAKE) $1 $(AUTOMATION_EXTRA_CMDLINE-$1) -$(call BUILDSTATUS,TIER_FINISH $1) -endef - -# The tier start message is in a separate target so make doesn't buffer it -# until the step completes with output syncing enabled. -automation-start/%: - $(if $(filter $*,$(MOZ_AUTOMATION_TIERS)),$(call BUILDSTATUS,TIER_START $*)) - -automation/%: automation-start/% - $(if $(filter $*,$(MOZ_AUTOMATION_TIERS)),$(call automation_commands,$*)) diff --git a/calendar/installer/Makefile.in b/calendar/installer/Makefile.in deleted file mode 100644 index b51ccb7cd..000000000 --- a/calendar/installer/Makefile.in +++ /dev/null @@ -1,85 +0,0 @@ -# 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/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -STANDALONE_MAKEFILE := 1 - -NO_PKG_FILES = \ - sunbird-config \ - regchrome* \ - regxpcom* \ - xpcshell* \ - xpidl* \ - xpt_dump* \ - xpt_link* \ - nspr-config \ - $(NULL) - -include $(topsrcdir)/config/rules.mk - -MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in - -ifdef BUILD_STATIC_LIBS -ifeq (WINNT,$(OS_ARCH)) -MOZ_PKG_MANIFEST_P = $(srcdir)/windows/packages-static -# XXX Enable when landing unix installer -# else -# ifneq (,$(filter-out OS2,$(OS_ARCH))) -# MOZ_PKG_MANIFEST_P = $(srcdir)/unix/packages-static -# endif -endif -else -$(error you need a "--enable-static --disable-shared" build to create an installer) -endif - -MOZ_NONLOCALIZED_PKG_LIST = \ - xpcom \ - calendar \ - $(NULL) - -MOZ_LOCALIZED_PKG_LIST = $(AB_CD) - -DEFINES += -DAB_CD=$(AB_CD) - -ifdef MOZ_UPDATER -DEFINES += -DMOZ_UPDATER=1 -endif - -ifdef MOZ_PKG_MANIFEST_P -MOZ_PKG_MANIFEST = packages-static - -$(MOZ_PKG_MANIFEST): $(MOZ_PKG_MANIFEST_P) $(GLOBAL_DEPS) - $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $< > $@ -endif - -include $(MOZILLA_SRCDIR)/system/installer/packager.mk - -ifeq (WINNT,$(OS_ARCH)) -PKGCOMP_FIND_OPTS = -else -PKGCOMP_FIND_OPTS = -L -endif - -package-compare:: -ifdef MOZ_PKG_MANIFEST_P - cd $(DIST); find $(PKGCOMP_FIND_OPTS) bin -type f | sort > bin-list.txt - grep "^bin" $(MOZ_PKG_MANIFEST) | sed -e 's/\\/\//g' | sort > $(DIST)/pack-list.txt - -diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt -endif - -installer: -ifdef INSTALLER_DIR - $(MAKE) -C $(INSTALLER_DIR) -endif - -make-package : removed-files-checked - -removed-files-checked : removed-files stage-package - $(PERL) $(srcdir)/check-remove-files.pl removed-files $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) diff --git a/calendar/installer/check-remove-files.pl b/calendar/installer/check-remove-files.pl deleted file mode 100644 index 00aea4c49..000000000 --- a/calendar/installer/check-remove-files.pl +++ /dev/null @@ -1,49 +0,0 @@ -#!perl -# -# 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/. - -usage() if $#ARGV != 1; - -# files to check but ignore... -my @exceptions = ( "components/autocomplete.xpt" ); - -my $filelist = $ARGV[0]; -open FILELIST,"$filelist" or die "can not open $filelist\n"; -my @rmfiles = <FILELIST>; -close FILELIST or die "can not close $filelist\n"; -chomp @rmfilelist; - -my $startdir = $ARGV[1]; - -die "no such directory: $startdir\n" if ! -d $startdir; - -my $probsfound = 0; -my @foundlist = (); - -foreach my $onefile ( @rmfiles ) { - my $ignore = 0; - chomp $onefile; - foreach my $ignoreme ( @exceptions ) { - $ignore = 1 if "$onefile" eq "$ignoreme"; - } - next if $ignore; - if ( -f "$startdir/$onefile" ) { -# print "found $startdir/$onefile\n"; - push @foundlist, "$startdir/$onefile\n"; - $probsfound = 1; - } -} - -if ( $probsfound ) { - print STDERR "ERROR: files found that are listed in \"$filelist\" but exist in \"$startdir\":\n"; - print STDERR "@foundlist\n"; - exit 2; -} - -sub usage -{ - print STDERR "\nusage: $0 <remove-files list> <lookup dir>\n\n"; - exit 1; -} diff --git a/calendar/installer/moz.build b/calendar/installer/moz.build deleted file mode 100644 index 58ce5e273..000000000 --- a/calendar/installer/moz.build +++ /dev/null @@ -1,5 +0,0 @@ -# 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/. - diff --git a/system/installer/package-name.mk b/calendar/installer/package-name.mk index c3a7ba364..c3a7ba364 100644 --- a/system/installer/package-name.mk +++ b/calendar/installer/package-name.mk diff --git a/calendar/installer/removed-files.in b/calendar/installer/removed-files.in deleted file mode 100644 index f37327f67..000000000 --- a/calendar/installer/removed-files.in +++ /dev/null @@ -1,436 +0,0 @@ -# These files are removed when upgrading over a previous installation. -# This allows us to remove outdated cruft, and ensure that we are using the -# newly installed version of critical components. -chrome/US.jar -chrome/en-win.jar -chrome/chrome.rdf -chrome/installed-chrome.txt -chrome/app-chrome.manifest -defaults/pref/all.js -# Extensions no longer live in defaults/profile -# {8af2d0a7-e394-4de2-ae55-2dae532a7a9b} = previous uuid of Sunbird default theme -defaults/profile/extensions/{8af2d0a7-e394-4de2-ae55-2dae532a7a9b}/install.rdf -defaults/profile/extensions/{8af2d0a7-e394-4de2-ae55-2dae532a7a9b}/ -# {972ce4c6-7e08-4474-a285-3208198ce6fd} = uuid of toolkit app default theme -defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -defaults/profile/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/ -defaults/profile/extensions/Extensions.rdf -defaults/profile/extensions/installed-extensions.txt -defaults/profile/extensions/ -defaults/profile/US/ -# {641d8d09-7dda-4850-8228-ac0ab65e2ac9} = DOM Inspector -extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/install.rdf -extensions/{641d8d09-7dda-4850-8228-ac0ab65e2ac9}/ -greprefs/all.js -greprefs/security-prefs.js -greprefs/xpinstall.js -greprefs/ -components/component.reg -components/compreg.dat -components/xpti.dat -components/xptitemp.dat -components/nsBackgroundUpdateService.js -components/nsCloseAllWindows.js -# -# Clean out old calendar components which didn't implement nsIModule -# (see bug 320366) -components/calAlarmService.js -components/calAttachment.js -components/calAttendee.js -components/calCalendarManager.js -components/calDateTimeFormatter.js -components/calEvent.js -components/calHtmlExport.js -components/calIcsImportExport.js -components/calItemBase.js -components/calListFormatter.js -components/calMonthGridPrinter.js -components/calOutlookCSVImportExport.js -components/calRecurrenceInfo.js -components/calTodo.js -components/calUtils.js -components/calWeekTitleService.js -# -#ifdef XP_WIN -# -# Clean out obsolete files from Sunbird 0.2 installer -# -chrome/overlayinfo/ -chrome/calendar-ca-AD.jar -chrome/calendar-cs-CZ.jar -chrome/calendar-cy-GB.jar -chrome/calendar-de-AT.jar -chrome/calendar-fr-FR.jar -chrome/calendar-hu-HU.jar -chrome/calendar-it-IT.jar -chrome/calendar-ja-JP.jar -chrome/calendar-lt-LT.jar -chrome/calendar-nl-NL.jar -chrome/calendar-pl-PL.jar -chrome/calendar-sk-SK.jar -chrome/calendar-sl-SI.jar -chrome/calendar-tr-TR.jar -chrome/calendar-wen-DE.jar -chrome/help.jar -chrome/pipnss.jar -components/browser.xpt -components/feedProcessor.js -components/nsSetDefaultBrowser.js -defaults/profile/mimeTypes.rdf -extensions/{8af2d0a7-e394-4de2-ae55-2dae532a7a9b}/install.rdf -extensions/{8af2d0a7-e394-4de2-ae55-2dae532a7a9b}/ -extensions/Extensions.rdf -extensions/installed-extensions-processed.txt -res/builtin/platformHTMLBindings.xml -res/builtin/ -res/platform-forms.css -components.ini -# -# Clean out obsolete files from Sunbird 0.3a1/0.3a2 installer -# -chrome/chromelist.txt -components/@DLL_PREFIX@webdav@DLL_SUFFIX@ -components/accessibility-msaa.xpt -components/accessibility.xpt -components/alerts.xpt -components/appshell.xpt -components/appstartup.xpt -components/autocomplete.xpt -components/autoconfig.xpt -components/bookmarks.xpt -components/calbase.xpt -components/calbaseinternal.xpt -components/caps.xpt -components/chardet.xpt -components/chrome.xpt -components/commandhandler.xpt -components/commandlines.xpt -components/composer.xpt -components/content_base.xpt -components/content_html.xpt -components/content_htmldoc.xpt -components/content_xmldoc.xpt -components/content_xslt.xpt -components/content_xtf.xpt -components/docshell_base.xpt -components/dom.xpt -components/dom_base.xpt -components/dom_canvas.xpt -components/dom_core.xpt -components/dom_css.xpt -components/dom_events.xpt -components/dom_html.xpt -components/dom_offline.xpt -components/dom_range.xpt -components/dom_sidebar.xpt -components/dom_stylesheets.xpt -components/dom_svg.xpt -components/dom_traversal.xpt -components/dom_views.xpt -components/dom_xbl.xpt -components/dom_xpath.xpt -components/dom_xul.xpt -components/downloads.xpt -components/editor.xpt -components/embed_base.xpt -components/extensions.xpt -components/exthandler.xpt -components/fastfind.xpt -components/feeds.xpt -components/find.xpt -components/gfx.xpt -components/gksvgrenderer.xpt -components/history.xpt -components/htmlparser.xpt -components/imgicon.xpt -components/imglib2.xpt -components/intl.xpt -components/intlcmpt.xpt -components/jar.xpt -components/jsconsole.xpt -components/jsdservice.xpt -components/layout_base.xpt -components/layout_printing.xpt -components/layout_xul.xpt -components/layout_xul_tree.xpt -components/locale.xpt -components/lwbrk.xpt -components/mimetype.xpt -components/mozbrwsr.xpt -components/mozfind.xpt -components/necko.xpt -components/necko_about.xpt -components/necko_cache.xpt -components/necko_cookie.xpt -components/necko_data.xpt -components/necko_dns.xpt -components/necko_file.xpt -components/necko_ftp.xpt -components/necko_http.xpt -components/necko_res.xpt -components/necko_socket.xpt -components/necko_strconv.xpt -components/necko_viewsource.xpt -components/nsSetDefaultMail.js -components/nsUnsetDefaultMail.js -components/oji.xpt -components/passwordmgr.xpt -components/pipboot.xpt -components/pipnss.xpt -components/pippki.xpt -components/plugin.xpt -components/pref.xpt -components/prefetch.xpt -components/profile.xpt -components/progressDlg.xpt -components/proxyObject.xpt -components/rdf.xpt -components/satchel.xpt -components/saxparser.xpt -components/shistory.xpt -components/storage.xpt -components/toolkitprofile.xpt -components/txmgr.xpt -components/txtsvc.xpt -components/uconv.xpt -components/unicharutil.xpt -components/update.xpt -components/uriloader.xpt -components/webbrowserpersist.xpt -components/webBrowser_core.xpt -components/webdav.xpt -components/webshell_idls.xpt -components/websrvcs.xpt -components/widget.xpt -components/windowds.xpt -components/windowwatcher.xpt -components/winhooks.xpt -components/xmlextras.xpt -components/xpautocomplete.xpt -components/xpcom_base.xpt -components/xpcom_components.xpt -components/xpcom_ds.xpt -components/xpcom_io.xpt -components/xpcom_obsolete.xpt -components/xpcom_thread.xpt -components/xpcom_xpti.xpt -components/xpconnect.xpt -components/xpinstall.xpt -components/xulapp.xpt -components/xuldoc.xpt -components/xultmpl.xpt -plugins/npnul32.dll -res/dtd/mathml.dtd -res/dtd/mathml20.properties -res/entityTables/mathml20.properties -res/fonts/mathfont.properties -res/fonts/mathfontCMEX10.properties -res/fonts/mathfontCMSY10.properties -res/fonts/mathfontMath1.properties -res/fonts/mathfontMath2.properties -res/fonts/mathfontMath4.properties -res/fonts/mathfontMTExtra.properties -res/fonts/mathfontPUA.properties -res/fonts/mathfontSymbol.properties -res/html/gopher-audio.gif -res/html/gopher-binary.gif -res/html/gopher-find.gif -res/html/gopher-image.gif -res/html/gopher-menu.gif -res/html/gopher-movie.gif -res/html/gopher-sound.gif -res/html/gopher-telnet.gif -res/html/gopher-text.gif -res/html/gopher-unknown.gif -res/bloatcycle.html -res/EditorOverride.css -res/grabber.gif -res/mathml.css -res/table-add-column-after-active.gif -res/table-add-column-after-hover.gif -res/table-add-column-after.gif -res/table-add-column-before-active.gif -res/table-add-column-before-hover.gif -res/table-add-column-before.gif -res/table-add-row-after-active.gif -res/table-add-row-after-hover.gif -res/table-add-row-after.gif -res/table-add-row-before-active.gif -res/table-add-row-before-hover.gif -res/table-add-row-before.gif -res/table-remove-column-active.gif -res/table-remove-column-hover.gif -res/table-remove-column.gif -res/table-remove-row-active.gif -res/table-remove-row-hover.gif -res/table-remove-row.gif -res/viewer.properties -dependentlibs.list -mozctl.dll -mozctlx.dll -regxpcom.exe -sunbird.url -unins000.dat -unins000.exe -uninstall/UninstallSunbird.exe -uninstall/uninst.exe -xpcom_compat.dll -components/nsInterfaceInfoToIDL.js -xpcshell.exe -xpidl.exe -xpt_dump.exe -xpt_link.exe -# -# Clean out obsolete files from Sunbird 0.5 installer -# -components/calAlarmService.js -js/calWcapCachedCalendar.js -# -# Clean out obsolete files from Mozilla 1.9.1 -# -components/nsPostUpdateWin.js -# -#endif -# -components/autocomplete.xpt -@DLL_PREFIX@zlib@DLL_SUFFIX@ -extensions/inspector@mozilla.org/components/inspector.xpt -extensions/inspector@mozilla.org/components/@DLL_PREFIX@inspector@DLL_SUFFIX@ -# -# -# Clean out obsolete Talkback files -# -extensions/talkback@mozilla.org/ -extensions/talkback@mozilla.org/install.rdf -extensions/talkback@mozilla.org/chrome.manifest -extensions/talkback@mozilla.org/components/qfaservices.xpt -extensions/talkback@mozilla.org/components/@DLL_PREFIX@qfaservices@DLL_SUFFIX@ -#ifdef XP_WIN -extensions/talkback@mozilla.org/components/BrandRes.dll -extensions/talkback@mozilla.org/components/fullsoft.dll -extensions/talkback@mozilla.org/components/master.ini -extensions/talkback@mozilla.org/components/talkback-l10n.ini -extensions/talkback@mozilla.org/components/talkback.cnt -extensions/talkback@mozilla.org/components/talkback.exe -extensions/talkback@mozilla.org/components/talkback.hlp -extensions/talkback@mozilla.org/InstallDisabled -#else -extensions/talkback@mozilla.org/components/talkback/talkback -extensions/talkback@mozilla.org/components/talkback/XTalkback.ad -extensions/talkback@mozilla.org/components/master.ini -extensions/talkback@mozilla.org/components/talkback.so -#endif -# -# Clean out update service components if MOZ_UPDATER isn't defined -# -#ifndef MOZ_UPDATER -components/nsUpdateService.js -components/nsUpdateServiceStub.js -#endif - -# bug 381049 (Moved crashreporter interface) -components/crashreporter.xpt -# bug 415330 (Remove XPInstall leftovers) -@DLL_PREFIX@xpistub@DLL_SUFFIX@ -res/cmessage.txt -#ifdef XP_WIN -xpicleanup.exe -#else -xpicleanup -#endif - -# bug 446366 (renamed interface) -js/calWeekTitleService.js - -js/calItipProcessor.js - -# bug 431775 (remove unused gopher images) -res/html/gopher-audio.gif -res/html/gopher-binary.gif -res/html/gopher-find.gif -res/html/gopher-image.gif -res/html/gopher-menu.gif -res/html/gopher-movie.gif -res/html/gopher-sound.gif -res/html/gopher-telnet.gif -res/html/gopher-text.gif -res/html/gopher-unknown.gif - -# Bug 462393 - Sunbird tinderboxen busted [Error: mozilla/dist/bin/js: Not a directory] -js/calAlarm.js -js/calAlarmMonitor.js -js/calAlarmService.js -js/calAttachment.js -js/calAttendee.js -js/calAuthUtils.js -js/calCachedCalendar.js -js/calCalendarManager.js -js/calCalendarSearchService.js -js/calDateTimeFormatter.js -js/calDavCalendar.js -js/calEvent.js -js/calFilter.js -js/calFreeBusyService.js -js/calHtmlExport.js -js/calICSCalendar.js -js/calIcsImportExport.js -js/calIcsParser.js -js/calIcsSerializer.js -js/calItemBase.js -js/calItipItem.js -js/calItipProcessor.js -js/calListFormatter.js -js/calMemoryCalendar.js -js/calMonthGridPrinter.js -js/calOutlookCSVImportExport.js -js/calProtocolHandler.js -js/calProviderBase.js -js/calProviderUtils.js -js/calRecurrenceInfo.js -js/calRelation.js -js/calStorageCalendar.js -js/calTimezoneService.js -js/calTodo.js -js/calTransactionManager.js -js/calUtils.js -js/calWcapCalendar.js -js/calWcapCalendarItems.js -js/calWcapErrors.js -js/calWcapRequest.js -js/calWcapSession.js -js/calWcapUtils.js -js/calWeekInfoService.js -js/calWeekPrinter.js - -# Bug 462773 drop JSON.jsm -modules/JSON.jsm - -# Bug 439620 -calendar-js/calProviderBase.js -calendar-js/calProviderUtils.js -calendar-js/calAuthUtils.js - -# Bug 420811 replace loading and broken image GIFs with PNGs -res/broken-image.gif -res/loading-image.gif - -#ifdef XP_WIN -# Bug 504029 -js3250.dll -#endif - -# Bug 534408 - Core bug 514665 dropped/replaced USE_SHORT_LIBNAME uses: port that to c-c (apps) -#ifdef XP_WIN -components/calbscmp.dll -#endif - -components/contentprefs.xpt - -# Bug 522712 - Port |Bug 511761 - Only use compatibility.ini (not .autoreg, or stat()s) to invalidate fastloads and other caches| to comm-central (apps) -.autoreg - -# Bug 576746 - new xpcom registration, we're cleaning up some extra files here -components/calStorageCalendarModule.js -components/calMemoryCalendarModule.js -components/calICSCalendarModule.js -components/dom_loadsave.xpt diff --git a/calendar/installer/windows/Makefile.in b/calendar/installer/windows/Makefile.in deleted file mode 100644 index 833a941e4..000000000 --- a/calendar/installer/windows/Makefile.in +++ /dev/null @@ -1,86 +0,0 @@ -# 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/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(MOZILLA_SRCDIR)/system/installer/package-name.mk - -CONFIG_DIR = instgen -SFX_MODULE = $(topsrcdir)/other-licenses/7zstub/sunbird/7zSD.sfx - -ifdef MOZ_UPDATER -DEFINES += -DMOZ_UPDATER=1 -endif - -PP_LOCALIZED_FILES = \ - packages-static \ - $(NULL) - -INSTALLER_FILES = \ - app.tag \ - nsis/installer.nsi \ - nsis/uninstaller.nsi \ - nsis/shared.nsh \ - $(NULL) - -BRANDING_FILES = \ - branding.nsi \ - wizHeader.bmp \ - wizHeaderRTL.bmp \ - wizWatermark.bmp \ - $(NULL) - -DEFINES += \ - -DAB_CD=$(AB_CD) \ - -DPKG_BASENAME=$(PKG_BASENAME) \ - -DMOZ_APP_VERSION=$(MOZ_APP_VERSION) \ - -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME} \ - -DMOZILLA_VERSION=${MOZILLA_VERSION} \ - $(NULL) - -include $(topsrcdir)/config/config.mk - -installer:: - $(MAKE) -C .. installer-stage - $(MAKE) $(CONFIG_DIR)/setup.exe - -# For building the uninstaller during the application build so it can be -# included for mar file generation. -uninstaller:: - $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) - $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) - $(EXIT_ON_ERROR) \ - for i in $(PP_LOCALIZED_FILES); do \ - $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \ - done - $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \ - $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi - $(PYTHON) $(MOZILLA_SRCDIR)/system/installer/windows/nsis/preprocess-locale.py \ - --preprocess-locale $(MOZILLA_SRCDIR) \ - $(call EXPAND_LOCALE_SRCDIR,calendar/locales)/installer $(AB_CD) $(CONFIG_DIR) - -$(CONFIG_DIR)/setup.exe:: - $(RM) -rf $(CONFIG_DIR) && mkdir $(CONFIG_DIR) - $(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR) - $(INSTALL) $(addprefix $(DIST)/branding/,$(BRANDING_FILES)) $(CONFIG_DIR) - $(PYTHON) $(MOZILLA_SRCDIR)/system/installer/windows/nsis/preprocess-locale.py \ - --convert-utf8-utf16le $(DIST)/branding/license.txt $(CONFIG_DIR)/license.txt - $(EXIT_ON_ERROR) \ - for i in $(PP_LOCALIZED_FILES); do \ - $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py $(DEFINES) $(ACDEFINES) $(srcdir)/$$i > $(CONFIG_DIR)/$$i; \ - done - $(PYTHON) $(MOZILLA_SRCDIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) \ - $(srcdir)/nsis/defines.nsi.in > $(CONFIG_DIR)/defines.nsi - $(PYTHON) $(MOZILLA_SRCDIR)/system/installer/windows/nsis/preprocess-locale.py \ - --preprocess-locale $(MOZILLA_SRCDIR) \ - $(call EXPAND_LOCALE_SRCDIR,calendar/locales)/installer $(AB_CD) $(CONFIG_DIR) - -include $(topsrcdir)/config/rules.mk -include $(MOZILLA_SRCDIR)/system/installer/windows/nsis/makensis.mk diff --git a/calendar/installer/windows/app.tag b/calendar/installer/windows/app.tag deleted file mode 100644 index fd3134b41..000000000 --- a/calendar/installer/windows/app.tag +++ /dev/null @@ -1,4 +0,0 @@ -;!@Install@!UTF-8! -Title="Mozilla Sunbird" -RunProgram="setup.exe" -;!@InstallEnd@!
\ No newline at end of file diff --git a/calendar/installer/windows/moz.build b/calendar/installer/windows/moz.build deleted file mode 100644 index 58ce5e273..000000000 --- a/calendar/installer/windows/moz.build +++ /dev/null @@ -1,5 +0,0 @@ -# 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/. - diff --git a/calendar/installer/windows/nsis/defines.nsi.in b/calendar/installer/windows/nsis/defines.nsi.in deleted file mode 100644 index be66201ea..000000000 --- a/calendar/installer/windows/nsis/defines.nsi.in +++ /dev/null @@ -1,32 +0,0 @@ -#filter substitution -# 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/. - - -# Win7: AppVendor, AppName, and AppVersion must match the application.ini values -# of Vendor, Name, and Version. These values are used in registering shortcuts -# with the taskbar. ExplicitAppUserModelID registration when the app launches is -# handled in widget/src/windows/WinTaskbar.cpp. - -!define AppVendor "Mozilla" -!define AppName "Sunbird" -!define AppVersion "@MOZ_APP_VERSION@" -!define AppUserModelID "${AppVendor}.${AppName}.${AppVersion}" -!define GREVersion @MOZILLA_VERSION@ -!define AB_CD "@AB_CD@" - -!define FileMainEXE "sunbird.exe" -!define WindowClass "SunbirdMessageWindow" -!define MinSupportedVer "Microsoft Windows 2000" - -# File details shared by both the installer and uninstaller -VIProductVersion "1.0.0.0" -VIAddVersionKey "ProductName" "${BrandShortName}" -VIAddVersionKey "CompanyName" "${CompanyName}" -VIAddVersionKey "LegalTrademarks" "${BrandShortName} is a Trademark of The Mozilla Foundation." -VIAddVersionKey "LegalCopyright" "${CompanyName}" -VIAddVersionKey "FileVersion" "${AppVersion}" -VIAddVersionKey "ProductVersion" "${AppVersion}" -# Comments is not used but left below commented out for future reference -# VIAddVersionKey "Comments" "Comments" diff --git a/calendar/installer/windows/nsis/installer.nsi b/calendar/installer/windows/nsis/installer.nsi deleted file mode 100644 index c10156e58..000000000 --- a/calendar/installer/windows/nsis/installer.nsi +++ /dev/null @@ -1,744 +0,0 @@ -# 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/. - -# Required Plugins: -# AppAssocReg http://nsis.sourceforge.net/Application_Association_Registration_plug-in -# ShellLink http://nsis.sourceforge.net/ShellLink_plug-in -# UAC http://nsis.sourceforge.net/UAC_plug-in - -; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs -!verbose 3 - -; 7-Zip provides better compression than the lzma from NSIS so we add the files -; uncompressed and use 7-Zip to create a SFX archive of it -SetDatablockOptimize on -SetCompress off -CRCCheck on - -RequestExecutionLevel user - -!addplugindir ./ - -Var TmpVal -Var StartMenuDir -Var InstallType -Var AddStartMenuSC -Var AddQuickLaunchSC -Var AddDesktopSC - -; Other included files may depend upon these includes! -; The following includes are provided by NSIS. -!include FileFunc.nsh -!include LogicLib.nsh -!include MUI.nsh -!include WinMessages.nsh -!include WinVer.nsh -!include WordFunc.nsh - -!insertmacro GetOptions -!insertmacro GetParameters -!insertmacro GetSize -!insertmacro StrFilter -!insertmacro WordReplace - -; The following includes are custom. -!include branding.nsi -!include defines.nsi -!include common.nsh -!include locales.nsi - -VIAddVersionKey "FileDescription" "${BrandShortName} Installer" -VIAddVersionKey "OriginalFilename" "setup.exe" - -; Must be inserted before other macros that use logging -!insertmacro _LoggingCommon - -; Most commonly used macros for managing shortcuts -!insertmacro _LoggingShortcutsCommon - -!insertmacro ChangeMUIHeaderImage -!insertmacro CheckForFilesInUse -!insertmacro CleanUpdatesDir -!insertmacro CopyFilesFromDir -!insertmacro FindSMProgramsDir -!insertmacro GetPathFromString -!insertmacro GetParent -!insertmacro ManualCloseAppPrompt -!insertmacro RegCleanMain -!insertmacro RegCleanUninstall -!insertmacro SetBrandNameVars -!insertmacro UnloadUAC -!insertmacro WriteRegStr2 -!insertmacro WriteRegDWORD2 - -!include shared.nsh - -; Helper macros for ui callbacks. Insert these after shared.nsh -!insertmacro CheckCustomCommon -!insertmacro InstallEndCleanupCommon -!insertmacro InstallOnInitCommon -!insertmacro InstallStartCleanupCommon -!insertmacro LeaveDirectoryCommon -!insertmacro OnEndCommon -!insertmacro PreDirectoryCommon - -Name "${BrandFullName}" -OutFile "setup.exe" -InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} (${AppVersion})" "InstallLocation" -InstallDir "$PROGRAMFILES\${BrandFullName}\" -ShowInstDetails nevershow - -################################################################################ -# Modern User Interface - MUI - -!define MUI_ABORTWARNING -!define MUI_ICON setup.ico -!define MUI_UNICON setup.ico -!define MUI_WELCOMEPAGE_TITLE_3LINES -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -!define MUI_WELCOMEFINISHPAGE_BITMAP wizWatermark.bmp - -; Use a right to left header image when the language is right to left -!ifdef ${AB_CD}_rtl -!define MUI_HEADERIMAGE_BITMAP_RTL wizHeaderRTL.bmp -!else -!define MUI_HEADERIMAGE_BITMAP wizHeader.bmp -!endif - -/** - * Installation Pages - */ -; Welcome Page -!define MUI_PAGE_CUSTOMFUNCTION_PRE preWelcome -!insertmacro MUI_PAGE_WELCOME - -; License Page -!define MUI_PAGE_CUSTOMFUNCTION_SHOW showLicense -!define MUI_LICENSEPAGE_CHECKBOX -!insertmacro MUI_PAGE_LICENSE license.txt - -; Custom Options Page -Page custom preOptions leaveOptions - -; Select Install Directory Page -!define MUI_PAGE_CUSTOMFUNCTION_PRE preDirectory -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveDirectory -!define MUI_DIRECTORYPAGE_VERIFYONLEAVE -!insertmacro MUI_PAGE_DIRECTORY - -; Custom Shortcuts Page -Page custom preShortcuts leaveShortcuts - -; Start Menu Folder Page Configuration -!define MUI_PAGE_CUSTOMFUNCTION_PRE preStartMenu -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE leaveStartMenu -!define MUI_STARTMENUPAGE_NODISABLE -!insertmacro MUI_PAGE_STARTMENU Application $StartMenuDir - -; Custom Summary Page -Page custom preSummary leaveSummary - -; Install Files Page -!insertmacro MUI_PAGE_INSTFILES - -; Finish Page -!define MUI_FINISHPAGE_TITLE_3LINES -!define MUI_FINISHPAGE_RUN -!define MUI_FINISHPAGE_RUN_FUNCTION LaunchApp -!define MUI_FINISHPAGE_RUN_TEXT $(LAUNCH_TEXT) -!define MUI_PAGE_CUSTOMFUNCTION_PRE preFinish -!insertmacro MUI_PAGE_FINISH - -; Use the default dialog for IDD_VERIFY for a simple Banner -ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe" - -################################################################################ -# Install Sections - -; Cleanup operations to perform at the start of the installation. -Section "-InstallStartCleanup" - SetDetailsPrint both - DetailPrint $(STATUS_CLEANUP) - SetDetailsPrint none - - SetOutPath "$INSTDIR" - ${StartInstallLog} "${BrandFullName}" "${AB_CD}" "${AppVersion}" "${GREVersion}" - - ; Delete the app exe to prevent launching the app while we are installing. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ; If the user closed the application it can take several seconds for it to - ; shut down completely. If the application is being used by another user we - ; can rename the file and then delete is when the system is restarted. - Sleep 5000 - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ClearErrors - ${EndIf} - - ; Remove the updates directory for Vista and above - ${CleanUpdatesDir} "Mozilla\Sunbird" - - ${InstallStartCleanupCommon} -SectionEnd - -Section "-Application" APP_IDX - ${StartUninstallLog} - - SetDetailsPrint both - DetailPrint $(STATUS_INSTALL_APP) - SetDetailsPrint none - - ${LogHeader} "Installing Main Files" - ${CopyFilesFromDir} "$EXEDIR\nonlocalized" "$INSTDIR" \ - "$(ERROR_CREATE_DIRECTORY_PREFIX)" \ - "$(ERROR_CREATE_DIRECTORY_SUFFIX)" - - ; Register DLLs - ; XXXrstrong - AccessibleMarshal.dll can be used by multiple applications but - ; is only registered for the last application installed. When the last - ; application installed is uninstalled AccessibleMarshal.dll will no longer be - ; registered. bug 338878 - ${LogHeader} "DLL Registration" - ClearErrors - RegDLL "$INSTDIR\AccessibleMarshal.dll" - ${If} ${Errors} - ${LogMsg} "** ERROR Registering: $INSTDIR\AccessibleMarshal.dll **" - ${Else} - ${LogUninstall} "DLLReg: \AccessibleMarshal.dll" - ${LogMsg} "Registered: $INSTDIR\AccessibleMarshal.dll" - ${EndIf} - - ; Write extra files created by the application to the uninstall log so they - ; will be removed when the application is uninstalled. To remove an empty - ; directory write a bogus filename to the deepest directory and all empty - ; parent directories will be removed. - ${LogUninstall} "File: \components\compreg.dat" - ${LogUninstall} "File: \components\xpti.dat" - ${LogUninstall} "File: \.autoreg" - ${LogUninstall} "File: \active-update.xml" - ${LogUninstall} "File: \install.log" - ${LogUninstall} "File: \install_status.log" - ${LogUninstall} "File: \install_wizard.log" - ${LogUninstall} "File: \updates.xml" - - SetDetailsPrint both - DetailPrint $(STATUS_INSTALL_LANG) - SetDetailsPrint none - - ${LogHeader} "Installing Localized Files" - ${CopyFilesFromDir} "$EXEDIR\localized" "$INSTDIR" \ - "$(ERROR_CREATE_DIRECTORY_PREFIX)" \ - "$(ERROR_CREATE_DIRECTORY_SUFFIX)" - - ; Default for creating Start Menu folder and shortcuts - ; (1 = create, 0 = don't create) - ${If} $AddStartMenuSC == "" - StrCpy $AddStartMenuSC "1" - ${EndIf} - - ; Default for creating Quick Launch shortcut (1 = create, 0 = don't create) - ${If} $AddQuickLaunchSC == "" - StrCpy $AddQuickLaunchSC "1" - ${EndIf} - - ; Default for creating Desktop shortcut (1 = create, 0 = don't create) - ${If} $AddDesktopSC == "" - StrCpy $AddDesktopSC "1" - ${EndIf} - - ${LogHeader} "Adding Registry Entries" - SetShellVarContext current ; Set SHCTX to HKCU - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - StrCpy $TmpVal "HKCU" ; used primarily for logging - ${Else} - SetShellVarContext all ; Set SHCTX to HKLM - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $TmpVal "HKLM" ; used primarily for logging - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - ${EndIf} - - ; The previous installer adds several regsitry values to both HKLM and HKCU. - ; We now try to add to HKLM and if that fails to HKCU - - ; The order that reg keys and values are added is important if you use the - ; uninstall log to remove them on uninstall. When using the uninstall log you - ; MUST add children first so they will be removed first on uninstall so they - ; will be empty when the key is deleted. This allows the uninstaller to - ; specify that only empty keys will be deleted. - ${SetAppKeys} - - ; Uninstall keys can only exist under HKLM on some versions of windows. Since - ; it doesn't cause problems always add them. - ${SetUninstallKeys} - - ; These need special handling on uninstall since they may be overwritten by - ; an install into a different location. - StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}" - ${WriteRegStr2} $TmpVal "$0" "" "$INSTDIR\${FileMainEXE}" 0 - ${WriteRegStr2} $TmpVal "$0" "Path" "$INSTDIR" 0 - - !insertmacro MUI_STARTMENU_WRITE_BEGIN Application - - ; Create shortcuts - ${LogHeader} "Adding Shortcuts" - - ; Always add the relative path to the application's Start Menu directory and - ; the application's shortcuts to the shortcuts log ini file. The - ; DeleteShortcuts macro will do the right thing on uninstall if they don't - ; exist. - ${LogSMProgramsDirRelPath} "$StartMenuDir" - ${LogSMProgramsShortcut} "${BrandFullName}.lnk" - ${LogSMProgramsShortcut} "${BrandFullName} ($(SAFE_MODE)).lnk" - ${LogQuickLaunchShortcut} "${BrandFullName}.lnk" - ${LogDesktopShortcut} "${BrandFullName}.lnk" - - ${If} $AddStartMenuSC == 1 - ${Unless} ${FileExists} "$SMPROGRAMS\$StartMenuDir" - CreateDirectory "$SMPROGRAMS\$StartMenuDir" - ${LogMsg} "Added Start Menu Directory: $SMPROGRAMS\$StartMenuDir" - ${EndUnless} - CreateShortCut "$SMPROGRAMS\$StartMenuDir\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0 - ${LogMsg} "Added Shortcut: $SMPROGRAMS\$StartMenuDir\${BrandFullName}.lnk" - CreateShortCut "$SMPROGRAMS\$StartMenuDir\${BrandFullName} ($(SAFE_MODE)).lnk" "$INSTDIR\${FileMainEXE}" "-safe-mode" "$INSTDIR\${FileMainEXE}" 0 - ${LogMsg} "Added Shortcut: $SMPROGRAMS\$StartMenuDir\${BrandFullName} ($(SAFE_MODE)).lnk" - ${EndIf} - - ; perhaps use the uninstall keys - ${If} $AddQuickLaunchSC == 1 - CreateShortCut "$QUICKLAUNCH\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0 - ${LogMsg} "Added Shortcut: $QUICKLAUNCH\${BrandFullName}.lnk" - ${EndIf} - - ${If} $AddDesktopSC == 1 - CreateShortCut "$DESKTOP\${BrandFullName}.lnk" "$INSTDIR\${FileMainEXE}" "" "$INSTDIR\${FileMainEXE}" 0 - ${LogMsg} "Added Shortcut: $DESKTOP\${BrandFullName}.lnk" - ${EndIf} - - !insertmacro MUI_STARTMENU_WRITE_END -SectionEnd - -; Cleanup operations to perform at the end of the installation. -Section "-InstallEndCleanup" - SetDetailsPrint both - DetailPrint "$(STATUS_CLEANUP)" - SetDetailsPrint none - - ${LogHeader} "Updating Uninstall Log With Previous Uninstall Log" - - ; Refresh desktop icons - System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)" - - ${InstallEndCleanupCommon} - - ; If we have to reboot give SHChangeNotify time to finish the refreshing - ; the icons so the OS doesn't display the icons from helper.exe - ${If} ${RebootFlag} - Sleep 10000 - ${LogHeader} "Reboot Required To Finish Installation" - ; ${FileMainEXE}.moz-upgrade should never exist but just in case... - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-upgrade" - Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-upgrade" - ${EndUnless} - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - ClearErrors - Rename "$INSTDIR\${FileMainEXE}" "$INSTDIR\${FileMainEXE}.moz-delete" - ${Unless} ${Errors} - Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete" - ${EndUnless} - ${EndUnless} - - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}" - CopyFiles /SILENT "$INSTDIR\uninstall\helper.exe" "$INSTDIR" - FileOpen $0 "$INSTDIR\${FileMainEXE}" w - FileWrite $0 "Will be deleted on restart" - Rename /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-upgrade" "$INSTDIR\${FileMainEXE}" - FileClose $0 - Delete "$INSTDIR\${FileMainEXE}" - Rename "$INSTDIR\helper.exe" "$INSTDIR\${FileMainEXE}" - ${EndUnless} - ${EndIf} -SectionEnd - -################################################################################ -# Helper Functions - -Function CheckExistingInstall - ; If there is a pending file copy from a previous uninstall don't allow - ; installing until after the system has rebooted. - IfFileExists "$INSTDIR\${FileMainEXE}.moz-upgrade" +1 +4 - MessageBox MB_YESNO "$(WARN_RESTART_REQUIRED_UPGRADE)" IDNO +2 - Reboot - Quit - - ; If there is a pending file deletion from a previous uninstall don't allow - ; installing until after the system has rebooted. - IfFileExists "$INSTDIR\${FileMainEXE}.moz-delete" +1 +4 - MessageBox MB_YESNO "$(WARN_RESTART_REQUIRED_UNINSTALL)" IDNO +2 - Reboot - Quit - - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)" - - ${If} "$TmpVal" == "FoundMessageWindow" - Sleep 5000 - ${EndIf} - - ${PushFilesToCheck} - - ; Store the return value in $TmpVal so it is less likely to be accidentally - ; overwritten elsewhere. - ${CheckForFilesInUse} $TmpVal - - Banner::destroy - - ${If} "$TmpVal" == "true" - StrCpy $TmpVal "FoundMessageWindow" - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)" - StrCpy $TmpVal "true" - ${EndIf} - ${EndIf} -FunctionEnd - -Function LaunchApp - ClearErrors - ${GetParameters} $0 - ${GetOptions} "$0" "/UAC:" $1 - ${If} ${Errors} - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" - Exec "$INSTDIR\${FileMainEXE}" - ${Else} - GetFunctionAddress $0 LaunchAppFromElevatedProcess - UAC::ExecCodeSegment $0 - ${EndIf} -FunctionEnd - -Function LaunchAppFromElevatedProcess - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_LAUNCH)" - - ; Find the installation directory when launching using GetFunctionAddress - ; from an elevated installer since $INSTDIR will not be set in this installer - ${StrFilter} "${FileMainEXE}" "+" "" "" $R9 - ReadRegStr $0 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} (${AppVersion})" "DisplayIcon" - ${GetPathFromString} "$0" $0 - ${GetParent} "$0" $1 - ; Set our current working directory to the application's install directory - ; otherwise the 7-Zip temp directory will be in use and won't be deleted. - SetOutPath "$1" - Exec "$0" -FunctionEnd - -################################################################################ -# Language - -!insertmacro MOZ_MUI_LANGUAGE 'baseLocale' -!verbose push -!verbose 3 -!include "overrideLocale.nsh" -!include "customLocale.nsh" -!verbose pop - -; Set this after the locale files to override it if it is in the locale -; using " " for BrandingText will hide the "Nullsoft Install System..." branding -BrandingText " " - -################################################################################ -# Page pre, show, and leave functions - -Function preWelcome - ${If} ${FileExists} "$EXEDIR\localized\distribution\modern-wizard.bmp" - Delete "$PLUGINSDIR\modern-wizard.bmp" - CopyFiles /SILENT "$EXEDIR\localized\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp" - ${EndIf} -FunctionEnd - -Function showLicense - ${If} ${FileExists} "$EXEDIR\localized\distribution\modern-header.bmp" - ${AndIf} $hHeaderBitmap == "" - Delete "$PLUGINSDIR\modern-header.bmp" - CopyFiles /SILENT "$EXEDIR\localized\distribution\modern-header.bmp" "$PLUGINSDIR\modern-header.bmp" - ${ChangeMUIHeaderImage} "$PLUGINSDIR\modern-header.bmp" - ${EndIf} -FunctionEnd - -Function preOptions - !insertmacro MUI_HEADER_TEXT "$(OPTIONS_PAGE_TITLE)" "$(OPTIONS_PAGE_SUBTITLE)" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "options.ini" -FunctionEnd - -Function leaveOptions - ${MUI_INSTALLOPTIONS_READ} $0 "options.ini" "Settings" "State" - ${If} $0 != 0 - Abort - ${EndIf} - ${MUI_INSTALLOPTIONS_READ} $R0 "options.ini" "Field 2" "State" - StrCmp $R0 "1" +1 +2 - StrCpy $InstallType ${INSTALLTYPE_BASIC} - ${MUI_INSTALLOPTIONS_READ} $R0 "options.ini" "Field 3" "State" - StrCmp $R0 "1" +1 +2 - StrCpy $InstallType ${INSTALLTYPE_CUSTOM} - - ${If} $InstallType != ${INSTALLTYPE_CUSTOM} -!ifndef NO_INSTDIR_FROM_REG - SetShellVarContext all ; Set SHCTX to HKLM - ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 - - StrCmp "$R9" "false" +1 fix_install_dir - - SetShellVarContext current ; Set SHCTX to HKCU - ${GetSingleInstallPath} "Software\Mozilla\${BrandFullNameInternal}" $R9 - - fix_install_dir: - StrCmp "$R9" "false" +2 +1 - StrCpy $INSTDIR "$R9" -!endif - - Call CheckExistingInstall - ${EndIf} -FunctionEnd - -Function preDirectory - ${PreDirectoryCommon} -FunctionEnd - -Function leaveDirectory - ${LeaveDirectoryCommon} "$(WARN_DISK_SPACE)" "$(WARN_WRITE_ACCESS)" -FunctionEnd - -Function preShortcuts - ${CheckCustomCommon} - !insertmacro MUI_HEADER_TEXT "$(SHORTCUTS_PAGE_TITLE)" "$(SHORTCUTS_PAGE_SUBTITLE)" - !insertmacro MUI_INSTALLOPTIONS_DISPLAY "shortcuts.ini" -FunctionEnd - -Function leaveShortcuts - ${MUI_INSTALLOPTIONS_READ} $0 "shortcuts.ini" "Settings" "State" - ${If} $0 != 0 - Abort - ${EndIf} - ${MUI_INSTALLOPTIONS_READ} $AddDesktopSC "shortcuts.ini" "Field 2" "State" - ${MUI_INSTALLOPTIONS_READ} $AddStartMenuSC "shortcuts.ini" "Field 3" "State" - ${MUI_INSTALLOPTIONS_READ} $AddQuickLaunchSC "shortcuts.ini" "Field 4" "State" -FunctionEnd - -Function preStartMenu - ; With the Unicode installer the path to the application's Start Menu - ; directory relative to the Start Menu's Programs directory is written to the - ; shortcuts log ini file and is used to set the default Start Menu directory. - ${GetSMProgramsDirRelPath} $0 - ${If} "$0" != "" - StrCpy $StartMenuDir "$0" - ${Else} - ; Prior to the Unicode installer the path to the application's Start Menu - ; directory relative to the Start Menu's Programs directory was written to - ; the registry and use this value to set the default Start Menu directory. - ClearErrors - ReadRegStr $0 HKLM "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Main" "Start Menu Folder" - ${If} ${Errors} - ; Use the FindSMProgramsDir macro to find a previously used path to the - ; application's Start Menu directory relative to the Start Menu's Programs - ; directory in the uninstall log and use this value to set the default - ; Start Menu directory. - ${FindSMProgramsDir} $0 - ${If} "$0" != "" - StrCpy $StartMenuDir "$0" - ${EndIf} - ${Else} - StrCpy $StartMenuDir "$0" - ${EndUnless} - ${EndIf} - - ${CheckCustomCommon} - ${If} $AddStartMenuSC != 1 - Abort - ${EndIf} -FunctionEnd - -Function leaveStartMenu - ${If} $InstallType == ${INSTALLTYPE_CUSTOM} - Call CheckExistingInstall - ${EndIf} -FunctionEnd - -Function preSummary - ; Setup the summary.ini file for the Custom Summary Page - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "3" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Text "$(SUMMARY_INSTALLED_TO)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 1" Bottom "15" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Type "text" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" state "" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Top "17" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" Bottom "30" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 2" flags "READONLY" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Text "$(SUMMARY_CLICK)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Top "130" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 3" Bottom "150" - - ${If} "$TmpVal" == "true" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Type "label" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Text "$(SUMMARY_REBOOT_REQUIRED_INSTALL)" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Left "0" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Top "35" - WriteINIStr "$PLUGINSDIR\summary.ini" "Field 4" Bottom "45" - - WriteINIStr "$PLUGINSDIR\summary.ini" "Settings" NumFields "4" - ${EndIf} - - !insertmacro MUI_HEADER_TEXT "$(SUMMARY_PAGE_TITLE)" "$(SUMMARY_PAGE_SUBTITLE)" - - ; The Summary custom page has a textbox that will automatically receive - ; focus. This sets the focus to the Install button instead. - !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "summary.ini" - GetDlgItem $0 $HWNDPARENT 1 - System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i" - ${MUI_INSTALLOPTIONS_READ} $1 "summary.ini" "Field 2" "HWND" - SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - !insertmacro MUI_INSTALLOPTIONS_SHOW -FunctionEnd - -Function leaveSummary - ; Try to delete the app executable and if we can't delete it try to find the - ; app's message window and prompt the user to close the app. This allows - ; running an instance that is located in another directory. If for whatever - ; reason there is no message window we will just rename the app's files and - ; then remove them on restart. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ${ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_INSTALL)" - ${EndIf} -FunctionEnd - -; When we add an optional action to the finish page the cancel button is -; enabled. This disables it and leaves the finish button as the only choice. -Function preFinish - ${EndInstallLog} "${BrandFullName}" - !insertmacro MUI_INSTALLOPTIONS_WRITE "ioSpecial.ini" "settings" "cancelenabled" "0" -FunctionEnd - -################################################################################ -# Initialization Functions - -Function .onInit - StrCpy $LANGUAGE 0 - ${SetBrandNameVars} "$EXEDIR\localized\distribution\setup.ini" - - ${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OS_MSG)" - - !insertmacro InitInstallOptionsFile "options.ini" - !insertmacro InitInstallOptionsFile "shortcuts.ini" - !insertmacro InitInstallOptionsFile "summary.ini" - - ; Setup the options.ini file for the Custom Options Page - WriteINIStr "$PLUGINSDIR\options.ini" "Settings" NumFields "5" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Text "$(OPTIONS_SUMMARY)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Top "0" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 1" Bottom "10" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Type "RadioButton" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Text "$(OPTION_STANDARD_RADIO)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Left "15" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Top "25" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Bottom "35" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" State "1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 2" Flags "GROUP" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Type "RadioButton" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Text "$(OPTION_CUSTOM_RADIO)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Left "15" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Top "55" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" Bottom "65" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 3" State "0" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Type "label" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Text "$(OPTION_STANDARD_DESC)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Left "30" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Top "37" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 4" Bottom "57" - - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Type "label" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Text "$(OPTION_CUSTOM_DESC)" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Left "30" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Right "-1" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Top "67" - WriteINIStr "$PLUGINSDIR\options.ini" "Field 5" Bottom "87" - - ; Setup the shortcuts.ini file for the Custom Shortcuts Page - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Settings" NumFields "4" - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Text "$(CREATE_ICONS_DESC)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 1" Bottom "15" - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Type "checkbox" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Text "$(ICONS_DESKTOP)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Left "15" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Top "20" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Bottom "30" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" State "1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 2" Flags "GROUP" - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Type "checkbox" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Text "$(ICONS_STARTMENU)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Left "15" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Top "40" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" Bottom "50" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 3" State "1" - - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Type "checkbox" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Text "$(ICONS_QUICKLAUNCH)" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Left "15" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Top "60" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" Bottom "70" - WriteINIStr "$PLUGINSDIR\shortcuts.ini" "Field 4" State "1" - - ; There must always be nonlocalized and localized directories. - ${GetSize} "$EXEDIR\nonlocalized\" "/S=0K" $R5 $R7 $R8 - ${GetSize} "$EXEDIR\localized\" "/S=0K" $R6 $R7 $R8 - IntOp $R8 $R5 + $R6 - SectionSetSize ${APP_IDX} $R8 - - ; Initialize $hHeaderBitmap to prevent redundant changing of the bitmap if - ; the user clicks the back button - StrCpy $hHeaderBitmap "" -FunctionEnd - -Function .onGUIEnd - ${OnEndCommon} -FunctionEnd diff --git a/calendar/installer/windows/nsis/shared.nsh b/calendar/installer/windows/nsis/shared.nsh deleted file mode 100644 index 2001e9570..000000000 --- a/calendar/installer/windows/nsis/shared.nsh +++ /dev/null @@ -1,160 +0,0 @@ -# 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/. - -!macro PostUpdate - ${CreateShortcutsLog} - - ; Remove registry entries for non-existent apps and for apps that point to our - ; install location in the Software\Mozilla key and uninstall registry entries - ; that point to our install location for both HKCU and HKLM. - SetShellVarContext current ; Set SHCTX to the current user (e.g. HKCU) - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - StrCpy $TmpVal "HKCU" ; used primarily for logging - ${Else} - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - SetShellVarContext all ; Set SHCTX to all users (e.g. HKLM) - StrCpy $TmpVal "HKLM" ; used primarily for logging - ${RegCleanMain} "Software\Mozilla" - ${RegCleanUninstall} - ${SetUninstallKeys} - ${EndIf} - - ; Add Software\Mozilla\ registry entries - ${SetAppKeys} - - ; Remove files that may be left behind by the application in the - ; VirtualStore directory. - ${CleanVirtualStore} - - ; Remove talkback if it is present (remove after bug 386760 is fixed) - ${If} ${FileExists} "$INSTDIR\extensions\talkback@mozilla.org\" - RmDir /r "$INSTDIR\extensions\talkback@mozilla.org\" - ${EndIf} -!macroend -!define PostUpdate "!insertmacro PostUpdate" - -!macro SetAsDefaultAppUser - ; This macro must be defined to use UninstallOnInitCommon in commmon.nsh -!macroend -!define SetAsDefaultAppUser "!insertmacro SetAsDefaultAppUser" - -!macro SetAsDefaultAppGlobal - ; This macro must be defined to use UninstallOnInitCommon in commmon.nsh -!macroend -!define SetAsDefaultAppGlobal "!insertmacro SetAsDefaultAppGlobal" - -!macro HideShortcuts - ; This macro must be defined to use UninstallOnInitCommon in commmon.nsh -!macroend -!define HideShortcuts "!insertmacro HideShortcuts" - -!macro ShowShortcuts - ; This macro must be defined to use UninstallOnInitCommon in commmon.nsh -!macroend -!define ShowShortcuts "!insertmacro ShowShortcuts" - -!macro SetAppKeys - ${GetLongPath} "$INSTDIR" $8 - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Main" - ${WriteRegStr2} $TmpVal "$0" "Install Directory" "$8" 0 - ${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Uninstall" - ${WriteRegStr2} $TmpVal "$0" "Description" "${BrandFullNameInternal} (${AppVersion})" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})" - ${WriteRegStr2} $TmpVal "$0" "" "${AppVersion} (${AB_CD})" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}\bin" - ${WriteRegStr2} $TmpVal "$0" "PathToExe" "$8\${FileMainEXE}" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}\extensions" - ${WriteRegStr2} $TmpVal "$0" "Components" "$8\components" 0 - ${WriteRegStr2} $TmpVal "$0" "Plugins" "$8\plugins" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal} ${AppVersion}" - ${WriteRegStr2} $TmpVal "$0" "GeckoVer" "${GREVersion}" 0 - - StrCpy $0 "Software\Mozilla\${BrandFullNameInternal}" - ${WriteRegStr2} $TmpVal "$0" "" "${GREVersion}" 0 - ${WriteRegStr2} $TmpVal "$0" "CurrentVersion" "${AppVersion} (${AB_CD})" 0 -!macroend -!define SetAppKeys "!insertmacro SetAppKeys" - -!macro SetUninstallKeys - StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} (${AppVersion})" - ${GetLongPath} "$INSTDIR" $8 - - ; Write the uninstall registry keys - ${WriteRegStr2} $TmpVal "$0" "Comments" "${BrandFullNameInternal}" 0 - ${WriteRegStr2} $TmpVal "$0" "DisplayIcon" "$8\${FileMainEXE},0" 0 - ${WriteRegStr2} $TmpVal "$0" "DisplayName" "${BrandFullNameInternal} (${AppVersion})" 0 - ${WriteRegStr2} $TmpVal "$0" "DisplayVersion" "${AppVersion} (${AB_CD})" 0 - ${WriteRegStr2} $TmpVal "$0" "InstallLocation" "$8" 0 - ${WriteRegStr2} $TmpVal "$0" "Publisher" "Mozilla" 0 - ${WriteRegStr2} $TmpVal "$0" "UninstallString" "$8\uninstall\helper.exe" 0 - ${WriteRegStr2} $TmpVal "$0" "URLInfoAbout" "${URLInfoAbout}" 0 - ${WriteRegStr2} $TmpVal "$0" "URLUpdateInfo" "${URLUpdateInfo}" 0 - ${WriteRegDWORD2} $TmpVal "$0" "NoModify" 1 0 - ${WriteRegDWORD2} $TmpVal "$0" "NoRepair" 1 0 -!macroend -!define SetUninstallKeys "!insertmacro SetUninstallKeys" - -; Creates the shortcuts log ini file with the appropriate entries if it doesn't -; already exist. -!macro CreateShortcutsLog - ${GetShortcutsLogPath} $0 - ${Unless} ${FileExists} "$0" - ; Default to ${BrandFullName} for the Start Menu Folder - StrCpy $TmpVal "${BrandFullName}" - ; Prior to Unicode installer the Start Menu directory was written to the - ; registry and this value can be used to set the Start Menu directory. - ClearErrors - ReadRegStr $0 SHCTX "Software\Mozilla\${BrandFullNameInternal}\${AppVersion} (${AB_CD})\Main" "Start Menu Folder" - ${If} ${Errors} - ${FindSMProgramsDir} $0 - ${If} "$0" != "" - StrCpy $TmpVal "$0" - ${EndIf} - ${Else} - StrCpy $TmpVal "$0" - ${EndUnless} - - ${LogSMProgramsDirRelPath} "$TmpVal" - ${LogSMProgramsShortcut} "${BrandFullName}.lnk" - ${LogSMProgramsShortcut} "${BrandFullName} ($(SAFE_MODE)).lnk" - ${LogQuickLaunchShortcut} "${BrandFullName}.lnk" - ${LogDesktopShortcut} "${BrandFullName}.lnk" - ${EndUnless} -!macroend -!define CreateShortcutsLog "!insertmacro CreateShortcutsLog" - -; The files to check if they are in use during (un)install so the restart is -; required message is displayed. All files must be located in the $INSTDIR -; directory. -!macro PushFilesToCheck - ; The first string to be pushed onto the stack MUST be "end" to indicate - ; that there are no more files to check in $INSTDIR and the last string - ; should be ${FileMainEXE} so if it is in use the CheckForFilesInUse macro - ; returns after the first check. - Push "end" - Push "AccessibleMarshal.dll" - Push "freebl3.dll" - Push "nssckbi.dll" - Push "nspr4.dll" - Push "nssdbm3.dll" - Push "sqlite3.dll" - Push "mozsqlite3.dll" - Push "xpcom.dll" - Push "crashreporter.exe" - Push "updater.exe" - Push "xpicleanup.exe" - Push "${FileMainEXE}" -!macroend -!define PushFilesToCheck "!insertmacro PushFilesToCheck" diff --git a/calendar/installer/windows/nsis/uninstaller.nsi b/calendar/installer/windows/nsis/uninstaller.nsi deleted file mode 100644 index e5c5cf1e2..000000000 --- a/calendar/installer/windows/nsis/uninstaller.nsi +++ /dev/null @@ -1,398 +0,0 @@ -# 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/. - -# Required Plugins: -# AppAssocReg http://nsis.sourceforge.net/Application_Association_Registration_plug-in -# ShellLink http://nsis.sourceforge.net/ShellLink_plug-in -# UAC http://nsis.sourceforge.net/UAC_plug-in - -; Set verbosity to 3 (e.g. no script) to lessen the noise in the build logs -!verbose 3 - -; 7-Zip provides better compression than the lzma from NSIS so we add the files -; uncompressed and use 7-Zip to create a SFX archive of it -SetDatablockOptimize on -SetCompress off -CRCCheck on - -RequestExecutionLevel user - -!addplugindir ./ - -; prevents compiling of the reg write logging. -!define NO_LOG - -Var TmpVal - -; Other included files may depend upon these includes! -; The following includes are provided by NSIS. -!include FileFunc.nsh -!include LogicLib.nsh -!include MUI.nsh -!include WinMessages.nsh -!include WinVer.nsh -!include WordFunc.nsh - -!insertmacro GetOptions -!insertmacro GetParameters -!insertmacro GetParent - -!insertmacro un.GetParent - -; The following includes are custom. -!include branding.nsi -!include defines.nsi -!include common.nsh -!include locales.nsi - -; This is named BrandShortName helper because we use this for software update -; post update cleanup. -VIAddVersionKey "FileDescription" "${BrandShortName} Helper" -VIAddVersionKey "OriginalFilename" "helper.exe" - -; Most commonly used macros for managing shortcuts -!insertmacro _LoggingShortcutsCommon - -!insertmacro CleanVirtualStore -!insertmacro FindSMProgramsDir -!insertmacro GetLongPath -!insertmacro RegCleanMain -!insertmacro RegCleanUninstall -!insertmacro SetBrandNameVars -!insertmacro UnloadUAC -!insertmacro UpdateShortcutAppModelIDs -!insertmacro WriteRegDWORD2 -!insertmacro WriteRegStr2 - -!insertmacro un.ChangeMUIHeaderImage -!insertmacro un.CheckForFilesInUse -!insertmacro un.CleanUpdatesDir -!insertmacro un.CleanVirtualStore -!insertmacro un.DeleteShortcuts -!insertmacro un.GetLongPath -!insertmacro un.GetSecondInstallPath -!insertmacro un.ManualCloseAppPrompt -!insertmacro un.ParseUninstallLog -!insertmacro un.RegCleanMain -!insertmacro un.RegCleanUninstall -!insertmacro un.RemoveQuotesFromPath -!insertmacro un.SetBrandNameVars - -!include shared.nsh - -; Helper macros for ui callbacks. Insert these after shared.nsh -!insertmacro OnEndCommon -!insertmacro UninstallOnInitCommon - -!insertmacro un.OnEndCommon - -Name "${BrandFullName}" -OutFile "helper.exe" -InstallDirRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${BrandFullNameInternal} (${AppVersion})" "InstallLocation" -InstallDir "$PROGRAMFILES\${BrandFullName}" -ShowUnInstDetails nevershow - -################################################################################ -# Modern User Interface - MUI - -!define MUI_ABORTWARNING -!define MUI_ICON setup.ico -!define MUI_UNICON setup.ico -!define MUI_WELCOMEPAGE_TITLE_3LINES -!define MUI_HEADERIMAGE -!define MUI_HEADERIMAGE_RIGHT -!define MUI_UNWELCOMEFINISHPAGE_BITMAP wizWatermark.bmp - -; Use a right to left header image when the language is right to left -!ifdef ${AB_CD}_rtl -!define MUI_HEADERIMAGE_BITMAP_RTL wizHeaderRTL.bmp -!else -!define MUI_HEADERIMAGE_BITMAP wizHeader.bmp -!endif - -/** - * Uninstall Pages - */ -; Welcome Page -!define MUI_PAGE_CUSTOMFUNCTION_PRE un.preWelcome -!define MUI_PAGE_CUSTOMFUNCTION_LEAVE un.leaveWelcome -!insertmacro MUI_UNPAGE_WELCOME - -; Custom Uninstall Confirm Page -UninstPage custom un.preConfirm un.leaveConfirm - -; Remove Files Page -!insertmacro MUI_UNPAGE_INSTFILES - -; Finish Page - -!insertmacro MUI_UNPAGE_FINISH - -; Use the default dialog for IDD_VERIFY for a simple Banner -ChangeUI IDD_VERIFY "${NSISDIR}\Contrib\UIs\default.exe" - -################################################################################ -# Install Sections -; Empty section required for the installer to compile as an uninstaller -Section "" -SectionEnd - -################################################################################ -# Uninstall Sections - -Section "Uninstall" - SetDetailsPrint textonly - DetailPrint $(STATUS_UNINSTALL_MAIN) - SetDetailsPrint none - - ; Delete the app exe to prevent launching the app while we are uninstalling. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ; If the user closed the application it can take several seconds for it to - ; shut down completely. If the application is being used by another user we - ; can still delete the files when the system is restarted. - Sleep 5000 - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ClearErrors - ${EndIf} - - SetShellVarContext current ; Set SHCTX to HKCU - ${un.RegCleanMain} "Software\Mozilla" - ${un.RegCleanUninstall} - ${un.DeleteShortcuts} - - ClearErrors - WriteRegStr HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" "Write Test" - ${If} ${Errors} - StrCpy $TmpVal "HKCU" ; used primarily for logging - ${Else} - SetShellVarContext all ; Set SHCTX to HKLM - DeleteRegValue HKLM "Software\Mozilla" "${BrandShortName}InstallerTest" - StrCpy $TmpVal "HKLM" ; used primarily for logging - ${un.RegCleanMain} "Software\Mozilla" - ${un.RegCleanUninstall} - ${un.DeleteShortcuts} - ${EndIf} - - SetShellVarContext all ; Set SHCTX to HKLM - ${un.GetSecondInstallPath} "Software\Mozilla" $R9 - ${If} $R9 == "false" - SetShellVarContext current ; Set SHCTX to HKCU - ${un.GetSecondInstallPath} "Software\Mozilla" $R9 - ${EndIf} - - StrCpy $0 "Software\Microsoft\Windows\CurrentVersion\App Paths\${FileMainEXE}" - ${If} $R9 == "false" - DeleteRegKey HKLM "$0" - DeleteRegKey HKCU "$0" - ${Else} - ReadRegStr $R1 HKLM "$0" "" - ${un.RemoveQuotesFromPath} "$R1" $R1 - ${un.GetParent} "$R1" $R1 - ${If} "$INSTDIR" == "$R1" - WriteRegStr HKLM "$0" "" "$R9" - ${un.GetParent} "$R9" $R1 - WriteRegStr HKLM "$0" "Path" "$R1" - ${EndIf} - ${EndIf} - - ; Remove directories and files we always control before parsing the uninstall - ; log so empty directories can be removed. - ${If} ${FileExists} "$INSTDIR\updates" - RmDir /r /REBOOTOK "$INSTDIR\updates" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\defaults\shortcuts" - RmDir /r /REBOOTOK "$INSTDIR\defaults\shortcuts" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\distribution" - RmDir /r /REBOOTOK "$INSTDIR\distribution" - ${EndIf} - ${If} ${FileExists} "$INSTDIR\removed-files" - Delete /REBOOTOK "$INSTDIR\removed-files" - ${EndIf} - - ; Remove the updates directory for Vista and above - ${un.CleanUpdatesDir} "Mozilla\Sunbird" - - ; Remove files that may be left behind by the application in the - ; VirtualStore directory. - ${un.CleanVirtualStore} - - ; Parse the uninstall log to unregister dll's and remove all installed - ; files / directories this install is responsible for. - ${un.ParseUninstallLog} - - ; Remove the uninstall directory that we control - RmDir /r /REBOOTOK "$INSTDIR\uninstall" - - ; Remove the installation directory if it is empty - ${RemoveDir} "$INSTDIR" - - ; If thunderbird.exe was successfully deleted yet we still need to restart to - ; remove other files create a dummy thunderbird.exe.moz-delete to prevent the - ; installer from allowing an install without restart when it is required - ; to complete an uninstall. - ${If} ${RebootFlag} - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}.moz-delete" - FileOpen $0 "$INSTDIR\${FileMainEXE}.moz-delete" w - FileWrite $0 "Will be deleted on restart" - Delete /REBOOTOK "$INSTDIR\${FileMainEXE}.moz-delete" - FileClose $0 - ${EndUnless} - ${EndIf} - - ; Refresh desktop icons otherwise the start menu internet item won't be - ; removed and other ugly things will happen like recreation of the app's - ; clients registry key by the OS under some conditions. - System::Call "shell32::SHChangeNotify(i, i, i, i) v (0x08000000, 0, 0, 0)" -SectionEnd - -################################################################################ -# Language - -!insertmacro MOZ_MUI_LANGUAGE 'baseLocale' -!verbose push -!verbose 3 -!include "overrideLocale.nsh" -!include "customLocale.nsh" -!verbose pop - -; Set this after the locale files to override it if it is in the locale. Using -; " " for BrandingText will hide the "Nullsoft Install System..." branding. -BrandingText " " - -################################################################################ -# Page pre, show, and leave functions - -Function un.preWelcome - ${If} ${FileExists} "$INSTDIR\distribution\modern-wizard.bmp" - Delete "$PLUGINSDIR\modern-wizard.bmp" - CopyFiles /SILENT "$INSTDIR\distribution\modern-wizard.bmp" "$PLUGINSDIR\modern-wizard.bmp" - ${EndIf} -FunctionEnd - -Function un.leaveWelcome - ${If} ${FileExists} "$INSTDIR\${FileMainEXE}" - Banner::show /NOUNLOAD "$(BANNER_CHECK_EXISTING)" - - ${If} "$TmpVal" == "FoundMessageWindow" - Sleep 5000 - ${EndIf} - - ${PushFilesToCheck} - - ${un.CheckForFilesInUse} $TmpVal - - Banner::destroy - - ${If} "$TmpVal" == "true" - StrCpy $TmpVal "FoundMessageWindow" - ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)" - StrCpy $TmpVal "true" - ${EndIf} - ${EndIf} -FunctionEnd - -Function un.preConfirm - ${If} ${FileExists} "$INSTDIR\distribution\modern-header.bmp" - ${AndIf} $hHeaderBitmap == "" - Delete "$PLUGINSDIR\modern-header.bmp" - CopyFiles /SILENT "$INSTDIR\distribution\modern-header.bmp" "$PLUGINSDIR\modern-header.bmp" - ${un.ChangeMUIHeaderImage} "$PLUGINSDIR\modern-header.bmp" - ${EndIf} - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "3" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Type "label" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Text "$(UN_CONFIRM_UNINSTALLED_FROM)" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Top "5" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 1" Bottom "15" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Type "text" - ; The contents of this control must be set as follows in the pre function - ; ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND" - ; SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" State "" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Top "17" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" Bottom "30" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 2" flags "READONLY" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Type "label" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Text "$(UN_CONFIRM_CLICK)" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Top "130" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 3" Bottom "150" - - ${If} "$TmpVal" == "true" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Type "label" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Text "$(SUMMARY_REBOOT_REQUIRED_UNINSTALL)" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Left "0" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Right "-1" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Top "35" - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Field 4" Bottom "45" - - WriteINIStr "$PLUGINSDIR\unconfirm.ini" "Settings" NumFields "4" - ${EndIf} - - !insertmacro MUI_HEADER_TEXT "$(UN_CONFIRM_PAGE_TITLE)" "$(UN_CONFIRM_PAGE_SUBTITLE)" - ; The Summary custom page has a textbox that will automatically receive - ; focus. This sets the focus to the Install button instead. - !insertmacro MUI_INSTALLOPTIONS_INITDIALOG "unconfirm.ini" - GetDlgItem $0 $HWNDPARENT 1 - System::Call "user32::SetFocus(i r0, i 0x0007, i,i)i" - ${MUI_INSTALLOPTIONS_READ} $1 "unconfirm.ini" "Field 2" "HWND" - SendMessage $1 ${WM_SETTEXT} 0 "STR:$INSTDIR" - !insertmacro MUI_INSTALLOPTIONS_SHOW -FunctionEnd - -Function un.leaveConfirm - ; Try to delete the app executable and if we can't delete it try to find the - ; app's message window and prompt the user to close the app. This allows - ; running an instance that is located in another directory. If for whatever - ; reason there is no message window we will just rename the app's files and - ; then remove them on restart if they are in use. - ClearErrors - ${DeleteFile} "$INSTDIR\${FileMainEXE}" - ${If} ${Errors} - ${un.ManualCloseAppPrompt} "${WindowClass}" "$(WARN_MANUALLY_CLOSE_APP_UNINSTALL)" - ${EndIf} -FunctionEnd - -################################################################################ -# Initialization Functions - -Function .onInit - ${UninstallOnInitCommon} -FunctionEnd - -Function un.onInit - ${un.GetParent} "$INSTDIR" $INSTDIR - ${un.GetLongPath} "$INSTDIR" $INSTDIR - ${Unless} ${FileExists} "$INSTDIR\${FileMainEXE}" - Abort - ${EndUnless} - - StrCpy $LANGUAGE 0 - ${un.SetBrandNameVars} "$INSTDIR\distribution\setup.ini" - - ; Initialize $hHeaderBitmap to prevent redundant changing of the bitmap if - ; the user clicks the back button - StrCpy $hHeaderBitmap "" - - !insertmacro InitInstallOptionsFile "unconfirm.ini" -FunctionEnd - -Function .onGUIEnd - ${OnEndCommon} -FunctionEnd - -Function un.onGUIEnd - ${un.OnEndCommon} -FunctionEnd diff --git a/calendar/installer/windows/nsis/updater_append.ini b/calendar/installer/windows/nsis/updater_append.ini deleted file mode 100644 index 1b4bc1be7..000000000 --- a/calendar/installer/windows/nsis/updater_append.ini +++ /dev/null @@ -1,16 +0,0 @@ -; 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/. - - -; IMPORTANT: This file should always start with a newline in case a locale -; provided updater.ini does not end with a newline. -; Application to launch after an update has been successfully applied. This -; must be in the same directory or a sub-directory of the directory of the -; application executable that initiated the software update. -[PostUpdateWin] -; ExeRelPath is the path to the PostUpdateWin executable relative to the -; application executable. -ExeRelPath=uninstall\helper.exe -; ExeArg is the argument to pass to the PostUpdateWin exe -ExeArg=/PostUpdate diff --git a/calendar/installer/windows/packages-static b/calendar/installer/windows/packages-static deleted file mode 100644 index 580fbbf5d..000000000 --- a/calendar/installer/windows/packages-static +++ /dev/null @@ -1,362 +0,0 @@ -; Package file for Win32 static Sunbird build. -; -; Packaging manifest is used to copy files from dist/bin -; to the staging directory. -; Some other files are built in the staging directory directly, -; so they will be implicitly packaged too. -; -; File format: -; -; [] designates a toplevel component. Example: [xpcom] -; - in front of a file specifies it to be removed from the destination -; * wildcard support to recursively copy the entire directory -; ; file comment -; - -#filter substitution - -[@AB_CD@] -bin\chrome\@AB_CD@.jar -bin\chrome\@AB_CD@.manifest -bin\chrome\calendar-@AB_CD@.jar -bin\chrome\calendar-@AB_CD@.manifest -bin\chrome\sunbird-@AB_CD@.jar -bin\chrome\sunbird-@AB_CD@.manifest -bin\defaults\pref\sunbird-l10n.js -bin\defaults\profile\prefs.js -bin\defaults\profile\chrome\* -bin\dictionaries\* -bin\uninstall\helper.exe -bin\update.locale -bin\updater.ini - -[xpcom] -bin\components\components.list -bin\mozjs.dll -bin\plc4.dll -bin\plds4.dll -bin\xpcom.dll -bin\xpcom_core.dll -bin\nspr4.dll -bin\components\xpinstal.dll -bin\components\jar50.dll -bin\Microsoft.VC80.CRT.manifest -bin\msvcm80.dll -bin\msvcp80.dll -bin\msvcr80.dll - -[calendar] -; [Base Calendar Files] -bin\application.ini -bin\LICENSE -bin\platform.ini -bin\README.txt -bin\sqlite3.dll -bin\sunbird.exe - -; [Components] -bin\AccessibleMarshal.dll -bin\components\accessibility.xpt -bin\components\accessibility-msaa.xpt -bin\components\alerts.xpt -bin\components\appshell.xpt -bin\components\appstartup.xpt -bin\components\autocomplete.xpt -bin\components\autoconfig.xpt -bin\components\calbase.xpt -bin\components\calbasecomps.dll -bin\components\calbaseinternal.xpt -bin\components\caldav.xpt -bin\components\caps.xpt -bin\components\chardet.xpt -bin\components\chrome.xpt -bin\components\commandhandler.xpt -bin\components\commandlines.xpt -bin\components\composer.xpt -bin\components\content_base.xpt -bin\components\content_canvas.xpt -bin\components\content_events.xpt -bin\components\content_html.xpt -bin\components\content_htmldoc.xpt -bin\components\content_xmldoc.xpt -bin\components\content_xslt.xpt -bin\components\content_xtf.xpt -bin\components\cookie.xpt -bin\components\docshell_base.xpt -bin\components\dom.xpt -bin\components\dom_base.xpt -bin\components\dom_canvas.xpt -bin\components\dom_core.xpt -bin\components\dom_css.xpt -bin\components\dom_events.xpt -bin\components\dom_geolocation.xpt -bin\components\dom_html.xpt -bin\components\dom_indexeddb.xpt -bin\components\dom_json.xpt -bin\components\dom_offline.xpt -bin\components\dom_range.xpt -bin\components\dom_sidebar.xpt -bin\components\dom_storage.xpt -bin\components\dom_stylesheets.xpt -bin\components\dom_svg.xpt -bin\components\dom_threads.xpt -bin\components\dom_traversal.xpt -bin\components\dom_views.xpt -bin\components\dom_xbl.xpt -bin\components\dom_xpath.xpt -bin\components\dom_xul.xpt -bin\components\downloads.xpt -bin\components\editor.xpt -bin\components\embed_base.xpt -bin\components\extensions.xpt -bin\components\exthandler.xpt -bin\components\exthelper.xpt -bin\components\fastfind.xpt -bin\components\feeds.xpt -bin\components\find.xpt -bin\components\gfx.xpt -bin\components\htmlparser.xpt -bin\components\imgicon.xpt -bin\components\imglib2.xpt -bin\components\inspector.xpt -bin\components\intl.xpt -bin\components\jar.xpt -bin\components\jsd3250.dll -bin\components\jsdservice.xpt -bin\components\layout_base.xpt -#ifdef NS_PRINTING -bin\components\layout_printing.xpt -#endif -bin\components\layout_xul.xpt -bin\components\layout_xul_tree.xpt -bin\components\locale.xpt -bin\components\loginmgr.xpt -bin\components\lwbrk.xpt -bin\components\mimetype.xpt -bin\components\mozfind.xpt -bin\components\necko.xpt -bin\components\necko_about.xpt -bin\components\necko_cache.xpt -bin\components\necko_cookie.xpt -bin\components\necko_dns.xpt -bin\components\necko_file.xpt -bin\components\necko_ftp.xpt -bin\components\necko_http.xpt -bin\components\necko_res.xpt -bin\components\necko_socket.xpt -bin\components\necko_strconv.xpt -bin\components\necko_viewsource.xpt -bin\components\necko_wifi.xpt -bin\components\parentalcontrols.xpt -bin\components\places.xpt -bin\components\plugin.xpt -bin\components\pref.xpt -bin\components\prefetch.xpt -bin\components\profile.xpt -bin\components\rdf.xpt -bin\components\satchel.xpt -bin\components\saxparser.xpt -bin\components\shistory.xpt -bin\components\spellchecker.xpt -bin\components\storage.xpt -bin\components\toolkitprofile.xpt -bin\components\txmgr.xpt -bin\components\txtsvc.xpt -bin\components\uconv.xpt -bin\components\unicharutil.xpt -bin\components\update.xpt -bin\components\uriloader.xpt -bin\components\urlformatter.xpt -bin\components\wcap.xpt -bin\components\webBrowser_core.xpt -bin\components\webbrowserpersist.xpt -bin\components\webshell_idls.xpt -bin\components\widget.xpt -bin\components\windowds.xpt -bin\components\windowwatcher.xpt -bin\components\xpautocomplete.xpt -bin\components\xpcom_base.xpt -bin\components\xpcom_components.xpt -bin\components\xpcom_ds.xpt -bin\components\xpcom_io.xpt -bin\components\xpcom_system.xpt -bin\components\xpcom_thread.xpt -bin\components\xpcom_xpti.xpt -bin\components\xpconnect.xpt -bin\components\xpinstall.xpt -bin\components\xulapp.xpt -bin\components\xuldoc.xpt -bin\components\xultmpl.xpt -bin\components\zipwriter.xpt - -; JavaScript components -bin\components\calCompositeCalendar.js -bin\components\calDavCalendar.js -bin\components\calendarService.js -bin\components\calICSCalendar.js -bin\components\calImportExportModule.js -bin\components\calItemModule.js -bin\components\calMemoryCalendar.js -bin\components\calStorageCalendar.js -bin\components\calWcapCalendarModule.js -bin\components\jsconsole-clhandler.js -bin\components\NetworkGeolocationProvider.js -bin\components\nsAddonRepository.js -bin\components\nsBadCertHandler.js -bin\components\nsBlocklistService.js -bin\components\nsContentDispatchChooser.js -bin\components\nsContentPrefService.js -bin\components\nsDefaultCLH.js -bin\components\nsDownloadManagerUI.js -bin\components\nsExtensionManager.js -bin\components\nsHandlerService.js -bin\components\nsHelperAppDlg.js -bin\components\nsLoginInfo.js -bin\components\nsLoginManager.js -bin\components\nsLoginManagerPrompter.js -bin\components\nsProgressDialog.js -bin\components\nsTryToClose.js -#ifdef MOZ_UPDATER -bin\components\nsUpdateService.js -bin\components\nsUpdateServiceStub.js -#endif -bin\components\nsUpdateTimerManager.js -bin\components\nsURLFormatter.js -bin\components\nsWebHandlerApp.js -bin\components\pluginGlue.js -bin\components\storage-Legacy.js -bin\components\storage-mozStorage.js -bin\components\txEXSLTRegExFunctions.js -bin\calendar-js\calAlarm.js -bin\calendar-js\calAlarmMonitor.js -bin\calendar-js\calAlarmService.js -bin\calendar-js\calAttachment.js -bin\calendar-js\calAttendee.js -bin\calendar-js\calCachedCalendar.js -bin\calendar-js\calCalendarManager.js -bin\calendar-js\calCalendarSearchService.js -bin\calendar-js\calDateTimeFormatter.js -bin\calendar-js\calDavRequestHandlers.js -bin\calendar-js\calEvent.js -bin\calendar-js\calFilter.js -bin\calendar-js\calFreeBusyService.js -bin\calendar-js\calHtmlExport.js -bin\calendar-js\calIcsImportExport.js -bin\calendar-js\calIcsParser.js -bin\calendar-js\calIcsSerializer.js -bin\calendar-js\calItemBase.js -bin\calendar-js\calItipItem.js -bin\calendar-js\calListFormatter.js -bin\calendar-js\calMonthGridPrinter.js -bin\calendar-js\calOutlookCSVImportExport.js -bin\calendar-js\calProtocolHandler.js -bin\calendar-js\calRecurrenceInfo.js -bin\calendar-js\calRelation.js -bin\calendar-js\calTimezoneService.js -bin\calendar-js\calTodo.js -bin\calendar-js\calTransactionManager.js -bin\calendar-js\calUtils.js -bin\calendar-js\calWcapCalendar.js -bin\calendar-js\calWcapCalendarItems.js -bin\calendar-js\calWcapErrors.js -bin\calendar-js\calWcapRequest.js -bin\calendar-js\calWcapSession.js -bin\calendar-js\calWcapUtils.js -bin\calendar-js\calWeekInfoService.js -bin\calendar-js\calWeekPrinter.js - -; [Modules] -bin\modules\* - -; [Calendar Chrome Files] -bin\chrome\calendar.jar -bin\chrome\calendar.manifest -bin\chrome\sunbird.jar -bin\chrome\sunbird.manifest -bin\chrome\classic.jar -bin\chrome\classic.manifest -bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\chrome.manifest -bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\icon.png -bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\install.rdf -bin\extensions\{972ce4c6-7e08-4474-a285-3208198ce6fd}\preview.png -bin\extensions\{e2fda1a4-762b-4020-b5ad-a41df1933103}\chrome.manifest -bin\extensions\{e2fda1a4-762b-4020-b5ad-a41df1933103}\install.rdf -bin\chrome\comm.jar -bin\chrome\comm.manifest -bin\chrome\toolkit.jar -bin\chrome\toolkit.manifest -; [Calendar Chrome Icons] -bin\chrome\icons\default\calendar-alarm-dialog.ico -bin\chrome\icons\default\calendar-event-dialog.ico -bin\chrome\icons\default\calendar-event-summary-dialog.ico -bin\chrome\icons\default\calendar-task-dialog.ico -bin\chrome\icons\default\calendar-task-summary-dialog.ico - -; [calendar-timezones] -bin\extensions\calendar-timezones@mozilla.org\install.rdf -bin\extensions\calendar-timezones@mozilla.org\timezones.sqlite -bin\extensions\calendar-timezones@mozilla.org\chrome.manifest -bin\extensions\calendar-timezones@mozilla.org\chrome\calendar-timezones.jar -bin\extensions\calendar-timezones@mozilla.org\chrome\calendar-timezones-@AB_CD@.jar -bin\extensions\calendar-timezones@mozilla.org\defaults\preferences\preferences.js - -; [Default Preferences] -; All the pref files must be part of base to prevent migration bugs -bin\defaults\pref\sunbird.js -bin\defaults\pref\channel-prefs.js -bin\goanna.js -bin\defaults\autoconfig\platform.js -bin\defaults\autoconfig\prefcalls.js - -; [Layout Engine Resources] -; Style Sheets, Graphics and other Resources used by the layout engine. -bin\res\hiddenWindow.html -bin\res\ua.css -bin\res\html.css -bin\res\quirk.css -bin\res\forms.css -bin\res\svg.css - -bin\res\arrowd.gif -bin\res\viewsource.css -bin\res\arrow.gif -bin\res\loading-image.png -bin\res\broken-image.png -bin\res\fonts\* -bin\res\dtd\* -bin\res\html\folder.png -bin\res\contenteditable.css -bin\res\designmode.css -bin\res\wincharset.properties -bin\res\charsetalias.properties -bin\res\charsetData.properties -bin\res\langGroups.properties -bin\res\language.properties -bin\res\entityTables\* - -; [Personal Security Manager] -; -; NSS libraries are signed in the staging directory, -; meaning their .chk files are created there directly. -; -bin\freebl3.dll -bin\nss3.dll -bin\nssckbi.dll -bin\nssdbm3.dll -bin\nssutil3.dll -bin\smime3.dll -bin\softokn3.dll -bin\ssl3.dll -bin\chrome\pippki.jar -bin\chrome\pippki.manifest -bin\components\pipboot.xpt -bin\components\pipnss.xpt -bin\components\pippki.xpt - -; [Updater] -; -bin\updater.exe - -; [Crash Reporter] -bin\crashreporter.exe -bin\crashreporter.ini diff --git a/calendar/lightning/Makefile.in b/calendar/lightning/Makefile.in index fb6d888ff..510c474b3 100644 --- a/calendar/lightning/Makefile.in +++ b/calendar/lightning/Makefile.in @@ -14,38 +14,8 @@ ifneq (,$(findstring a,$(LIGHTNING_VERSION))) DEFINES += -DLIGHTNING_PRERELEASE_VERSION=1 endif -# Enable nightly updates on aurora and nightly channel -ifeq (nightly,$(subst aurora,nightly,$(MOZ_UPDATE_CHANNEL))) -DEFINES += -DLIGHTNING_UPDATE_LOCATION=https://calendar.mozilla.org/update.php -endif - -# Gecko milestone -GRE_MILESTONE = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build Milestone) -ifdef GRE_MILESTONE -DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -endif - -# comm-central source repo and stamp -SOURCE_STAMP ?= $(firstword $(shell hg -R $(topsrcdir) parent --template='{node}\n' 2>/dev/null)) -ifdef SOURCE_STAMP -DEFINES += -DSOURCE_STAMP='$(SOURCE_STAMP)' -endif - -SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/') -ifdef SOURCE_REPO -DEFINES += -DSOURCE_REPO='$(SOURCE_REPO)' -endif - -# Mozilla source repo and stamps -MOZ_SOURCE_STAMP = $(firstword $(shell hg -R $(MOZILLA_SRCDIR) parent --template='{node}\n' 2>/dev/null)) -ifdef MOZ_SOURCE_STAMP -DEFINES += -DMOZ_SOURCE_STAMP='$(MOZ_SOURCE_STAMP)' -endif - -MOZ_SOURCE_REPO := $(shell hg -R $(MOZILLA_SRCDIR) showconfig paths.default 2>/dev/null | sed -e 's/^ssh:/http:/') -ifdef MOZ_SOURCE_REPO -DEFINES += -DMOZ_SOURCE_REPO='$(MOZ_SOURCE_REPO)' -endif +# Gecko milestone +DEFINES += -DGRE_MILESTONE=$(shell tail -1 $(topsrcdir)/config/milestone.txt) # Install as a global extension in # dist/bin/extensions/ @@ -60,8 +30,7 @@ DEFINES += -DTHUNDERBIRD_VERSION=$(THUNDERBIRD_VERSION) \ -DXPI_EM_ID=$(XPI_EM_ID) \ $(NULL) -MOZ_BUILDID = $(shell $(PYTHON) $(MOZILLA_SRCDIR)/config/printconfigsetting.py $(DIST)/bin/application.ini App BuildID) -DEFINES += -DMOZ_BUILDID=$(MOZ_BUILDID) +DEFINES += -DMOZ_BUILDID=20100101 include $(topsrcdir)/config/rules.mk include $(srcdir)/versions.mk diff --git a/calendar/lightning/lightning-packager.mk b/calendar/lightning/lightning-packager.mk index 8e36ce1b7..15fcedb07 100644 --- a/calendar/lightning/lightning-packager.mk +++ b/calendar/lightning/lightning-packager.mk @@ -20,7 +20,7 @@ # LIGHTNING_VERSION = 2.2 # Will be used to replace the Thunderbird version # # in POST_UPLOAD_CMD -include $(MOZILLA_SRCDIR)/system/installer/package-name.mk +include $(MOZILLA_SRCDIR)/calendar/installer/package-name.mk # Set the univeral path only if we are building a univeral binary and it was # not restricted by the calling makefile diff --git a/calendar/moz.build b/calendar/moz.build index 2dab88966..6b7445d0c 100644 --- a/calendar/moz.build +++ b/calendar/moz.build @@ -3,8 +3,6 @@ # 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/. -CONFIGURE_SUBST_FILES += ['installer/Makefile'] - if CONFIG['MOZ_CALENDAR']: DIRS += [ 'lightning', diff --git a/calendar/timezones/Makefile.in b/calendar/timezones/Makefile.in index 1be195f67..eb7004c80 100644 --- a/calendar/timezones/Makefile.in +++ b/calendar/timezones/Makefile.in @@ -4,7 +4,7 @@ XPI_PKGNAME = calendar-timezones-$(TIMEZONES_VERSION) -THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/mail/config/version.txt) +THUNDERBIRD_VERSION := $(shell cat $(topsrcdir)/apps/mail/config/version.txt) SEAMONKEY_VERSION := "2.49" CALENDAR_VERSION := $(shell $(PYTHON) $(topsrcdir)/calendar/lightning/build/makeversion.py $(word 1,$(MOZ_PKG_VERSION) $(THUNDERBIRD_VERSION))) TIMEZONES_VERSION := $(shell $(PYTHON) $(srcdir)/version.py) diff --git a/system/installer/linux/rpm/mozilla.desktop b/system/installer/linux/rpm/mozilla.desktop deleted file mode 100644 index f9f3bdc34..000000000 --- a/system/installer/linux/rpm/mozilla.desktop +++ /dev/null @@ -1,21 +0,0 @@ -#filter substitution -# 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/. - -[Desktop Entry] -Version=1.0 -Name=@MOZ_APP_DISPLAYNAME@ -GenericName=Web Browser -Comment=Your web, the way you like it -Exec=@MOZ_APP_NAME@ -Icon=@MOZ_APP_NAME@ -Terminal=false -Type=Application -StartupWMClass=@MOZ_APP_NAME@-bin -MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https; -StartupNotify=true -X-MultipleArgs=false -X-Desktop-File-Install-Version=0.16 -Categories=Network;WebBrowser; -Encoding=UTF-8 diff --git a/system/installer/linux/rpm/mozilla.spec b/system/installer/linux/rpm/mozilla.spec deleted file mode 100644 index 90d132558..000000000 --- a/system/installer/linux/rpm/mozilla.spec +++ /dev/null @@ -1,134 +0,0 @@ -# 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/. - -%global __jar_repack %{nil} - -#Use a consistent string to refer to the package by -%define pr_name "%{moz_app_displayname} %{moz_app_version}" - -Name: %{moz_app_name} -Version: %{moz_numeric_app_version} -Release: %{?moz_rpm_release:%{moz_rpm_release}}%{?buildid:.%{buildid}} -Summary: %{pr_name} -Group: Applications/Internet -License: MPL 2 -Vendor: Mozilla -URL: http://www.mozilla.org/projects/firefox/ -Source0: %{name}.desktop -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -#AutoProv: no - -BuildRequires: desktop-file-utils - - -%description -%{pr_name}. This package was built from -%{moz_source_repo}/rev/%{moz_source_stamp} - -#We only want a subpackage for the SDK if the required -#files were generated. Like the tests subpackage, we -#probably only need to conditionaly define the %files -#section. -%if %{?createdevel:1} -%package devel -Summary: %{pr_name} SDK -Group: Development/Libraries -requires: %{name} = %{version}-%{release} -%description devel -%{pr_name} SDK libraries, headers and interface descriptions -%endif - -%if %{?createtests:1} -%package tests -Summary: %{pr_name} tests -Group: Developement/Libraries -requires: %{name} = %{version}-%{release} -%description tests -%{pr_name} test harness files and test cases -%endif - -%prep -echo No-op prep - - -%build -echo No-op build - - -%install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -desktop-file-validate %{SOURCE0} -desktop-file-install --vendor mozilla \ - --dir $RPM_BUILD_ROOT%{_datadir}/applications \ - %{SOURCE0} -#In order to make branding work in a generic way, We find -#all the icons that are likely to be used for desktop files -#and install them appropriately -find %{moz_branding_directory} -name "default*.png" | tee icons.list -for i in $(cat icons.list) ; do - size=$(echo $i | sed "s/.*default\([0-9]*\).png$/\1/") - icondir=$RPM_BUILD_ROOT/%{_datadir}/icons/hicolor/${size}x${size}/apps/ - mkdir -p $icondir - cp -a $i ${icondir}%{name}.png -done -rm icons.list #cleanup - -%if %{?createtests:1} -#wastefully creates a zip file, but ensures that we stage all test suites -make package-tests -testdir=$RPM_BUILD_ROOT/%{_datadir}/%{_testsinstalldir}/tests -mkdir -p $testdir -cp -a dist/test-stage/* $testdir/ -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - - -%post -#this is needed to get gnome-panel to update the icons -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet ${_datadir}/icons/hicolor &> /dev/null || : -fi - - -%postun -#this is needed to get gnome-panel to update the icons -update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor || : -if [ -x %{_bindir}/gtk-update-icon-cache ] ; then - %{_bindir}/gtk-update-icon-cache --quiet ${_datadir}/icons/hicolor &> /dev/null || : -fi - - -%files -%defattr(-,root,root,-) -%{_installdir} -%{_bindir} -%{_datadir}/applications/ -%{_datadir}/icons/ -%doc - - -%if %{?createdevel:1} -%files devel -%defattr(-,root,root,-) -%{_includedir} -%{_sdkdir} -%{_idldir} -%endif - - -%if %{?createtests:1} -%files tests -%{_datadir}/%{_testsinstalldir}/tests/ -%endif - -#%changelog -#* %{name} %{version} %{moz_rpm_release} -#- Please see %{moz_source_repo}/shortlog/%{moz_source_stamp} diff --git a/system/installer/make-eme.mk b/system/installer/make-eme.mk deleted file mode 100644 index 09e50a4ce..000000000 --- a/system/installer/make-eme.mk +++ /dev/null @@ -1,16 +0,0 @@ -# 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 $(MOZILLA_DIR)/system/installer/signing.mk - -ifdef MOZ_SIGN_CMD - ifeq (,$(filter-out WINNT Darwin,$(OS_ARCH))) - # The first argument to this macro is the directory where the - # plugin-container binary exists, and the second is where voucher.bin will - # be generated. If the second argument is not specified, it defaults to the - # same as the first. - MAKE_SIGN_EME_VOUCHER = $(PYTHON) $(MOZILLA_DIR)/python/eme/gen-eme-voucher.py -input $(1)/$(MOZ_CHILD_PROCESS_NAME) -output $(or $(2),$(1))/voucher.bin && \ - $(MOZ_SIGN_CMD) -f emevoucher "$(or $(2),$(1))/voucher.bin" - endif -endif diff --git a/system/installer/packager-uxp.mk b/system/installer/packager-uxp.mk deleted file mode 100644 index ed7ecf63d..000000000 --- a/system/installer/packager-uxp.mk +++ /dev/null @@ -1,23 +0,0 @@ -# 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/. - -# We need to include the mozilla packaging routines because we are -# very much still dependent on them -include $(MOZILLA_DIR)/system/installer/packager.mk - -# This is currently only used on Windows, Linux, and Solaris -# on other platforms such as Mac will fall back to the orginal -# mozilla packaging -make-archive: -ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH))) - $(MAKE) make-package -else - $(MAKE) stage-package make-buildinfo-file - @echo 'Compressing...' -ifeq (WINNT,$(OS_ARCH)) - cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR) -else - cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR) -endif -endif diff --git a/system/installer/packager.mk b/system/installer/packager.mk deleted file mode 100644 index b9de42315..000000000 --- a/system/installer/packager.mk +++ /dev/null @@ -1,227 +0,0 @@ -# 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 $(MOZILLA_DIR)/system/installer/package-name.mk -include $(MOZILLA_DIR)/system/installer/upload-files.mk -include $(MOZILLA_DIR)/system/installer/make-eme.mk - -# This is how we create the binary packages we release to the public. - -# browser/locales/Makefile uses this makefile for its variable defs, but -# doesn't want the libs:: rule. -ifndef PACKAGER_NO_LIBS -libs:: make-package -endif - -installer-stage: prepare-package -ifndef MOZ_PKG_MANIFEST - $(error MOZ_PKG_MANIFEST unspecified!) -endif - @rm -rf $(DEPTH)/installer-stage $(DIST)/xpt - @echo 'Staging installer files...' - @$(NSINSTALL) -D $(DEPTH)/installer-stage/core - @cp -av $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/. $(DEPTH)/installer-stage/core -ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD -# The && true is necessary to make sure Pymake spins a shell - $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(DEPTH)/installer-stage && true -endif - $(call MAKE_SIGN_EME_VOUCHER,$(DEPTH)/installer-stage/core) - @(cd $(DEPTH)/installer-stage/core && $(CREATE_PRECOMPLETE_CMD)) - -ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) -ELF_HACK_FLAGS = --fill -endif -export USE_ELF_HACK ELF_HACK_FLAGS - -# Override the value of OMNIJAR_NAME from config.status with the value -# set earlier in this file. - -stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS) - OMNIJAR_NAME=$(OMNIJAR_NAME) \ - NO_PKG_FILES="$(NO_PKG_FILES)" \ - $(PYTHON) $(MOZILLA_DIR)/system/installer/packager.py $(DEFINES) $(ACDEFINES) \ - --format $(MOZ_PACKAGER_FORMAT) \ - $(addprefix --removals ,$(MOZ_PKG_REMOVALS)) \ - $(if $(filter-out 0,$(MOZ_PKG_FATAL_WARNINGS)),,--ignore-errors) \ - $(if $(MOZ_PACKAGER_MINIFY),--minify) \ - $(if $(MOZ_PACKAGER_MINIFY_JS),--minify-js \ - $(addprefix --js-binary ,$(JS_BINARY)) \ - ) \ - $(if $(JARLOG_DIR),$(addprefix --jarlog ,$(wildcard $(JARLOG_FILE_AB_CD)))) \ - $(if $(OPTIMIZEJARS),--optimizejars) \ - $(addprefix --compress ,$(JAR_COMPRESSION)) \ - $(addprefix --unify ,$(UNIFY_DIST)) \ - $(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \ - $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) - $(PYTHON) $(MOZILLA_DIR)/system/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR) - @(cd $(DIST)/$(MOZ_PKG_DIR) && $(CREATE_PRECOMPLETE_CMD)) -ifdef MOZ_PACKAGE_JSSHELL - # Package JavaScript Shell - @echo 'Packaging JavaScript Shell...' - $(RM) $(PKG_JSSHELL) - $(MAKE_JSSHELL) -endif # MOZ_PACKAGE_JSSHELL -ifeq (Darwin, $(OS_ARCH)) -ifdef MOZ_ASAN - @echo "Rewriting ASan runtime dylib paths for all binaries in $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) ..." - $(PYTHON) $(MOZILLA_DIR)/build/unix/rewrite_asan_dylib.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH) -endif # MOZ_ASAN -endif # Darwin - -prepare-package: stage-package - -make-package-internal: prepare-package make-sourcestamp-file make-buildinfo-file - @echo 'Compressing...' - cd $(DIST) && $(MAKE_PACKAGE) - -make-package: FORCE - $(MAKE) make-package-internal - $(TOUCH) $@ - -GARBAGE += make-package - -make-sourcestamp-file:: - $(NSINSTALL) -D $(DIST)/$(PKG_PATH) - @echo '$(BUILDID)' > $(MOZ_SOURCESTAMP_FILE) -ifdef MOZ_INCLUDE_SOURCE_INFO - @awk '$$2 == "MOZ_SOURCE_URL" {print $$3}' $(DEPTH)/source-repo.h >> $(MOZ_SOURCESTAMP_FILE) -endif - -.PHONY: make-buildinfo-file -make-buildinfo-file: - $(PYTHON) $(MOZILLA_DIR)/system/installer/informulate.py \ - $(MOZ_BUILDINFO_FILE) \ - BUILDID=$(BUILDID) \ - $(addprefix MOZ_SOURCE_REPO=,MOZ_SOURCE_REPO=$(shell awk '$$2 == "MOZ_SOURCE_REPO" {print $$3}' $(DEPTH)/source-repo.h)) \ - MOZ_SOURCE_STAMP=$(shell awk '$$2 == "MOZ_SOURCE_STAMP" {print $$3}' $(DEPTH)/source-repo.h) \ - MOZ_PKG_PLATFORM=$(MOZ_PKG_PLATFORM) - -# The install target will install the application to prefix/lib/appname-version -# In addition if INSTALL_SDK is set, it will install the development headers, -# libraries, and IDL files as follows: -# dist/include -> prefix/include/appname-version -# dist/idl -> prefix/share/idl/appname-version -# dist/sdk/lib -> prefix/lib/appname-devel-version/lib -# prefix/lib/appname-devel-version/* symlinks to the above directories -install:: prepare-package -ifeq ($(OS_ARCH),WINNT) - $(error "make install" is not supported on this platform. Use "make package" instead.) -endif -ifeq (bundle,$(MOZ_FS_LAYOUT)) - $(error "make install" is not supported on this platform. Use "make package" instead.) -endif - $(NSINSTALL) -D $(DESTDIR)$(installdir) - (cd $(DIST)/$(MOZ_PKG_DIR) && $(TAR) --exclude=precomplete $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(installdir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(bindir) - $(RM) -f $(DESTDIR)$(bindir)/$(MOZ_APP_NAME) - ln -s $(installdir)/$(MOZ_APP_NAME) $(DESTDIR)$(bindir) -ifdef INSTALL_SDK # Here comes the hard part - $(NSINSTALL) -D $(DESTDIR)$(includedir) - (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(includedir) && tar -xf -) - $(NSINSTALL) -D $(DESTDIR)$(idldir) - (cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DESTDIR)$(idldir) && tar -xf -) -# SDK directory is the libs + a bunch of symlinks - $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/lib - $(NSINSTALL) -D $(DESTDIR)$(sdkdir)/sdk/bin - if test -f $(DIST)/include/xpcom-config.h; then \ - $(SYSINSTALL) $(IFLAGS1) $(DIST)/include/xpcom-config.h $(DESTDIR)$(sdkdir); \ - fi - find $(DIST)/sdk -name '*.pyc' | xargs rm -f - (cd $(DIST)/sdk/lib && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/lib && tar -xf -) - (cd $(DIST)/sdk/bin && $(TAR) $(TAR_CREATE_FLAGS) - .) | (cd $(DESTDIR)$(sdkdir)/sdk/bin && tar -xf -) - $(RM) -f $(DESTDIR)$(sdkdir)/lib $(DESTDIR)$(sdkdir)/bin $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/include $(DESTDIR)$(sdkdir)/sdk/idl $(DESTDIR)$(sdkdir)/idl - ln -s $(sdkdir)/sdk/lib $(DESTDIR)$(sdkdir)/lib - ln -s $(installdir) $(DESTDIR)$(sdkdir)/bin - ln -s $(includedir) $(DESTDIR)$(sdkdir)/include - ln -s $(idldir) $(DESTDIR)$(sdkdir)/idl -endif # INSTALL_SDK - -make-sdk: -ifndef SDK_UNIFY - $(MAKE) stage-package UNIVERSAL_BINARY= STAGE_SDK=1 MOZ_PKG_DIR=sdk-stage -endif - @echo 'Packaging SDK...' - $(RM) -rf $(DIST)/$(MOZ_APP_NAME)-sdk - $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/bin -ifdef SDK_UNIFY - (cd $(UNIFY_DIST)/sdk-stage && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -) -else - (cd $(DIST)/sdk-stage && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/bin && tar -xf -) -endif - $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin - (cd $(DIST)/host/bin && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/host/bin && tar -xf -) - $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/sdk - find $(DIST)/sdk -name '*.pyc' | xargs rm -f - (cd $(DIST)/sdk && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/sdk && tar -xf -) - $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/include - (cd $(DIST)/include && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/include && tar -xf -) - $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/idl - (cd $(DIST)/idl && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/idl && tar -xf -) - $(NSINSTALL) -D $(DIST)/$(MOZ_APP_NAME)-sdk/lib -# sdk/lib is the same as sdk/sdk/lib - (cd $(DIST)/sdk/lib && $(TAR) $(TAR_CREATE_FLAGS) - .) | \ - (cd $(DIST)/$(MOZ_APP_NAME)-sdk/lib && tar -xf -) - $(NSINSTALL) -D $(DIST)/$(SDK_PATH) -ifndef PKG_SKIP_STRIP - USE_ELF_HACK= $(PYTHON) $(MOZILLA_DIR)/system/installer/strip.py $(DIST)/$(MOZ_APP_NAME)-sdk -endif - cd $(DIST) && $(MAKE_SDK) -ifdef UNIFY_DIST -ifndef SDK_UNIFY - $(MAKE) -C $(UNIFY_DIST)/.. sdk SDK_UNIFY=1 -endif -endif - -checksum: - mkdir -p `dirname $(CHECKSUM_FILE)` - @$(PYTHON) $(MOZILLA_DIR)/build/checksums.py \ - -o $(CHECKSUM_FILE) \ - $(CHECKSUM_ALGORITHM_PARAM) \ - -s $(call QUOTED_WILDCARD,$(DIST)) \ - $(UPLOAD_FILES) - @echo 'CHECKSUM FILE START' - @cat $(CHECKSUM_FILE) - @echo 'CHECKSUM FILE END' - $(SIGN_CHECKSUM_CMD) - - -upload: checksum - $(PYTHON) -u $(MOZILLA_DIR)/build/upload.py --base-path $(DIST) \ - --package '$(PACKAGE)' \ - --properties-file $(DIST)/mach_build_properties.json \ - $(UPLOAD_FILES) \ - $(CHECKSUM_FILES) - -# source-package creates a source tarball from the files in MOZ_PKG_SRCDIR, -# which is either set to a clean checkout or defaults to $topsrcdir -source-package: - @echo 'Generate the sourcestamp file' - # Make sure to have repository information available and then generate the - # sourcestamp file. - $(MAKE) -C $(DEPTH) 'source-repo.h' - $(MAKE) make-sourcestamp-file - @echo 'Packaging source tarball...' - # We want to include the sourcestamp file in the source tarball, so copy it - # in the root source directory. This is useful to enable telemetry submissions - # from builds made from the source package with the correct revision information. - # Don't bother removing it as this is only used by automation. - @cp $(MOZ_SOURCESTAMP_FILE) '$(MOZ_PKG_SRCDIR)/sourcestamp.txt' - $(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH) - (cd $(MOZ_PKG_SRCDIR) && $(CREATE_SOURCE_TAR) - ./ ) | xz -9e > $(SOURCE_TAR) - -hg-bundle: - $(MKDIR) -p $(DIST)/$(PKG_SRCPACK_PATH) - $(CREATE_HG_BUNDLE_CMD) - -source-upload: - $(MAKE) upload UPLOAD_FILES='$(SOURCE_UPLOAD_FILES)' CHECKSUM_FILE='$(SOURCE_CHECKSUM_FILE)' diff --git a/system/installer/signing.mk b/system/installer/signing.mk deleted file mode 100644 index 0319e6983..000000000 --- a/system/installer/signing.mk +++ /dev/null @@ -1,41 +0,0 @@ -# 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/. - -# We shouldn't sign the first pass of a PGO build -ifndef MOZ_PROFILE_GENERATE - -# Signing support -ifdef MOZ_SIGN_CMD -ifeq (WINNT,$(OS_ARCH)) -MOZ_INTERNAL_SIGNING_FORMAT := sha2signcode -MOZ_EXTERNAL_SIGNING_FORMAT := sha2signcode -MOZ_EXTERNAL_SIGNING_FORMAT_STUB := sha2signcodestub -SIGN_INCLUDES := \ - '*.dll' \ - '*.exe' \ - $(NULL) - -SIGN_EXCLUDES := \ - 'D3DCompiler*.dll' \ - 'msvc*.dll' \ - $(NULL) -endif # Windows - -ifeq (Darwin, $(OS_ARCH)) -MOZ_INTERNAL_SIGNING_FORMAT := macapp -MOZ_EXTERNAL_SIGNING_FORMAT := -endif # Darwin - -ifeq (linux-gnu,$(TARGET_OS)) -MOZ_EXTERNAL_SIGNING_FORMAT := -endif # Linux - -ifdef MOZ_ASAN -MOZ_INTERNAL_SIGNING_FORMAT := -MOZ_EXTERNAL_SIGNING_FORMAT := -endif - -endif # MOZ_SIGN_CMD - -endif # MOZ_PROFILE_GENERATE diff --git a/system/installer/upload-files.mk b/system/installer/upload-files.mk deleted file mode 100644 index 4ee20d15a..000000000 --- a/system/installer/upload-files.mk +++ /dev/null @@ -1,501 +0,0 @@ -# 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/. - -ifndef MOZ_PKG_FORMAT -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -MOZ_PKG_FORMAT = DMG -else -ifeq (,$(filter-out WINNT, $(OS_ARCH))) -MOZ_PKG_FORMAT = ZIP -else -ifeq (,$(filter-out SunOS, $(OS_ARCH))) - MOZ_PKG_FORMAT = BZ2 -else - ifeq (,$(filter-out gtk2 gtk3 qt, $(MOZ_WIDGET_TOOLKIT))) - MOZ_PKG_FORMAT = BZ2 - else - MOZ_PKG_FORMAT = TGZ - endif -endif -endif -endif -endif # MOZ_PKG_FORMAT - -ifeq ($(OS_ARCH),WINNT) -INSTALLER_DIR = windows -endif - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -ifndef _APPNAME -_APPNAME = $(MOZ_MACBUNDLE_NAME) -endif -ifndef _BINPATH -_BINPATH = /$(_APPNAME)/Contents/MacOS -endif # _BINPATH -ifndef _RESPATH -# Resource path for the precomplete file -_RESPATH = /$(_APPNAME)/Contents/Resources -endif -ifdef UNIVERSAL_BINARY -STAGEPATH = universal/ -endif -endif - -PACKAGE_BASE_DIR = $(ABS_DIST) -PACKAGE = $(PKG_PATH)$(PKG_BASENAME)$(PKG_SUFFIX) - -# By default, the SDK uses the same packaging type as the main bundle, -# but on mac it is a .tar.bz2 -SDK_SUFFIX = $(PKG_SUFFIX) -SDK = $(SDK_PATH)$(PKG_BASENAME).sdk$(SDK_SUFFIX) -ifdef UNIVERSAL_BINARY -SDK = $(SDK_PATH)$(PKG_BASENAME)-$(TARGET_CPU).sdk$(SDK_SUFFIX) -endif - -# JavaScript Shell packaging -JSSHELL_BINS = \ - js$(BIN_SUFFIX) \ - $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \ - $(NULL) - -ifdef MOZ_FOLD_LIBS - JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX) -else - JSSHELL_BINS += \ - $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \ - $(DLL_PREFIX)plds4$(DLL_SUFFIX) \ - $(DLL_PREFIX)plc4$(DLL_SUFFIX) \ - $(NULL) -endif # MOZ_FOLD_LIBS - -ifdef MSVC_C_RUNTIME_DLL - JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL) -endif -ifdef MSVC_CXX_RUNTIME_DLL - JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL) -endif - -ifdef WIN_UCRT_REDIST_DIR - JSSHELL_BINS += $(notdir $(wildcard $(DIST)/bin/api-ms-win-*.dll)) - JSSHELL_BINS += ucrtbase.dll -endif - -MAKE_JSSHELL = $(call py_action,zip,-C $(DIST)/bin $(abspath $(PKG_JSSHELL)) $(JSSHELL_BINS)) - -JARLOG_DIR = $(topobjdir)/jarlog/ -JARLOG_FILE_AB_CD = $(JARLOG_DIR)/$(AB_CD).log - -TAR_CREATE_FLAGS := --exclude=.mkdir.done $(TAR_CREATE_FLAGS) -CREATE_FINAL_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ - --mode=go-w --exclude=.mkdir.done -f -UNPACK_TAR = tar -xf- - -ifeq ($(MOZ_PKG_FORMAT),TAR) - PKG_SUFFIX = .tar - INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) > $(PACKAGE) - INNER_UNMAKE_PACKAGE = $(UNPACK_TAR) < $(UNPACKAGE) - MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk > '$(SDK)' -endif - -ifeq ($(MOZ_PKG_FORMAT),TGZ) - PKG_SUFFIX = .tar.gz - INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | gzip -vf9 > $(PACKAGE) - INNER_UNMAKE_PACKAGE = gunzip -c $(UNPACKAGE) | $(UNPACK_TAR) - MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | gzip -vf9 > '$(SDK)' -endif - -ifeq ($(MOZ_PKG_FORMAT),BZ2) - PKG_SUFFIX = .tar.bz2 - ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - -C $(STAGEPATH)$(MOZ_PKG_DIR) $(_APPNAME) | bzip2 -vf > $(PACKAGE) - else - INNER_MAKE_PACKAGE = $(CREATE_FINAL_TAR) - $(MOZ_PKG_DIR) | bzip2 -vf > $(PACKAGE) - endif - INNER_UNMAKE_PACKAGE = bunzip2 -c $(UNPACKAGE) | $(UNPACK_TAR) - MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)' -endif - -ifeq ($(MOZ_PKG_FORMAT),ZIP) - ifdef MOZ_EXTERNAL_SIGNING_FORMAT - # We can't use sha2signcode on zip files - MOZ_EXTERNAL_SIGNING_FORMAT := $(filter-out sha2signcode,$(MOZ_EXTERNAL_SIGNING_FORMAT)) - endif - PKG_SUFFIX = .zip - INNER_MAKE_PACKAGE = $(ZIP) -r9D $(PACKAGE) $(MOZ_PKG_DIR) \ - -x \*/.mkdir.done - INNER_UNMAKE_PACKAGE = $(UNZIP) $(UNPACKAGE) - MAKE_SDK = $(call py_action,zip,'$(SDK)' $(MOZ_APP_NAME)-sdk) -endif - -ifeq ($(MOZ_PKG_FORMAT),SFX7Z) - PKG_SUFFIX = .exe - INNER_MAKE_PACKAGE = rm -f app.7z && \ - mv $(MOZ_PKG_DIR) core && \ - $(CYGWIN_WRAPPER) 7z a -r -t7z app.7z -mx -m0=BCJ2 -m1=LZMA:d25 \ - -m2=LZMA:d19 -m3=LZMA:d19 -mb0:1 -mb0s1:2 -mb0s2:3 && \ - mv core $(MOZ_PKG_DIR) && \ - cat $(SFX_HEADER) app.7z > $(PACKAGE) && \ - chmod 0755 $(PACKAGE) - INNER_UNMAKE_PACKAGE = $(CYGWIN_WRAPPER) 7z x $(UNPACKAGE) core && \ - mv core $(MOZ_PKG_DIR) -endif - -#Create an RPM file -ifeq ($(MOZ_PKG_FORMAT),RPM) - PKG_SUFFIX = .rpm - MOZ_NUMERIC_APP_VERSION = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[^0-9.].*//' ) - MOZ_RPM_RELEASE = $(shell echo $(MOZ_PKG_VERSION) | sed 's/[0-9.]*//' ) - - RPMBUILD_TOPDIR=$(ABS_DIST)/rpmbuild - RPMBUILD_RPMDIR=$(ABS_DIST) - RPMBUILD_SRPMDIR=$(ABS_DIST) - RPMBUILD_SOURCEDIR=$(RPMBUILD_TOPDIR)/SOURCES - RPMBUILD_SPECDIR=$(topsrcdir)/system/installer/linux/rpm - RPMBUILD_BUILDDIR=$(ABS_DIST)/.. - - SPEC_FILE = $(RPMBUILD_SPECDIR)/mozilla.spec - RPM_INCIDENTALS=$(topsrcdir)/system/installer/linux/rpm - - RPM_CMD = \ - echo Creating RPM && \ - $(PYTHON) -m mozbuild.action.preprocessor \ - -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ - -DMOZ_APP_DISPLAYNAME='$(MOZ_APP_DISPLAYNAME)' \ - $(RPM_INCIDENTALS)/mozilla.desktop \ - -o $(RPMBUILD_SOURCEDIR)/$(MOZ_APP_NAME).desktop && \ - rm -rf $(ABS_DIST)/$(TARGET_CPU) && \ - $(RPMBUILD) -bb \ - $(SPEC_FILE) \ - --target $(TARGET_CPU) \ - --buildroot $(RPMBUILD_TOPDIR)/BUILDROOT \ - --define 'moz_app_name $(MOZ_APP_NAME)' \ - --define 'moz_app_displayname $(MOZ_APP_DISPLAYNAME)' \ - --define 'moz_app_version $(MOZ_APP_VERSION)' \ - --define 'moz_numeric_app_version $(MOZ_NUMERIC_APP_VERSION)' \ - --define 'moz_rpm_release $(MOZ_RPM_RELEASE)' \ - --define 'buildid $(BUILDID)' \ - --define 'moz_source_repo $(shell awk '$$2 == "MOZ_SOURCE_REPO" {print $$3}' $(DEPTH)/source-repo.h)' \ - --define 'moz_source_stamp $(shell awk '$$2 == "MOZ_SOURCE_STAMP" {print $$3}' $(DEPTH)/source-repo.h)' \ - --define 'moz_branding_directory $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)' \ - --define '_topdir $(RPMBUILD_TOPDIR)' \ - --define '_rpmdir $(RPMBUILD_RPMDIR)' \ - --define '_sourcedir $(RPMBUILD_SOURCEDIR)' \ - --define '_specdir $(RPMBUILD_SPECDIR)' \ - --define '_srcrpmdir $(RPMBUILD_SRPMDIR)' \ - --define '_builddir $(RPMBUILD_BUILDDIR)' \ - --define '_prefix $(prefix)' \ - --define '_libdir $(libdir)' \ - --define '_bindir $(bindir)' \ - --define '_datadir $(datadir)' \ - --define '_installdir $(installdir)' - - ifdef ENABLE_TESTS - RPM_CMD += \ - --define 'createtests yes' \ - --define '_testsinstalldir $(shell basename $(installdir))' - endif - - ifdef INSTALL_SDK - RPM_CMD += \ - --define 'createdevel yes' \ - --define '_idldir $(idldir)' \ - --define '_sdkdir $(sdkdir)' \ - --define '_includedir $(includedir)' - endif - - #For each of the main, tests, sdk rpms we want to make sure that - #if they exist that they are in objdir/dist/ and that they get - #uploaded and that they are beside the other build artifacts - MAIN_RPM= $(MOZ_APP_NAME)-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) - UPLOAD_EXTRA_FILES += $(MAIN_RPM) - RPM_CMD += && mv $(TARGET_CPU)/$(MAIN_RPM) $(ABS_DIST)/ - - ifdef ENABLE_TESTS - TESTS_RPM=$(MOZ_APP_NAME)-tests-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) - UPLOAD_EXTRA_FILES += $(TESTS_RPM) - RPM_CMD += && mv $(TARGET_CPU)/$(TESTS_RPM) $(ABS_DIST)/ - endif - - ifdef INSTALL_SDK - SDK_RPM=$(MOZ_APP_NAME)-devel-$(MOZ_NUMERIC_APP_VERSION)-$(MOZ_RPM_RELEASE).$(BUILDID).$(TARGET_CPU)$(PKG_SUFFIX) - UPLOAD_EXTRA_FILES += $(SDK_RPM) - RPM_CMD += && mv $(TARGET_CPU)/$(SDK_RPM) $(ABS_DIST)/ - endif - - INNER_MAKE_PACKAGE = $(RPM_CMD) - #Avoiding rpm repacks, going to try creating/uploading xpi in rpm files instead - INNER_UNMAKE_PACKAGE = $(error Try using rpm2cpio and cpio) - -endif #Create an RPM file - - -ifeq ($(MOZ_PKG_FORMAT),APK) -include $(MOZILLA_DIR)/system/installer/upload-files-$(MOZ_PKG_FORMAT).mk -endif - -ifeq ($(MOZ_PKG_FORMAT),DMG) - PKG_SUFFIX = .dmg - - _ABS_MOZSRCDIR = $(shell cd $(MOZILLA_DIR) && pwd) - PKG_DMG_SOURCE = $(STAGEPATH)$(MOZ_PKG_DIR) - INNER_MAKE_PACKAGE = $(call py_action,make_dmg,'$(PKG_DMG_SOURCE)' '$(PACKAGE)') - INNER_UNMAKE_PACKAGE = \ - set -ex; \ - rm -rf $(ABS_DIST)/unpack.tmp; \ - mkdir -p $(ABS_DIST)/unpack.tmp; \ - $(_ABS_MOZSRCDIR)/build/package/mac_osx/unpack-diskimage $(UNPACKAGE) /tmp/$(MOZ_PKG_APPNAME)-unpack $(ABS_DIST)/unpack.tmp; \ - rsync -a '$(ABS_DIST)/unpack.tmp/$(_APPNAME)' $(MOZ_PKG_DIR); \ - test -n '$(MOZ_PKG_MAC_DSSTORE)' && \ - rsync -a '$(ABS_DIST)/unpack.tmp/.DS_Store' '$(MOZ_PKG_MAC_DSSTORE)'; \ - test -n '$(MOZ_PKG_MAC_BACKGROUND)' && \ - rsync -a '$(ABS_DIST)/unpack.tmp/.background/$(notdir $(MOZ_PKG_MAC_BACKGROUND))' '$(MOZ_PKG_MAC_BACKGROUND)'; \ - test -n '$(MOZ_PKG_MAC_ICON)' && \ - rsync -a '$(ABS_DIST)/unpack.tmp/.VolumeIcon.icns' '$(MOZ_PKG_MAC_ICON)'; \ - rm -rf $(ABS_DIST)/unpack.tmp; \ - if test -n '$(MOZ_PKG_MAC_RSRC)' ; then \ - cp $(UNPACKAGE) $(MOZ_PKG_APPNAME).tmp.dmg && \ - hdiutil unflatten $(MOZ_PKG_APPNAME).tmp.dmg && \ - { /Developer/Tools/DeRez -skip plst -skip blkx $(MOZ_PKG_APPNAME).tmp.dmg > '$(MOZ_PKG_MAC_RSRC)' || { rm -f $(MOZ_PKG_APPNAME).tmp.dmg && false; }; } && \ - rm -f $(MOZ_PKG_APPNAME).tmp.dmg; \ - fi - # The plst and blkx resources are skipped because they belong to each - # individual dmg and are created by hdiutil. - SDK_SUFFIX = .tar.bz2 - MAKE_SDK = $(CREATE_FINAL_TAR) - $(MOZ_APP_NAME)-sdk | bzip2 -vf > '$(SDK)' -endif - -ifdef MOZ_INTERNAL_SIGNING_FORMAT - MOZ_SIGN_PREPARED_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_INTERNAL_SIGNING_FORMAT),-f $(f)) $(foreach i,$(SIGN_INCLUDES),-i $(i)) $(foreach x,$(SIGN_EXCLUDES),-x $(x)) - ifeq (WINNT,$(OS_ARCH)) - MOZ_SIGN_PREPARED_PACKAGE_CMD += --nsscmd '$(ABS_DIST)/bin/shlibsign$(BIN_SUFFIX) -v -i' - endif -endif - -# For final GPG / authenticode signing / dmg signing if required -ifdef MOZ_EXTERNAL_SIGNING_FORMAT - MOZ_SIGN_PACKAGE_CMD=$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) -endif - -ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD - ifeq (Darwin, $(OS_ARCH)) - MAKE_PACKAGE = $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS,$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)),true) \ - && (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) \ - && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) '$(MOZ_MACBUNDLE_NAME)' \ - && cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE) - else - MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \ - && $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \ - && (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) \ - && $(INNER_MAKE_PACKAGE) - endif #Darwin - -else - MAKE_PACKAGE = (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE) -endif - -ifdef MOZ_SIGN_PACKAGE_CMD - MAKE_PACKAGE += && $(MOZ_SIGN_PACKAGE_CMD) '$(PACKAGE)' -endif - -ifdef MOZ_SIGN_CMD - MAKE_SDK += && $(MOZ_SIGN_CMD) -f gpg '$(SDK)' -endif - -NO_PKG_FILES += \ - core \ - bsdecho \ - js \ - js-config \ - jscpucfg \ - nsinstall \ - viewer \ - TestGtkEmbed \ - elf-dynstr-gc \ - mangle* \ - maptsv* \ - mfc* \ - msdump* \ - msmap* \ - nm2tsv* \ - nsinstall* \ - res/samples \ - res/throbber \ - shlibsign* \ - certutil* \ - pk12util* \ - BadCertServer* \ - OCSPStaplingServer* \ - GenerateOCSPResponse* \ - chrome/chrome.rdf \ - chrome/app-chrome.manifest \ - chrome/overlayinfo \ - components/compreg.dat \ - components/xpti.dat \ - content_unit_tests \ - necko_unit_tests \ - *.dSYM \ - $(NULL) - -# If a manifest has not been supplied, the following -# files should be excluded from the package too -ifndef MOZ_PKG_MANIFEST - NO_PKG_FILES += ssltunnel* -endif - -DEFINES += -DDLL_PREFIX=$(DLL_PREFIX) -DDLL_SUFFIX=$(DLL_SUFFIX) -DBIN_SUFFIX=$(BIN_SUFFIX) - -ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - DEFINES += -DDIR_MACOS=Contents/MacOS/ -DDIR_RESOURCES=Contents/Resources/ -else - DEFINES += -DDIR_MACOS= -DDIR_RESOURCES= -endif - -ifdef MOZ_FOLD_LIBS - DEFINES += -DMOZ_FOLD_LIBS=1 -endif - -GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) - -# The following target stages files into two directories: one directory for -# core files, and one for optional extensions based on the information in -# the MOZ_PKG_MANIFEST file. - -PKG_ARG = , '$(pkg)' - -# MOZ_PKG_MANIFEST is the canonical way to define the package manifest (which -# the packager will preprocess), but for a smooth transition, we derive it -# from the now deprecated MOZ_PKG_MANIFEST_P when MOZ_PKG_MANIFEST is not -# defined. -ifndef MOZ_PKG_MANIFEST - ifdef MOZ_PKG_MANIFEST_P - MOZ_PKG_MANIFEST := $(MOZ_PKG_MANIFEST_P) - endif # MOZ_PKG_MANIFEST_P -endif # MOZ_PKG_MANIFEST - -ifndef MOZ_PACKAGER_FORMAT - MOZ_PACKAGER_FORMAT = $(error MOZ_PACKAGER_FORMAT is not set) -endif - -# We optimize jars on all supported OS-es -OPTIMIZEJARS = 1 - -# A js binary is needed to perform verification of JavaScript minification. -# We can only use the built binary when not cross-compiling. Environments -# (such as release automation) can provide their own js binary to enable -# verification when cross-compiling. -ifndef JS_BINARY - ifndef CROSS_COMPILE - JS_BINARY = $(wildcard $(DIST)/bin/js) - endif -endif - -ifeq ($(OS_TARGET), WINNT) - INSTALLER_PACKAGE = $(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe -endif - -# These are necessary because some of our packages/installers contain spaces -# in their filenames and GNU Make's $(wildcard) function doesn't properly -# deal with them. -empty := -space = $(empty) $(empty) -QUOTED_WILDCARD = $(if $(wildcard $(subst $(space),?,$(1))),'$(1)') -ESCAPE_SPACE = $(subst $(space),\$(space),$(1)) -ESCAPE_WILDCARD = $(subst $(space),?,$(1)) - -# This variable defines which OpenSSL algorithm to use to -# generate checksums for files that we upload -CHECKSUM_ALGORITHM_PARAM = -d sha512 -d md5 -d sha1 - -# This variable defines where the checksum file will be located -CHECKSUM_FILE = '$(DIST)/$(PKG_PATH)/$(CHECKSUMS_FILE_BASENAME).checksums' -CHECKSUM_FILES = $(CHECKSUM_FILE) - -# Upload MAR tools only if AB_CD is unset or en_US -ifeq (,$(AB_CD:en-US=)) - ifeq (WINNT,$(OS_TARGET)) - UPLOAD_EXTRA_FILES += host/bin/mar.exe - UPLOAD_EXTRA_FILES += host/bin/mbsdiff.exe - else - UPLOAD_EXTRA_FILES += host/bin/mar - UPLOAD_EXTRA_FILES += host/bin/mbsdiff - endif -endif - -UPLOAD_FILES= \ - $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE)) \ - $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(LANGPACK)) \ - $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR))) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(CPP_TEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(XPC_TEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(MOCHITEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(TALOS_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(REFTEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(WP_TEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(GTEST_PACKAGE)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip) \ - $(call QUOTED_WILDCARD,$(DIST)/$(SDK)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(SDK).asc) \ - $(call QUOTED_WILDCARD,$(MOZ_SOURCESTAMP_FILE)) \ - $(call QUOTED_WILDCARD,$(MOZ_BUILDINFO_FILE)) \ - $(call QUOTED_WILDCARD,$(MOZ_TEST_PACKAGES_FILE)) \ - $(call QUOTED_WILDCARD,$(PKG_JSSHELL)) \ - $(call QUOTED_WILDCARD,$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip) \ - $(if $(UPLOAD_EXTRA_FILES), $(foreach f, $(UPLOAD_EXTRA_FILES), $(wildcard $(DIST)/$(f)))) - -ifdef UNIFY_DIST - UNIFY_ARCH := $(notdir $(patsubst %/,%,$(dir $(UNIFY_DIST)))) - UPLOAD_FILES += \ - $(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX)) \ - $(call QUOTED_WILDCARD,$(UNIFY_DIST)/$(SDK_PATH)$(PKG_BASENAME)-$(UNIFY_ARCH).sdk$(SDK_SUFFIX).asc) -endif - -SIGN_CHECKSUM_CMD= -ifdef MOZ_SIGN_CMD - # If we're signing with gpg, we'll have a bunch of extra detached signatures to - # upload. We also want to sign our checksums file - SIGN_CHECKSUM_CMD=$(MOZ_SIGN_CMD) -f gpg $(CHECKSUM_FILE) - - CHECKSUM_FILES += $(CHECKSUM_FILE).asc - UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(COMPLETE_MAR).asc) - UPLOAD_FILES += $(call QUOTED_WILDCARD,$(wildcard $(DIST)/$(PARTIAL_MAR).asc)) - UPLOAD_FILES += $(call QUOTED_WILDCARD,$(INSTALLER_PACKAGE).asc) - UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE).asc) -endif - -ifndef MOZ_PKG_SRCDIR - MOZ_PKG_SRCDIR = $(topsrcdir) -endif - -SRC_TAR_PREFIX = $(MOZ_APP_NAME)-$(MOZ_PKG_VERSION) -SRC_TAR_EXCLUDE_PATHS += \ - --exclude='.hg*' \ - --exclude='CVS' \ - --exclude='.cvs*' \ - --exclude='.mozconfig*' \ - --exclude='*.pyc' \ - --exclude='$(MOZILLA_DIR)/Makefile' \ - --exclude='$(MOZILLA_DIR)/dist' -ifdef MOZ_OBJDIR - SRC_TAR_EXCLUDE_PATHS += --exclude='$(MOZ_OBJDIR)' -endif -CREATE_SOURCE_TAR = $(TAR) -c --owner=0 --group=0 --numeric-owner \ - --mode=go-w $(SRC_TAR_EXCLUDE_PATHS) --transform='s,^\./,$(SRC_TAR_PREFIX)/,' -f - -SOURCE_TAR = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).tar.xz -HG_BUNDLE_FILE = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_BUNDLE_BASENAME).bundle -SOURCE_CHECKSUM_FILE = $(DIST)/$(PKG_SRCPACK_PATH)$(PKG_SRCPACK_BASENAME).checksums -SOURCE_UPLOAD_FILES = $(SOURCE_TAR) - -HG ?= hg -CREATE_HG_BUNDLE_CMD = $(HG) -v -R $(topsrcdir) bundle --base null -ifdef HG_BUNDLE_REVISION - CREATE_HG_BUNDLE_CMD += -r $(HG_BUNDLE_REVISION) -endif -CREATE_HG_BUNDLE_CMD += $(HG_BUNDLE_FILE) -ifdef UPLOAD_HG_BUNDLE - SOURCE_UPLOAD_FILES += $(HG_BUNDLE_FILE) -endif |