Changes to address bug 3547:

1) Make sure WiresharkPortable.nsi uses correct WinPcap version (from config.nmake), and also vcredist.
2) Automatically generate WiresharkPortable.ini with correct default values
3) Include readme.txt in the distribution so that users know how to use WiresharkPortable.ini

Thanks to Kovarththanan Rajaratnam for basic patch.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28880 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/packaging/portableapps/win32/WiresharkPortable.nsi b/packaging/portableapps/win32/WiresharkPortable.nsi
index 653fd4e8ae78bca883821edad2e24c35f8561e4e..a490eac830b163104e3edadfed8ba52ea70d19c3 100755 (executable)
--- a/packaging/portableapps/win32/WiresharkPortable.nsi
+++ b/packaging/portableapps/win32/WiresharkPortable.nsi
@@ -30,8 +30,6 @@
 !define WEBSITE "www.wireshark.org"
 !define DEFAULTEXE "wireshark.exe"
 !define DEFAULTAPPDIR "Wireshark"
-!define DEFAULTWINPCAP "WinPcap_4_1_beta5.exe"
-!define DEFAULTMSVCREDIST "vcredist_x86.exe"
 
 !addplugindir "${EXTRA_PLUGINS}"
 

diff --git a/packaging/portableapps/win32/WiresharkPortable.ini b/packaging/portableapps/win32/WiresharkPortable.tmpl
old mode 100755 (executable)
new mode 100644 (file)
similarity index 82%
rename from packaging/portableapps/win32/WiresharkPortable.ini
rename to packaging/portableapps/win32/WiresharkPortable.tmpl
index 784aeb6..5df8528
--- a/packaging/portableapps/win32/WiresharkPortable.ini
+++ b/packaging/portableapps/win32/WiresharkPortable.tmpl
@@ -10,9 +10,9 @@ WiresharkExecutable=wireshark.exe
 AdditionalParameters=
 
 DisableWinPcapInstall=false
-WinPcapInstaller=WinPcap_4_1_beta5.exe
+WinPcapInstaller=WinPcap_$(PCAP_VERSION).exe
 
-MSVCRedist=vcredist_x86.exe
+MSVCRedist=vcredist_$(TARGET_MACHINE).exe
 
 # This INI is an example only and will not work until placed according to the directions in readme.txt
 # The above options are explained in the included readme.txt

diff --git a/packaging/portableapps/win32/makefile.nmake b/packaging/portableapps/win32/makefile.nmake
index 64b36731a91c49cdcbe38e434a918a2e40bb292b..c59d2c41cd3d093c7f1aaca466cb601bc957c872 100644 (file)
--- a/packaging/portableapps/win32/makefile.nmake
+++ b/packaging/portableapps/win32/makefile.nmake
@@ -77,12 +77,18 @@ appinfo.ini: appinfo.tmpl $(TOPDIR)\config.nmake
             -e 's/$$(VERSION_MINOR)/$(VERSION_MINOR)/g' \
        < appinfo.tmpl > appinfo.ini
 
+WiresharkPortable.ini: WiresharkPortable.tmpl $(TOPDIR)\config.nmake
+       sed -e 's/$$(PCAP_VERSION)/$(PCAP_VERSION)/g' \
+            -e 's/$$(TARGET_MACHINE)/$(TARGET_MACHINE)/g' \
+       < WiresharkPortable.tmpl > WiresharkPortable.ini
+
 appinfo: appinfo.ini
        $(COPY) appinfo.ini $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS)
        $(COPY) $(TOPDIR)\image\wireshark.ico $(FILES)\$(APP)\$(APPINFO) $(COPY_FLAGS)
 
-source:
+source:  WiresharkPortable.ini
        $(COPY) WiresharkPortable.ini $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS)
+       $(COPY) readme.txt $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS)
        $(COPY) WiresharkPortable.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS)
        $(COPY) Installer.nsi $(FILES)\$(OTHER)\$(SOURCE) $(COPY_FLAGS)
 
@@ -96,6 +102,8 @@ WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/
        $(MAKENSIS) \
        /DVERSION=$(PAPPS_VERSION) \
        /DWSVERSION=$(VERSION) \
+       /DDEFAULTWINPCAP=WinPcap_$(PCAP_VERSION).exe \
+       /DDEFAULTMSVCREDIST=vcredist_$(TARGET_MACHINE).exe \
        /DEXTRA_PLUGINS="$(WIRESHARK_LIBS)\$(NSIS_PLUGINS)" \
        Installer.nsi
 
@@ -112,6 +120,7 @@ clean:
        cd portableapps/win32
        rm -rf $(FILES)
        rm -rf appinfo.ini
+       rm -rf WiresharkPortable.ini
        rm -rf distribution.nmake
        rm -rf WiresharkPortable-$(VERSION).paf.exe
        rm -rf *~ *.*~