Fix download of 3rd party packages when WIRESHARK_TARGET_PLATFORM 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>

3 files changed, 25 insertions, 24 deletions

diff --git a/Makefile.nmake b/Makefile.nmake
index 710ddab354..add5bcbb5c 100644
--- a/Makefile.nmake
+++ b/Makefile.nmake
@@ -976,7 +976,7 @@ install_qt:
 	$(SH) $(WIN_SETUP) --download "C:\Qt" \
 		. \
 		Qt-5.1.1-MSVC2010-$(WIRESHARK_TARGET_PLATFORM)-ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 	
 # The process_libs target when invoked causes either a --libverify or a --download for all the required libraries.
 # (The choice is determined by the value of the macro WIN_SETUP_OPT).
@@ -985,7 +985,7 @@ process_libs:
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		WinPcap_$(WINPCAP_VERSION).exe \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 
 !IFNDEF QT5_BASE_DIR
 !MESSAGE Can't find Qt. This will become a problem at some point.
@@ -994,109 +994,109 @@ process_libs:
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		"$(GTK_NAME)" \
 		gtk+-bundle_$(GTK_PKG)_$(WIRESHARK_TARGET_PLATFORM)$(PKG_SUFIX).zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF KFW_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		kfw-3-2-2-i386-ws-vc6.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 #	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 #		. \
 #		kfw-3-2-2.zip \
-#		"$(DOWNLOAD_TAG)"
+#		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF PCAP_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		WpdPack_$(WPD_VERSION).zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF AIRPCAP_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		AirPcap_Devpack_4_1_0_1622 \
 		AirPcap_Devpack_4_1_0_1622.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF C_ARES_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		c-ares-$(C_ARES_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF ADNS_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		adns-1.0-win32-05ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF ZLIB_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 !if "$(WIRESHARK_TARGET_PLATFORM)" == "win32"
 		zlib125 zlib-1.2.5.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !else
 		zlib125 zlib125ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !endif
 !ENDIF
 !IFDEF LUA_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		lua5.2.3 \
 		lua$(LUA_DIST)_lib.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 
 !IFDEF GNUTLS_PKG
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		gnutls-$(GNUTLS_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF PORTAUDIO_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		portaudio_v19_2.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF SMI_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		libsmi-$(SMI_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF GEOIP_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws \
 		GeoIP-$(GEOIP_PKG)-$(WIRESHARK_TARGET_PLATFORM)ws.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF WINSPARKLE_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		WinSparkle-$(WINSPARKLE_PKG).zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF HHC_DIR
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		user-guide \
 		user-guide-g7ea0d6c.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF UPX
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		upx303w.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IFDEF NASM
 	@$(SH) $(WIN_SETUP) "$(WIN_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
 		. \
 		nasm-2.09.08-win32.zip \
-		"$(DOWNLOAD_TAG)"
+		"$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 !IF "$(WIN_SETUP_OPT)" == "--download"
-	@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)"
+	@$(SH) $(WIN_SETUP) --settag "$(WIRESHARK_LIB_DIR)" "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 !ENDIF
 	@echo.
 	@echo Wireshark is ready to build.
diff --git a/packaging/portableapps/win32/Makefile.nmake b/packaging/portableapps/win32/Makefile.nmake
index b9213b6ff6..a930d41a32 100644
--- a/packaging/portableapps/win32/Makefile.nmake
+++ b/packaging/portableapps/win32/Makefile.nmake
@@ -106,7 +106,7 @@ source:  WiresharkPortable.ini
 findprocdll:
 	if not exist $(FINDPROCDLL) \
 	@$(SH) ../../../tools/win-setup.sh "$(WIN32_SETUP_OPT)" "$(WIRESHARK_LIB_DIR)" \
-		$(NSIS_PLUGINS) FindProc.zip "$(DOWNLOAD_TAG)"
+		$(NSIS_PLUGINS) FindProc.zip "$(DOWNLOAD_TAG)" "$(WIRESHARK_TARGET_PLATFORM)"
 
 
 WiresharkPortable-$(VERSION).paf.exe : dirs appinfo nsis-bits pack source Files/WiresharkPortable.exe Installer.nsi
diff --git a/tools/win-setup.sh b/tools/win-setup.sh
index 8ec474ba58..023975f134 100755
--- a/tools/win-setup.sh
+++ b/tools/win-setup.sh
@@ -41,7 +41,7 @@ usage () {
 	echo "Usage:"
 	echo "	$0 --appverify <appname> [<appname>] ..."
 	echo "  $0 --libverify <destination> <subdirectory> <package>"
-	echo "	$0 --download  <destination> <subdirectory> <package> <tag>"
+	echo "	$0 --download  <destination> <subdirectory> <package> <tag> <platform>"
 	echo "	$0 --settag    <destination> <tag>"
 	echo "	$0 --checktag  <destination> <tag>"
 	echo ""
@@ -159,13 +159,14 @@ case "$1" in
 	fi
 	;;
 --download)
-	if [ -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" ] ; then
+	if [ -z "$2" -o -z "$3" -o -z "$4" -o -z "$5" -o -z "$6" ] ; then
 		usage
 	fi
 	DEST_PATH=$(cygpath "$2")
 	DEST_SUBDIR=$3
 	PACKAGE_PATH=$4
 	DOWNLOAD_TAG=$5
+	WIRESHARK_TARGET_PLATFORM=$6
 
 	if [ -z "$WIRESHARK_TARGET_PLATFORM" ]; then
 		err_exit "WIRESHARK_TARGET_PLATFORM not defined"