summaryrefslogtreecommitdiffstats
path: root/browser/installer
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
commitd8bbc7858622b6d9c278469aab701ca0b609cddf (patch)
treeeff41dc61d9f714852212739e6b3738b82a2af87 /browser/installer
parentReleasing progress-linux version 125.0.3-1~progress7.99u1. (diff)
downloadfirefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz
firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'browser/installer')
-rw-r--r--browser/installer/package-manifest.in18
-rw-r--r--browser/installer/removed-files.in12
-rw-r--r--browser/installer/windows/docs/FullInstaller.rst2
-rw-r--r--browser/installer/windows/docs/NSISPlugins.rst101
-rw-r--r--browser/installer/windows/docs/newProjectDllVS.pngbin0 -> 27399 bytes
-rw-r--r--browser/installer/windows/docs/projectPropertyPageVS.pngbin0 -> 258168 bytes
-rw-r--r--browser/installer/windows/docs/projectSettingsDllVS.pngbin0 -> 144260 bytes
7 files changed, 124 insertions, 9 deletions
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
index 1b87a9ab4a..725a63981c 100644
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -38,6 +38,7 @@
#ifdef MOZ_UPDATER
@APPNAME@/Contents/Library/LaunchServices
#endif
+@APPNAME@/Contents/Frameworks
@APPNAME@/Contents/PkgInfo
@RESPATH@/firefox.icns
@RESPATH@/document.icns
@@ -141,8 +142,11 @@
#endif
@RESPATH@/application.ini
#ifdef MOZ_UPDATER
+# update-settings.ini has been removed on macOS.
+#ifndef XP_MACOSX
@RESPATH@/update-settings.ini
#endif
+#endif
@RESPATH@/platform.ini
#ifndef MOZ_FOLD_LIBS
@BINPATH@/@DLL_PREFIX@mozsqlite3@DLL_SUFFIX@
@@ -245,15 +249,15 @@
@RESPATH@/defaults/autoconfig/prefcalls.js
@RESPATH@/browser/defaults/permissions
; Remote Settings JSON dumps
-@RESPATH@/browser/defaults/settings/last_modified.json
-@RESPATH@/browser/defaults/settings/blocklists
-@RESPATH@/browser/defaults/settings/main
-@RESPATH@/browser/defaults/settings/security-state
+@RESPATH@/browser/defaults/settings
+# channel-prefs.js has been removed on macOS.
+#ifndef XP_MACOSX
; Warning: changing the path to channel-prefs.js can cause bugs (Bug 756325)
; Technically this is an app pref file, but we are keeping it in the original
; gre location for now.
@RESPATH@/defaults/pref/channel-prefs.js
+#endif
; Background tasks-specific preferences.
; These are in the GRE location since they apply to all tasks at this time.
@@ -381,14 +385,10 @@ bin/libfreebl_64int_3.so
@BINPATH@/crashreporter.app/
#else
@BINPATH@/crashreporter@BIN_SUFFIX@
-@RESPATH@/crashreporter.ini
-#ifdef XP_UNIX
-@RESPATH@/Throbber-small.gif
-#elif defined(XP_WIN)
+#if defined(XP_WIN)
@BINPATH@/@DLL_PREFIX@mozwer@DLL_SUFFIX@
#endif
#endif
-@RESPATH@/browser/crashreporter-override.ini
#ifdef MOZ_CRASHREPORTER_INJECTOR
@BINPATH@/breakpadinjector.dll
#endif
diff --git a/browser/installer/removed-files.in b/browser/installer/removed-files.in
index 425978a5eb..ec9b6b075a 100644
--- a/browser/installer/removed-files.in
+++ b/browser/installer/removed-files.in
@@ -72,3 +72,15 @@
@DIR_RESOURCES@chrome.manifest
#endif
#endif
+
+# channel-prefs.js has been removed on macOS.
+#ifdef XP_MACOSX
+@DIR_RESOURCES@defaults/pref/channel-prefs.js
+@DIR_RESOURCES@defaults/pref/
+@DIR_RESOURCES@defaults/
+#endif
+
+# update-settings.ini has been removed on macOS.
+#ifdef XP_MACOSX
+@DIR_RESOURCES@update-settings.ini
+#endif
diff --git a/browser/installer/windows/docs/FullInstaller.rst b/browser/installer/windows/docs/FullInstaller.rst
index fcfa60371e..74e6ad047c 100644
--- a/browser/installer/windows/docs/FullInstaller.rst
+++ b/browser/installer/windows/docs/FullInstaller.rst
@@ -10,5 +10,7 @@ If it was not launched by the :doc:`StubInstaller`, an :ref:`Install Ping` is se
The installer writes ``installation_telemetry.json`` to the install location, this is read by Firefox in order to send a telemetry event, see the event definition in `Events.yaml <https://searchfox.org/mozilla-central/source/toolkit/components/telemetry/Events.yaml>`_ (category ``installation``, event name ``first_seen``) for a description of the properties. There is also an ``install_timestamp`` property, which is saved in the profile to determine whether there has been a new installation; this is not sent as part of the ping.
+The full installer can also access NSIS plugins written in C++, see :doc:`building NSIS plugins <NSISPlugins>` for more information.
+
.. toctree::
FullConfig
diff --git a/browser/installer/windows/docs/NSISPlugins.rst b/browser/installer/windows/docs/NSISPlugins.rst
new file mode 100644
index 0000000000..77b766999f
--- /dev/null
+++ b/browser/installer/windows/docs/NSISPlugins.rst
@@ -0,0 +1,101 @@
+=====================
+Building NSIS Plugins
+=====================
+
+.. note::
+
+ This guide assumes that you have a Firefox build environment set up as well as a recent version of Visual Studio. The steps here use Visual Studio 2022.
+
+Instructions
+------------
+
+1. Make sure you are configured to build DLLs. Follow this `guide <https://learn.microsoft.com/en-us/cpp/build/walkthrough-creating-and-using-a-dynamic-link-library-cpp>`_.
+2. NSIS plugins are not integrated with the build system pending `bug 1771192 <https://bugzilla.mozilla.org/show_bug.cgi?id=1771192>`_. You will need to build them manually by creating a new Visual Studio project in the ``$SRCDIR/other-licenses/nsis/Contrib/`` directory with the following settings.
+
+.. image:: newProjectDllVS.png
+.. image:: projectSettingsDllVS.png
+
+3. Once the project has been created, right click on it in the sidebar and go to ``Configuration Properties -> C/C++ -> Precompiled Header`` and set ``Precompiled Header`` to "Not Using Precompiled Headers".
+
+.. image:: projectPropertyPageVS.png
+
+4. For easier testing set the output directory in ``Configuration Properties -> General`` to ``$SRCDIR/other-licenses/nsis/Plugins``.
+
+5. Delete any files generated when you created the Visual Studio project such as ``pch.h`` or ``framework.h`` and any related include statements.
+
+6. Download the source code for `NSIS version 3.07 <https://sourceforge.net/projects/nsis/files/NSIS%203/3.07/>`_. (current at the time of writing although possibly subject to change) and extract the source files. Navigate to ``Contrib/ExDLL`` and copy ``pluginapi.h``, ``pluginapi.c`` and ``nsis_tchar.h`` to where header files for your Visual Studio project live. Add them to your project.
+
+7. You can use the following template to get started with your own plugin:
+
+.. code:: cpp
+
+ /* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, you can obtain one at http://mozilla.org/MPL/2.0/. */
+
+ // Put a brief description of your NSIS plugin here.
+
+ // Put your include statements here.
+ #include <sysheader>
+ #include "pluginapi.h" // This is taken from the NSIS plugin page
+ #include "myheader.h"
+
+ // A struct used for reading the stack passed in to the function
+ struct stack_t {
+ stack_t* next;
+ TCHAR text[MAX_PATH];
+ };
+
+ /**
+ *
+ *
+ * Put any additional functions you write here.
+ *
+ *
+ */
+
+ // I use popstringn and pushstringn from the NSIS pluginapi.h file.
+
+ // This is the function I want to call from within NSIS
+ extern "C" void __declspec(dllexport)
+ MyNSISFunction(HWND, int string_size, TCHAR* variables, stack_t** stacktop, void*) {
+ wchar_t getArg[MAX_PATH+1];
+ EXDLL_INIT();
+ bool rv = false;
+ int popRet = popstringn(getArg, MAX_PATH+1);
+ if (popRet == 0) {
+ rv = FunctionThatTakesAnArgument(getArg);
+ }
+ pushstring(rv ? L"1" : L"0");
+ }
+
+ BOOL APIENTRY
+ DllMain(HMODULE, DWORD, LPVOID) {
+ return TRUE;
+ }
+
+8. Modify ``$SRCDIR/toolkit/mozapps/installer/windows/nsis/makensis.mk`` as follows:
+
+.. code:: text
+
+ CUSTOM_NSIS_PLUGINS = \
+ ... \
+ MyPlugin.dll \
+ ... \
+ $(NULL)
+
+
+9. **NSIS only works with 32-bit plugins so ensure your Visual Studio build configuration is set to x86.** Compile your new plugin. ``exp`` and ``lib`` files will also be generated but they can safely be deleted.
+
+10. The plugin can now be called from within NSIS as follows:
+
+.. code:: text
+
+ MyPlugin::MyNSISFunc "$myNSISarg"
+
+.. note::
+
+ - You may need to run ``./mach clobber`` for your DLL to be recognized.
+ - You can compile your plugin in debug mode and step through it with a debugger by attaching to the installer/uninstall process.
+ - If libraries are needed, files in the ``$SRCDIR/mfbt/`` and ``$SRCDIR/toolkit/`` directories are usually okay although there may be exceptions.
+ - The best way to access headers is usually to simply copy them into the project given how disconnected this is from the rest of the build system.
diff --git a/browser/installer/windows/docs/newProjectDllVS.png b/browser/installer/windows/docs/newProjectDllVS.png
new file mode 100644
index 0000000000..fe82d3e03a
--- /dev/null
+++ b/browser/installer/windows/docs/newProjectDllVS.png
Binary files differ
diff --git a/browser/installer/windows/docs/projectPropertyPageVS.png b/browser/installer/windows/docs/projectPropertyPageVS.png
new file mode 100644
index 0000000000..3d1ecb6083
--- /dev/null
+++ b/browser/installer/windows/docs/projectPropertyPageVS.png
Binary files differ
diff --git a/browser/installer/windows/docs/projectSettingsDllVS.png b/browser/installer/windows/docs/projectSettingsDllVS.png
new file mode 100644
index 0000000000..59329df681
--- /dev/null
+++ b/browser/installer/windows/docs/projectSettingsDllVS.png
Binary files differ