|
@@ -2,7 +2,7 @@
|
|
# User William Lachance <wlachance@mozilla.com>
|
|
# User William Lachance <wlachance@mozilla.com>
|
|
# Date 1584544044 0
|
|
# Date 1584544044 0
|
|
# Node ID 255f5213cfd5bac607332aa3c3a0468ddbc8af45
|
|
# Node ID 255f5213cfd5bac607332aa3c3a0468ddbc8af45
|
|
-# Parent 66f45b956cc7c24a64e4c5b96e2b94016d5e070a
|
|
|
|
|
|
+# Parent 09fecff82e878bf9ac58dde557d54bd7ce1c343b
|
|
Bug 1623132 - Rewrite printconfigsetting to use configparser, python 3 r=rstewart
|
|
Bug 1623132 - Rewrite printconfigsetting to use configparser, python 3 r=rstewart
|
|
|
|
|
|
Differential Revision: https://phabricator.services.mozilla.com/D67210
|
|
Differential Revision: https://phabricator.services.mozilla.com/D67210
|
|
@@ -10,7 +10,7 @@ Differential Revision: https://phabricator.services.mozilla.com/D67210
|
|
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
|
diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
|
--- a/browser/locales/Makefile.in
|
|
--- a/browser/locales/Makefile.in
|
|
+++ b/browser/locales/Makefile.in
|
|
+++ b/browser/locales/Makefile.in
|
|
-@@ -98,20 +98,20 @@ installers-%:
|
|
|
|
|
|
+@@ -98,13 +98,13 @@ installers-%:
|
|
@$(MAKE) repackage-zip-$*
|
|
@$(MAKE) repackage-zip-$*
|
|
ifeq (WINNT,$(OS_ARCH))
|
|
ifeq (WINNT,$(OS_ARCH))
|
|
@$(MAKE) package-win32-installer AB_CD=$*
|
|
@$(MAKE) package-win32-installer AB_CD=$*
|
|
@@ -26,13 +26,6 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
|
|
- @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
|
|
- @$(PYTHON) $(topsrcdir)/config/printconfigsetting.py \
|
|
+ @$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
|
|
+ @$(PYTHON3) $(topsrcdir)/config/printconfigsetting.py \
|
|
'$(STAGEDIST)'/application.ini App BuildID
|
|
'$(STAGEDIST)'/application.ini App BuildID
|
|
-
|
|
|
|
- # test target, depends on make package
|
|
|
|
- # try to repack x-test, with just toolkit/defines.inc being there
|
|
|
|
- l10n-check:: INNER_UNMAKE_PACKAGE=true
|
|
|
|
- l10n-check::
|
|
|
|
- $(RM) -rf x-test
|
|
|
|
- $(NSINSTALL) -D x-test/toolkit
|
|
|
|
diff --git a/config/printconfigsetting.py b/config/printconfigsetting.py
|
|
diff --git a/config/printconfigsetting.py b/config/printconfigsetting.py
|
|
--- a/config/printconfigsetting.py
|
|
--- a/config/printconfigsetting.py
|
|
+++ b/config/printconfigsetting.py
|
|
+++ b/config/printconfigsetting.py
|
|
@@ -113,7 +106,7 @@ diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/install
|
|
diff --git a/tools/lint/py2.yml b/tools/lint/py2.yml
|
|
diff --git a/tools/lint/py2.yml b/tools/lint/py2.yml
|
|
--- a/tools/lint/py2.yml
|
|
--- a/tools/lint/py2.yml
|
|
+++ b/tools/lint/py2.yml
|
|
+++ b/tools/lint/py2.yml
|
|
-@@ -30,16 +30,17 @@ py2:
|
|
|
|
|
|
+@@ -29,16 +29,17 @@ py2:
|
|
- testing/web-platform
|
|
- testing/web-platform
|
|
- toolkit
|
|
- toolkit
|
|
- tools/power/mach_commands.py
|
|
- tools/power/mach_commands.py
|