diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-10-29 04:05:27 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-10-29 04:05:27 +0000 |
| commit | ba49d9bcf01a597ebec66c3d65c4813ebf174806 (patch) | |
| tree | 24a8dc06b7825a9b8d252a148eeb0809d75201e6 /packaging/portableapps/win32 | |
| parent | 58d01512b16728b357b2f6481c592a71c7ab8435 (diff) | |
| download | wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.tar.gz wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.tar.bz2 wireshark-ba49d9bcf01a597ebec66c3d65c4813ebf174806.zip | |
Revert part of 52896 and (for now) all of 52935. As Jeff pointed out,
the PortableApps version relies on U3_-prefixed environment variables.
svn path=/trunk/; revision=52941
Diffstat (limited to 'packaging/portableapps/win32')
| -rw-r--r-- | packaging/portableapps/win32/Makefile.nmake | 1 | ||||
| -rwxr-xr-x | packaging/portableapps/win32/WiresharkPortable.nsi | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake index f889ce8d65..aebe11f805 100644 --- a/packaging/portableapps/win32/Makefile.nmake +++ b/packaging/portableapps/win32/Makefile.nmake @@ -19,6 +19,7 @@ NSIS_PLUGINS = nsis-plugins FINDPROCDLL = $(WIRESHARK_LIB_DIR)\$(NSIS_PLUGINS)\FindProcDLL.dll TOPDIR = ..\..\.. +U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi index 9732f06518..50538ac646 100755 --- a/packaging/portableapps/win32/WiresharkPortable.nsi +++ b/packaging/portableapps/win32/WiresharkPortable.nsi @@ -151,9 +151,7 @@ Section "Main" Abort FoundProgramEXE: - ;=== Check if Wireshark running from somwehere else - ; XXX We might be able to use the Wireshark-is-running mutex here. - ; See IsWiresharkRunning in packaging\nsis\common.nsh for details. + ;=== Check if Wireshark running from somwehere else (e.g. U3 device) ; if the following step fails, you'll need the FindProcDLL plug-in from: ; http://nsis.sourceforge.net/Find_Process_By_Name ;FindProcDLL::FindProc "${PROGRAMEXECUTABLE}" |