Commit a1ea58eb authored by Mike Shal's avatar Mike Shal
Browse files

Bug 1620744 - Use py3_action for cases that already support it;... 

Bug 1620744 - Use py3_action for cases that already support it; r=firefox-build-system-reviewers,rstewart

Differential Revision: https://phabricator.services.mozilla.com/D65846

--HG--
extra : moz-landing-system : lando
parent c1b7df3e

Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -196,14 +196,14 @@ endif 
.PHONY: symbolsfullarchive

symbolsfullarchive: prepsymbolsarchive

	$(RM) '$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip'

	$(call py_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' \

	$(call py3_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_FULL_ARCHIVE_BASENAME).zip' \

                                     $(abspath $(DIST)/crashreporter-symbols) \

                                     --full-archive)



.PHONY: symbolsarchive

symbolsarchive: prepsymbolsarchive

	$(RM) '$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip'

	$(call py_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' \

	$(call py3_action,symbols_archive,'$(DIST)/$(PKG_PATH)$(SYMBOL_ARCHIVE_BASENAME).zip' \

                                     $(abspath $(DIST)/crashreporter-symbols))



ifdef MOZ_CRASHREPORTER

browser/app/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ endif 
# steps. See bug 1431342.

libs:: $(srcdir)/profile/channel-prefs.js

	$(NSINSTALL) -D $(DIST)/bin/defaults/pref

	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)

	$(call py3_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)



ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))

browser/installer/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ endif 


package-compare::

	cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt

	$(call py_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt

	$(call py3_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt

	-diff -u $(DIST)/pack-list.txt $(DIST)/bin-list.txt

	rm -f $(DIST)/pack-list.txt $(DIST)/bin-list.txt

browser/installer/windows/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ $(CONFIG_DIR)/setup.exe:: 
	$(MKDIR) $(CONFIG_DIR)

	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)

	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)

	$(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \

	$(call py3_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \

	  $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)

	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \

	  --preprocess-locale $(topsrcdir) \

config/rules.mk

+2 −2
Original line number Diff line number Diff line
@@ -979,7 +979,7 @@ ifndef MOZ_DEBUG 
endif

endif

	@echo 'Packaging $(XPI_PKGNAME).xpi...'

	$(call py_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')

	$(call py3_action,zip,-C $(FINAL_TARGET) ../$(XPI_PKGNAME).xpi '*')

endif



# See comment above about moving this out of the tools tier.
@@ -1159,7 +1159,7 @@ PP_TARGETS_ALL_RESULTS := $(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS 
$(PP_TARGETS_ALL_RESULTS):

	$(if $(filter-out $(notdir $@),$(notdir $(<:.in=))),$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS))

	$(RM) '$@'

	$(call py_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) '$<' -o '$@')

	$(call py3_action,preprocessor,--depend $(MDDEPDIR)/$(@F).pp $(PP_TARGET_FLAGS) $(DEFINES) $(ACDEFINES) '$<' -o '$@')



$(filter %.css,$(PP_TARGETS_ALL_RESULTS)): PP_TARGET_FLAGS+=--marker %