Bug 1635849 - Switch SeaMoneky build files to Python 3. r=frg
authorBill Gianopoulos <wgianopoulos@gmail.com>
Sun, 03 May 2020 08:41:59 -0400
changeset 39071 f0799dbf510175a46545e62bff136187f04cd9ab
parent 39070 10edd0b971021b4d16a78e4fdbb299357e2a36b4
child 39072 4c84f6a17aafbc69ce4d4d1f4c9f65f6de65994a
push id402
push userclokep@gmail.com
push dateMon, 29 Jun 2020 20:48:04 +0000
reviewersfrg
bugs1635849, 1633037, 1599658
Bug 1635849 - Switch SeaMoneky build files to Python 3. r=frg Port Bug 1633037 "Remove all remaining references to $(PYTHON) across Makefiles". Port Bug 1599658 "makefiles: use py3_action instead of py_action"
suite/app/Makefile.in
suite/config/mozconfigs/linux32/debug
suite/config/mozconfigs/linux32/nightly
suite/config/mozconfigs/linux32/release
suite/config/mozconfigs/linux64/debug
suite/config/mozconfigs/linux64/nightly
suite/config/mozconfigs/linux64/release
suite/installer/Makefile.in
suite/installer/windows/Makefile.in
suite/locales/Makefile.in
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -35,17 +35,17 @@ ifeq ($(OS_ARCH),WINNT)
 EXTRA_DEPS += $(srcdir)/seamonkey.exe.manifest
 endif
 
 include $(topsrcdir)/config/rules.mk
 
 # channel-prefs.js is handled separate from other prefs due to bug 756325.
 libs:: $(srcdir)/profile/channel-prefs.js
 	$(NSINSTALL) -D $(DIST)/bin/defaults/pref
