path: root/packaging/portableapps
AgeCommit message (Collapse)AuthorFilesLines
2016-09-09PortableApps: Allow multiple instances.Gerald Combs1-0/+3
The documentation for the [Launch]SingleAppInstance key doesn't seem to match its behavior in that its default value (true) keeps multiple portable instances from running, at least for us. Set it to false since we're happy with users running as many concurrent instances as they can stand. Set the related SinglePortableAppInstance key to false while we're here in case its default value ever changes. Change-Id: Iea1a6a80d5b204814b7569776734e0b0e254d657 Reviewed-on: https://code.wireshark.org/review/17616 Petri-Dish: Gerald Combs <gerald@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2016-06-15Remove Nmake build systemPascal Quantin1-133/+0
Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Jörg Mayer <jmayer@loplof.de> Reviewed-by: Balint Reczey <balint@balintreczey.hu>
2016-03-11Remove the last remnants of U3 support.Gerald Combs1-3/+1
Change-Id: Ide4c177e67a77c5f9495b3b4c0f817f40e6dde30 Reviewed-on: https://code.wireshark.org/review/14425 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-12-04CMake+PortableApps: Include the VC runtime (second try).Gerald Combs1-3/+16
Move the code that finds the Visual C++ redistributable DLLs to its own module. Run it before we create our NSIS and PortableApps targets. Add a PortableApps target that copies the redistributable This reverts commit 403fa9fbe0cdba3f443ec4674cda40092525ffe4. Bug: 11800 Change-Id: I081d8fd3f5f37dd590659ca8f2bd309642a9a9df Reviewed-on: https://code.wireshark.org/review/12431 Reviewed-by: Gerald Combs <gerald@wireshark.org> (cherry picked from commit 5b580834aeeee8477039bc099c49c21aeeb3b71f) Reviewed-on: https://code.wireshark.org/review/12432 Petri-Dish: Gerald Combs <gerald@wireshark.org> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
2015-06-29Try to fix NSIS packaging dependencies.Gerald Combs1-2/+2
Split the nsis_package target into nsis_package_prep which has dependencies and nsis_package which has no dependencies and as a result blindly builds the package. Remove the nsis_uninstaller target since that's now handled by nsis_package_prep. Nsis_package_prep *should* also take care of the dependencies for portableapps_package, but that hasn't been tested. Update the Developer's Guide. This requires coordination with the Windows buildbots. Change-Id: Ib9e3141832c782355135a1637fba5a07c2ca4ba1 Reviewed-on: https://code.wireshark.org/review/9217 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-06-25Fix Windows CMake PortableApps dependenciesGraham Bloice1-0/+1
The nsis_uninstall target appears to create a temporary file uninstaller_installer.exe that is renamed to uninstall.exe The above rename upsets the portableapps_app_dir target that is copying files from the CMake run dir into the portable apps dir. The change adds a dependency on nsis_uninstall to the portableapps_package target in an attempt to sequence the copy operation. Change-Id: I9feb55599eff000f983c23ce29c89fbd3be0a6ac Reviewed-on: https://code.wireshark.org/review/9153 Reviewed-by: Graham Bloice <graham.bloice@trihedral.com> Petri-Dish: Graham Bloice <graham.bloice@trihedral.com> Reviewed-by: Anders Broman <a.broman58@gmail.com>
2015-04-17Do not package debug files when building PortableApps.com installer with ↵Pascal Quantin1-1/+1
(the soon to be dead) nmake Change-Id: Ifd6fc71cebe6db06923e2d764cb415bf5b2ed025 Reviewed-on: https://code.wireshark.org/review/8106 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-15Set the extcap working directory on Windows.Gerald Combs1-1/+0
On Windows, prepend the main program directory to %Path% when spawning extcap processes. This lets us place androiddump in extcap while allowing it to locate its DLLs. Change-Id: I406c47ce71323266d5f14fb596931398464e452d Reviewed-on: https://code.wireshark.org/review/8057 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-14CMake: Initial PortableApps targets.Gerald Combs4-12/+123
Add portableapps_app_dir and portableapps_package targets. Change-Id: Ifea3d952eef0e267de6364999d45807236d99102 Reviewed-on: https://code.wireshark.org/review/8025 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2015-04-12Windows: fix generation of PortableApps.com installerPascal Quantin1-1/+1
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07 Reviewed-on: https://code.wireshark.org/review/8036 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
2015-04-12Add missing androiddump stuffMichal Labedzki1-0/+1
Add missing androiddump stuff like: - release notes - documentation - Windows nmake support - running androiddump as a windows application instead of console on Windows - addition of androiddump to the Windows installer Change-Id: I3bc6cc70e4dc96c0cd776f3d965dd2aa0309995d Reviewed-on: https://code.wireshark.org/review/7981 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Petri-Dish: Michal Labedzki <michal.labedzki@tieto.com> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michal Labedzki <michal.labedzki@tieto.com>
2015-04-10Move the PortabaleApps packaging up one level.Gerald Combs5-9/+9
Update the PA section of the Developer's Guide. Change-Id: I383d2a2405e742eb353390f5a43fd6d6d32cb25b Reviewed-on: https://code.wireshark.org/review/8012 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-11-17PortableApps: ensure that the personal folder is set to the App directoryPascal Quantin1-0/+3
Otherwise the portable version ends up loading the user local personal profile Change-Id: Ib670c065319b0dd9673f239ae9459f6ee530f69e Reviewed-on: https://code.wireshark.org/review/5351 Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Pascal Quantin <pascal.quantin@gmail.com> Reviewed-by: Evan Huus <eapache@gmail.com>
2014-09-03Don't override the PA package naming convention. Use our full version inGerald Combs3-20/+11
the package name. Set a minimum OS version (Vista). Update some comments. Change-Id: I28096276d2588993136b008a307dbcc7983496b0 Reviewed-on: https://code.wireshark.org/review/3974 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Fix dist. Remove unused files.Gerald Combs3-145/+0
Change-Id: I44b2dbfa3859841c67e933d8e7c510834b7cc2ee Reviewed-on: https://code.wireshark.org/review/3967 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03Fix the PortableApps package name.Gerald Combs3-207/+4
Remove Installer.nsi while we're here. Change-Id: I739d5d825fd76eac9b50d26fab2d44e853dc83f9 Reviewed-on: https://code.wireshark.org/review/3965 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-03PortableApps: Remove invalid makefile commands.Gerald Combs1-2/+0
Change-Id: I6ed0f72a6915cd12d7866c978dce0d25c328dffd Reviewed-on: https://code.wireshark.org/review/3964 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-09-02Fix PortableApps packaging.Gerald Combs6-347/+128
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>
2014-09-02Qt → wireshark. GTK+ → wireshark-gtk.Gerald Combs1-2/+1
Make sure the Qt UI is named "Wireshark" and its executable is named "wireshark" or "wireshark.exe". Make sure the GTK+ UI is named "Wireshark 1" or "Wireshark (GTK+)" depending on how much the target audience is likely to care about UI toolkits. Make sure the GTK+ executable is named "wireshark-gtk" or "wireshark-gtk.exe". It looks like moving to Qt 5.3 (g978faf3) broke the PortableApps package. It's likely even more broken now. Autotools out-of-tree builds also broke on Ubuntu 12.02 (automake 1.11.3) at some point. The first attempt to compile in ui/qt returns "error: source_file.cpp: No such file or directory". The second attempt works. Out-of-tree builds work fine on Ubuntu 14.04 (automake 1.14.1). Tested: - Nmake builds - NSIS packaging - CMake builds (Windows, OS X) - Autotools build and distcheck - RPM packaging To do: - Test Debian packaging - Fix PortableApps Change-Id: I66429870e05fd2d6fc901942477959ed6164fce2 Reviewed-on: https://code.wireshark.org/review/3919 Reviewed-by: Gerald Combs <gerald@wireshark.org>
2014-07-28Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM ↵Pascal Quantin1-1/+1
environment variable is not explicitly set Bug: 10317 Change-Id: Ic7b4ffe2bbe4f69928b91a5151d8cef1ae59f723 Reviewed-on: https://code.wireshark.org/review/3203 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-07-21One more place with win32-setup.sh -> win-setup.shJoerg Mayer1-2/+2
Change-Id: Id6738d06470da81dd18d0e80e474c9ca64169d03 Reviewed-on: https://code.wireshark.org/review/3145 Reviewed-by: Jörg Mayer <jmayer@loplof.de>
2014-05-01Remove 'include win32.mak' from certain nmake files when not needed.Bill Meier1-1/+0
Change-Id: I05a505d884abb5fd7fca87bb89af29e3e4502b74 Reviewed-on: https://code.wireshark.org/review/1460 Reviewed-by: Bill Meier <wmeier@newsguy.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte3-6/+0
(Using sed : sed -i '/^\# \$Id\$/,+1 d') (start with dash) Change-Id: Ia4b5a6c2302f6a531f6a86c1ec3a2f8205c8c2dd Reviewed-on: https://code.wireshark.org/review/881 Reviewed-by: Anders Broman <a.broman58@gmail.com>
2014-03-31Continue to remove $Id$ from top of fileAlexis La Goutte1-2/+0
(Using sed : sed -i '/^\$Id\$/,+1 d') (No space or star before $Id$) Change-Id: I0801bd7cf234d32487008a8b6dcee64875b07688 Reviewed-on: https://code.wireshark.org/review/876 Reviewed-by: Evan Huus <eapache@gmail.com>
2014-01-05Fix indent (use 4 spaces) and add modelines and remove trailing whitespaceAlexis La Goutte1-54/+67
svn path=/trunk/; revision=54611
2014-01-05Fix build when use PortablesAPPSAlexis La Goutte1-0/+2
svn path=/trunk/; revision=54607
2013-12-01- Rename PCAP_VERSION to WINPCAP_VERSION - the version of the underlyingJörg Mayer2-3/+3
pcap probably is different from the WinPcap version. - Set WINPCAP_VERSION for cmake builds to "unknown" - Oh, the NEWS file changed again. svn path=/trunk/; revision=53690
2013-11-14Revert some inadvertent changes from the last commit.Gerald Combs1-5/+5
svn path=/trunk/; revision=53329
2013-11-14Create a plural-only English translation. Use it to pluralize the FollowGerald Combs1-5/+5
Stream and Flow Graph hint statistics. svn path=/trunk/; revision=53326
2013-10-29Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,Gerald Combs2-3/+2
the PortableApps version relies on U3_-prefixed environment variables. svn path=/trunk/; revision=52941
2013-10-28Remove some (but not all) U3 remnants.Gerald Combs2-2/+3
svn path=/trunk/; revision=52935
2013-08-30Try to fix PortableApps packaging. Note that the Qt definitions shouldGerald Combs2-12/+24
be in config.nmake along with everything else. svn path=/trunk/; revision=51598
2013-08-30Try 2 to fix Portable App buildbotAlexis La Goutte1-0/+5
svn path=/trunk/; revision=51595
2013-08-30Try to fix Portable App buildbotAlexis La Goutte1-0/+6
svn path=/trunk/; revision=51594
2013-06-25makefile.nmake -> Makefile.nmake and minor whitespace (spaces -> tabs) changes.Chris Maynard1-7/+7
svn path=/trunk/; revision=50140
2013-03-15Use a larger LZMA dictionary.Gerald Combs1-0/+1
svn path=/trunk/; revision=48328
2013-02-23Fix Build of PortableAPPs with QtsharkAlexis La Goutte1-1/+1
svn path=/trunk/; revision=47833
2013-02-22Add QtShark stuff to PortableAppsAlexis La Goutte2-1/+7
svn path=/trunk/; revision=47825
2012-06-13Don't add uninstall.exe to the U3/PortableApps manifest. DefineGerald Combs2-4/+5
STAGING_DIR. Update some makefile dependencies. svn path=/trunk/; revision=43244
2011-07-19Instead of overloading WIRESHARK_LIBS / wireshark_LIBS in Makefile.nmakeGerald Combs1-4/+4
use WIRESHARK_LIB_DIR for the location of our external libraries. svn path=/trunk/; revision=38119
2011-06-10Make the U3 and PortableApps "clean" and "distclean" targets moreGerald Combs1-0/+1
consistent with the NSIS targets. svn path=/trunk/; revision=37649
2011-02-12Cygwin 1.7 is much pickier about paths. Pass a POSIX path to bash.Gerald Combs1-1/+1
svn path=/trunk/; revision=35930
2011-02-02makefile.nmake => Makefile.nmakeBill Meier1-0/+0
svn path=/trunk/; revision=35750
2011-01-10Revert back to NSIS from NSIS Unicode to resolve bug 5558.Chris Maynard1-2/+2
svn path=/trunk/; revision=35455
2010-12-29Updates for Wireshark portable installer. Using nsis unicode now.Chris Maynard4-9/+7
svn path=/trunk/; revision=35300
2010-12-02Allow more than one instance of Wireshark to be started. For now, the stuffChris Maynard1-9/+10
that disallowed it is just commented out. Later, we might choose to make use of AllowMultipleInstances like other portableapps do, such as Firefox, et al. This change was made as a result of the following query on the -users list: http://www.wireshark.org/lists/wireshark-users/201012/msg00008.html svn path=/trunk/; revision=35104
2010-10-29Use Wireshark installer icon for portable apps installer. Fixes bug 4374.Chris Maynard1-1/+1
svn path=/trunk/; revision=34687
2010-08-22Add !ENDIF if needed.Gerald Combs1-0/+5
svn path=/trunk/; revision=33880
2010-04-09Fix the U3 and PortableApps builds.Gerald Combs1-1/+1
svn path=/trunk/; revision=32441
2010-03-25Set svn:executable property for some .py and .pl filesBill Meier1-0/+0
svn path=/trunk/; revision=32287