|
|
@@ -0,0 +1,50 @@
|
|
|
+# HG changeset patch
|
|
|
+# User Bill Gianopoulos <wgianopoulos@gmail.com>
|
|
|
+# Date 1697193985 0
|
|
|
+Bug 9999999 - Port bug 1850647 to suite.
|
|
|
+Bug 1850647 Add optional filename argument to preprocessor.
|
|
|
+
|
|
|
+diff --git a/suite/app/Makefile.in b/suite/app/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 py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js)
|
|
|
++ $(call py_action,preprocessor channel-prefs.js,-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/
|
|
|
+diff --git a/suite/installer/windows/Makefile.in b/suite/installer/windows/Makefile.in
|
|
|
+--- a/suite/installer/windows/Makefile.in
|
|
|
++++ b/suite/installer/windows/Makefile.in
|
|
|
+@@ -37,17 +37,17 @@ 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)
|
|
|
+ $(PYTHON3) $(topsrcdir)/toolkit/mozapps/installer/windows/nsis/preprocess-locale.py \
|
|
|
+ --convert-utf8-utf16le $(topsrcdir)/comm/suite/installer/license.txt $(CONFIG_DIR)/license.txt
|
|
|
+- $(call py_action,preprocessor,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
|
|
++ $(call py_action,preprocessor defines.nsi,-Fsubstitution $(DEFINES) $(ACDEFINES) \
|
|
|
+ $(srcdir)/nsis/defines.nsi.in -o $(CONFIG_DIR)/defines.nsi)
|
|
|
+ $(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
|
Bill Gianopoulos