Skip to content

Commit

Permalink
Bug 1744325 - Remove outdated update-packaging cruft. r=bhearsum,fi…
Browse files Browse the repository at this point in the history
…refox-build-system-reviewers,glandium

None of this is used now that `funsize` generates update MARs.  It
might have even been possible to remove this in Bug 1173459, years
ago.

Differential Revision: https://phabricator.services.mozilla.com/D132836
  • Loading branch information
ncalexan committed Dec 10, 2021
1 parent 933ba69 commit dc28c12
Show file tree
Hide file tree
Showing 8 changed files with 0 additions and 206 deletions.
4 changes: 0 additions & 4 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -202,10 +202,6 @@ ifdef MOZ_CRASHREPORTER
$(PYTHON3) -u $(topsrcdir)/toolkit/crashreporter/tools/upload_symbols.py '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).tar.zst'
endif

.PHONY: update-packaging
update-packaging:
$(MAKE) -C tools/update-packaging

.PHONY: package-generated-sources
package-generated-sources:
$(call py_action,package_generated_sources,'$(DIST)/$(PKG_PATH)$(GENERATED_SOURCE_FILE_PACKAGE)')
Expand Down
6 changes: 0 additions & 6 deletions browser/locales/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,6 @@ MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
endif

ifeq ($(CPU_ARCH), aarch64)
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.ARM64.sfx
else
MOZ_SFX_PACKAGE=$(topsrcdir)/other-licenses/7zstub/firefox/7zSD.Win32.sfx
endif

# Required for l10n.mk - defines a list of app sub dirs that should
# be included in langpack xpis.
DIST_SUBDIRS = $(DIST_SUBDIR)
Expand Down
27 changes: 0 additions & 27 deletions python/mozbuild/mozbuild/action/exe_7z_extract.py

This file was deleted.

4 changes: 0 additions & 4 deletions toolkit/locales/l10n.mk
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ endif
$(NSINSTALL) -D $(DIST)/l10n-stage/$(PKG_PATH)
(cd $(DIST)/l10n-stage; \
$(MAKE_PACKAGE))
ifdef MOZ_MAKE_COMPLETE_MAR
$(MAKE) -C $(MOZDEPTH)/tools/update-packaging full-update AB_CD=$(AB_CD) \
PACKAGE_BASE_DIR='$(ABS_DIST)/l10n-stage'
endif
# packaging done, undo l10n stuff
ifneq (en,$(LPROJ_ROOT))
ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
Expand Down
6 changes: 0 additions & 6 deletions toolkit/mozapps/installer/upload-files.mk
Original file line number Diff line number Diff line change
Expand Up @@ -138,12 +138,6 @@ ifeq ($(MOZ_PKG_FORMAT),ZIP)
INNER_UNMAKE_PACKAGE = $(call py_action,make_unzip,$(UNPACKAGE))
endif

ifeq ($(MOZ_PKG_FORMAT),SFX7Z)
PKG_SUFFIX = .exe
INNER_MAKE_PACKAGE = $(call py_action,exe_7z_archive,'$(MOZ_PKG_DIR)' '$(MOZ_INSTALLER_PATH)/app.tag' '$(MOZ_SFX_PACKAGE)' '$(PACKAGE)')
INNER_UNMAKE_PACKAGE = $(call py_action,exe_7z_extract,$(UNPACKAGE) $(MOZ_PKG_DIR))
endif

#Create an RPM file
ifeq ($(MOZ_PKG_FORMAT),RPM)
PKG_SUFFIX = .rpm
Expand Down
4 changes: 0 additions & 4 deletions toolkit/toolkit.mozbuild
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,6 @@ PYTHON_UNITTEST_MANIFESTS += [
'/testing/talos/talos/unittests/python.ini'
]

CONFIGURE_SUBST_FILES += [
'/tools/update-packaging/Makefile',
]

DIRS += [
'/tools',
'/xpcom/xpidl',
Expand Down
60 changes: 0 additions & 60 deletions tools/update-packaging/Makefile.in

This file was deleted.

95 changes: 0 additions & 95 deletions tools/update-packaging/unwrap_full_update.pl

This file was deleted.

0 comments on commit dc28c12

Please sign in to comment.