summaryrefslogtreecommitdiff
path: root/docbook/wsdg_src
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2014-09-02 12:18:20 -0700
committerGerald Combs <gerald@wireshark.org>2014-09-02 23:55:54 +0000
commit85eec7f603f63f1df357691bb558ad47fcc4a224 (patch)
tree37b82c3851217b5f36ad40a98fdb47a23e06cf7d /docbook/wsdg_src
parent9555c24740540aff840605595919fa2f5e2a2c23 (diff)
downloadwireshark-85eec7f603f63f1df357691bb558ad47fcc4a224.tar.gz
Fix PortableApps packaging.
Our Windows portable packaging environment has a lot of cruft which is no longer relevant. We removed support for U3 packages and the method we use to generate PortableApps packages has been deprecated for a while. Create PortableApps packages using current file formats (AppInfo v3.0) and tools. Generate the PA launcher using the PortableApps.com Launcher generator. Copy files and directories from the top level instead of using a manifest derived from the NSIS installer. The manifest is a good idea, but we should create a central manifest and use that to generate the NSIS and PortableApps packages instead of trying to parse wireshark.nsi. The new package still needs a bit of work but it installs and runs in the current version of the PA Platform. Remove the define for MAKENSIS_UNICODE. It doesn't look like we were using it. Start tearing down makefiles and scripts that we no longer use. Ping-Bug: 4191 Change-Id: Ib7173eec887d0abf69bb176a1e3f943a5a63bee4 Reviewed-on: https://code.wireshark.org/review/3962 Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'docbook/wsdg_src')
-rw-r--r--docbook/wsdg_src/WSDG_chapter_sources.asciidoc34
-rw-r--r--docbook/wsdg_src/WSDG_chapter_tools.asciidoc28
2 files changed, 59 insertions, 3 deletions
diff --git a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
index 17d525a8fb..cd6802d48b 100644
--- a/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_sources.asciidoc
@@ -1131,7 +1131,7 @@ You will probably have to modify the MAKENSIS setting in the
'config.nmake' file to specify where the NSIS binaries
are installed.
-In the wireshark directory, type:
+In the top-level source directory type:
----
> nmake -f makefile.nmake packaging
@@ -1139,8 +1139,8 @@ In the wireshark directory, type:
to build the installer.
-.This might take a while
[TIP]
+.This might take a while
====
Please be patient while the package is compressed.
It might take some time, even on fast machines.
@@ -1150,6 +1150,36 @@ If everything went well, you will now find something like:
'wireshark-setup-wireshark-version:[].exe' in
the 'packaging/nsis' directory.
+[[ChSrcPortableApps]]
+
+==== Win32: PortableApps .paf.exe package
+
+_PortableApps.com_ is an environment that lets users run popular applications
+from portable media such as flash drives and cloud drive services.
+
+You will probably have to modify the MAKENSIS setting in the
+'config.nmake' file to specify where the NSIS binaries
+are installed.
+
+In the top-level source directory type:
+
+----
+> nmake -f makefile.nmake packaging_papps
+----
+
+to build the installer.
+
+[TIP]
+.This might take a while
+====
+Please be patient while the package is compressed.
+It might take some time, even on fast machines.
+====
+
+If everything went well, you will now find something like:
+'WiresharkPortable-wireshark-major-minor-version:[].paf.exe' in
+the 'packaging/portableapps/win32' directory.
+
++++++++++++++++++++++++++++++++++++++
<!-- End of WSDG Chapter Sources -->
++++++++++++++++++++++++++++++++++++++
diff --git a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
index 6d533ed47e..e45276e2cb 100644
--- a/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
+++ b/docbook/wsdg_src/WSDG_chapter_tools.asciidoc
@@ -1347,7 +1347,33 @@ To install it, simply download the latest released version (currently 2.46)
from http://nsis.sourceforge.net[] and start the downloaded installer. You will
need NSIS version 2. Version 3 is not yet supported.
-You will find more instructions in <<ChSrcNSIS>>on how to use the NSIS tool.
+You can find more instructions on using NSIS in <<ChSrcNSIS>>.
+
+=== Windows: PortableApps (optional)
+
+The PortableApps.com Installer is used to generate
+'WiresharkPortable-wireshark-major-minor-version:[].paf.exe' from all the files
+needed to be installed, including all required DLLs, plugins, and supporting
+files.
+
+To install it, do the following:
+
+* Download the latest PortableApps.com Platform release from
+ http://portableapps.com/[]. `config.nmake` uses the ``Local
+ All Users'' install location (`C:\`) by default.
+
+* Install the following applications in the PortableApps.com environment:
+
+** PortableApps.com Installer
+
+** PortableApps.com Launcher
+
+** NSIS Portable (Unicode)
+
+** PortableApps.com AppCompactor
+
+You can find more instructions on using the PortableApps.com Installer in
+<<ChSrcPortableApps>>.
++++++++++++++++++++++++++++++++++++++
<!-- End of WSDG Chapter Tools -->