osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

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
This commit is contained in:
Graeme Lunt 2007-12-16 08:36:16 +00:00
parent 4f05930abe
commit d8519d3c17
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packaging/portableapps/win32/makefile.nmake
View File

@ -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) \

6
packaging/portableapps/win32/readme.txt
View File

@ -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.
To be documented.

5
tools/win32-setup.sh
View File

@ -7,9 +7,8 @@
# in order to provide backward compatibility with older trees (e.g. a
# previous release or an older SVN checkout).
# Save privious tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-11-24/packages/"
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-11-29a/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-05/packages/"
# DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-05/packages/"
DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/tags/2007-12-15/packages/"
# Set DOWNLOAD_PREFIX to /packages to test uploads before creating the tag.
#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-win32-libs/trunk/packages/"