diff options
| author | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-12-16 08:36:16 +0000 |
|---|---|---|
| committer | Graeme Lunt <graeme.lunt@smhs.co.uk> | 2007-12-16 08:36:16 +0000 |
| commit | d8519d3c17c43d71c32e528ab0d0938fa8d9b0b4 (patch) | |
| tree | 4322c6caa817ac1d544634c05561d31ec30f18f9 /packaging/portableapps | |
| parent | 4f05930abe42f432c467c6c9162bc6f57ebf0960 (diff) | |
Automatically install the FindProcDll.dll NSIS plug-in required for the WiresharkPortable.exe.
This should allow the builbot to build the PortableApps packaging.
svn path=/trunk/; revision=23881
Diffstat (limited to 'packaging/portableapps')
| -rw-r--r-- | packaging/portableapps/win32/makefile.nmake | 17 | ||||
| -rw-r--r-- | packaging/portableapps/win32/readme.txt | 6 |
2 files changed, 15 insertions, 8 deletions
diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake index 467dbebc14..5fe3bf2ec8 100644 --- a/packaging/portableapps/win32/makefile.nmake +++ b/packaging/portableapps/win32/makefile.nmake @@ -13,15 +13,20 @@ APPINFO = AppInfo WIRESHARK = Wireshark SOURCE = WiresharkPortableSource +FINDPROCDLL = $(MAKENSIS)\..\Plugins\FindProcDLL.dll + TOPDIR = ..\..\.. U3DIST = ..\..\u3\win32 COPY = xcopy MKDIR = mkdir COPY_FLAGS = /d /y +!IFNDEF WIN32_SETUP_OPT +WIN32_SETUP_OPT=--download +!ENDIF PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0 -all: package +all: package package: WiresharkPortable-$(VERSION).paf.exe @@ -56,15 +61,19 @@ source: $(COPY) WiresharkPortable.ini $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) $(COPY) WiresharkPortable.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) $(COPY) Installer.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS) - -WiresharkPortable-$(VERSION).paf.exe : dirs appinfo wireshark source Files/WiresharkPortable.exe Installer.nsi +findprocdll: + if not exist $(FINDPROCDLL) \ + @$(SH) $(TOPDIR)\tools\win32-setup.sh "$(WIN32_SETUP_OPT)" "$(MAKENSIS)\.." \ + Plugins FindProc.zip + +WiresharkPortable-$(VERSION).paf.exe : dirs appinfo wireshark source Files/WiresharkPortable.exe Installer.nsi $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ Installer.nsi -Files/WiresharkPortable.exe : WiresharkPortable.nsi +Files/WiresharkPortable.exe : WiresharkPortable.nsi findprocdll $(MAKENSIS) \ /DVERSION=$(PAPPS_VERSION) \ /DWSVERSION=$(VERSION) \ diff --git a/packaging/portableapps/win32/readme.txt b/packaging/portableapps/win32/readme.txt index 9d524562a5..3cb6411c0c 100644 --- a/packaging/portableapps/win32/readme.txt +++ b/packaging/portableapps/win32/readme.txt @@ -21,11 +21,9 @@ NSIS The Portable Apps packaging uses the NullSoft Scriptable Installer System (NSIS) to create a installation package to install onto the USB drive, and a launcher to launch Wireshak from the USB drive. -NSIS is used by the standard Win32 installation mechansim (packaging/nsis) but an additional plug-in is required for the Wireshark Portable launcher. This can be downloaded from: -http://nsis.sourceforge.net/Find_Process_By_Name -which also contains the instructions for its installation. +NSIS is used by the standard Win32 installation mechansim (packaging/nsis) but an additional plug-in is required for the Wireshark Portable launcher. This is now automatically downloaded and installed from the wireshark-win32-libs repository. INI Settings ============ -To be documented.
\ No newline at end of file +To be documented. |