-	$(call py3_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
+	$(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
 
 libs:: $(LICENSE_TXT_FILE)
 ifeq ($(OS_ARCH),WINNT)
 	$(EXIT_ON_ERROR) \
 	$(PERL) -pe 's/(?<!\r)\n/\r\n/g;' < $^ > $(DIST)/bin/license.txt
 
 else
 	$(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/
--- a/suite/config/mozconfigs/linux32/debug
+++ b/suite/config/mozconfigs/linux32/debug
@@ -4,17 +4,17 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 . $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=comm/suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 #Use ccache
--- a/suite/config/mozconfigs/linux32/nightly
+++ b/suite/config/mozconfigs/linux32/nightly
@@ -8,17 +8,17 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 ac_add_options --enable-application=comm/suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
 # Bug 1441155 - Disable the generation of Rust debug symbols on Linux32
 ac_add_options --disable-debug-symbols
 
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 #Use ccache
--- a/suite/config/mozconfigs/linux32/release
+++ b/suite/config/mozconfigs/linux32/release
@@ -8,17 +8,17 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 ac_add_options --enable-application=comm/suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
 # Bug 1441155 - Disable the generation of Rust debug symbols on Linux32
 ac_add_options --disable-debug-symbols
 
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 #Use ccache
--- a/suite/config/mozconfigs/linux64/debug
+++ b/suite/config/mozconfigs/linux64/debug
@@ -4,17 +4,17 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 . $TOOLTOOL_DIR/build/mozconfig.stylo
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=comm/suite
 ac_add_options --enable-debug
 ac_add_options --enable-calendar
 
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 #Use ccache
--- a/suite/config/mozconfigs/linux64/nightly
+++ b/suite/config/mozconfigs/linux64/nightly
@@ -5,17 +5,17 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=comm/suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-profiling
 ac_add_options --enable-calendar
 
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 #Use ccache
--- a/suite/config/mozconfigs/linux64/release
+++ b/suite/config/mozconfigs/linux64/release
@@ -5,17 +5,17 @@ TOOLTOOL_DIR=${TOOLTOOL_DIR:-$topsrcdir}
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/mozconfig.linux.common
 . $TOOLTOOL_DIR/comm/suite/config/mozconfigs/common
 
 ac_add_options --enable-application=comm/suite
 ac_add_options --enable-update-channel=${MOZ_UPDATE_CHANNEL}
 ac_add_options --enable-official-branding
 ac_add_options --enable-calendar
 
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON3) @MOZ_OBJDIR@/_profile/pgo/profileserver.py'
 
 # Needed to enable breakpad in application.ini
 export MOZILLA_OFFICIAL=1
 
 # Package js shell
 export MOZ_PACKAGE_JSSHELL=1
 
 #Use ccache
--- a/suite/installer/Makefile.in
+++ b/suite/installer/Makefile.in
@@ -196,17 +196,17 @@ endif
 ifeq (Darwin, $(OS_ARCH))
 FINDPATH = $(_APPNAME)/Contents/MacOS
 else
 FINDPATH=bin
 endif
 
 package-compare:: $(MOZ_PKG_MANIFEST)
 	cd $(DIST); find $(PKGCOMP_FIND_OPTS) '$(FINDPATH)' -type f | sort > bin-list.txt
-	$(call py3_action,preprocessor,$(DEFINES) $(ACDEFINES) $(MOZ_PKG_MANIFEST)) | grep '^$(BINPATH)' | sed -e 's/^\///' | sort > $(DIST)/pack-list.txt
+	$(call py_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
 
 # The comm-* source stamp is already there.
 PLATFORM_SOURCE_STAMP = $(firstword $(shell hg -R "$(topsrcdir)" parent --template="{node|short}\n" 2>/dev/null))
 PLATFORM_SOURCE_REPO = $(shell hg -R "$(topsrcdir)" showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/https:/")
 make-sourcestamp-file::
 	@echo "$(PLATFORM_SOURCE_REPO)/rev/$(PLATFORM_SOURCE_STAMP)" >> $(MOZ_SOURCESTAMP_FILE)
--- a/suite/installer/windows/Makefile.in
+++ b/suite/installer/windows/Makefile.in
@@ -36,20 +36,20 @@ else
 PPL_LOCALE_ARGS=$(call EXPAND_COMM_LOCALE_SRCDIR,suite/locales)/installer/windows
 endif
 
 $(CONFIG_DIR)/setup.exe::
 	$(RM) -r $(CONFIG_DIR)
 	$(MKDIR) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(srcdir)/,$(INSTALLER_FILES)) $(CONFIG_DIR)
 	$(INSTALL) $(addprefix $(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/,$(BRANDING_FILES)) $(CONFIG_DIR)
-	$(PYTHON) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
+	$(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --convert-utf8-utf16le $(topsrcdir)/comm/suite/installer/license.txt $(CONFIG_DIR)/license.txt
-	$(call py3_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
+	$(call py_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 \
+	$(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
 	  --preprocess-locale $(topsrcdir) \
 	  $(PPL_LOCALE_ARGS) $(AB_CD) $(CONFIG_DIR)
 
 GARBARGE_DIRS += instgen
 
 include $(topsrcdir)/config/rules.mk
 include $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/makensis.mk
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -92,33 +92,33 @@ BOOKMARKS_INC_FILE = $(call MERGE_FILE,p
 BOOKMARKS_XTRA_FILE = $(call MERGE_FILE,profile/bookmarks.extra)
 
 # the #include in the .in file requires all to be in the same dir, sadly.
 $(FINAL_TARGET)/defaults/profile/bookmarks.html: $(BOOKMARKS_INC_FILE) $(BOOKMARKS_XTRA_FILE) $(srcdir)/generic/profile/bookmarks.html.in
 	$(SYSINSTALL) -D $(dir $@)
 	$(RM) -rf profile/*bookmarks*
 	$(NSINSTALL) -D profile
 	cp $^ profile/
-	$(call py3_action,preprocessor, \
+	$(call py_action,preprocessor, \
 	  -DAB_CD=$(NO_JA_JP_MAC_AB_CD) \
 	  profile/bookmarks.html.in \
 	  -o $@)
 
 PANELS_XTRA_FILE = $(call MERGE_FILE,profile/panels.extra)
 
 # the #include in the .in file requires all to be in the same dir, sadly.
 $(FINAL_TARGET)/defaults/profile/panels.rdf: $(PANELS_XTRA_FILE) $(srcdir)/generic/profile/panels.rdf.in
 	$(SYSINSTALL) -D $(dir $@)
 	$(RM) -rf profile/panels*
 	$(NSINSTALL) -D profile
 	cp $^ profile/
 	sed \
 	  -n 's/.*<RDF:Description about="\(.*\)">.*/        <RDF:li resource="\1"\/>/p' \
 	  profile/panels.extra > profile/panels-urn.inc
-	$(call py3_action,preprocessor, \
+	$(call py_action,preprocessor, \
 	  profile/panels.rdf.in -o $@)
 
 libs:: $(FINAL_TARGET)/defaults/profile/bookmarks.html ;
 libs:: $(FINAL_TARGET)/defaults/profile/panels.rdf ;
 
 libs:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
 	$(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/defaults/profile/chrome
 
@@ -195,20 +195,20 @@ else
 	  sed -e 's/^InfoText=/Info=/' -e 's/^TitleText=/Title=/' | \
 	  sed -e 's/%MOZ_APP_DISPLAYNAME%/$(MOZ_APP_DISPLAYNAME)/' > \
 	  $(FINAL_TARGET)/updater.ini
 endif
 endif
 
 ident:
 	@printf 'comm_revision '
-	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
+	@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
 	    '$(STAGEDIST)/application.ini' App SourceStamp
 	@printf 'moz_revision '
-	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
+	@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
 	    '$(STAGEDIST)/platform.ini' Build SourceStamp
 	@printf 'buildid '
-	@$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
+	@$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
 	    '$(STAGEDIST)/application.ini' App BuildID
 
 ifdef MOZ_IRC
 MOZ_PKG_EXTRAL10N += extensions/langpack-$(AB_CD)@chatzilla.mozilla.org=$(DIST)/xpi-stage/chatzilla-$(AB_CD)
 endif