Remove Nmake build system

Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61
Reviewed-on: https://code.wireshark.org/review/15777
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Reviewed-by: Balint Reczey <balint@balintreczey.hu>

9 files changed, 4 insertions, 481 deletions

diff --git a/packaging/Makefile.am b/packaging/Makefile.am
index 345fbd0173..1535072307 100644
--- a/packaging/Makefile.am
+++ b/packaging/Makefile.am
@@ -5,12 +5,10 @@ MAINTAINERCLEANFILES = \
 	Makefile.in
 
 EXTRA_DIST = \
-	Makefile.nmake				\
 	macosx/Info.plist.in			\
 	portableapps/appinfo.tmpl		\
 	portableapps/CMakeLists.txt		\
 	portableapps/help.html			\
-	portableapps/Makefile.nmake		\
 	portableapps/readme.txt			\
 	portableapps/WiresharkPortable.ini	\
 	portableapps/xcopy-deploy-exclude.txt
diff --git a/packaging/Makefile.nmake b/packaging/Makefile.nmake
deleted file mode 100644
index af21e532ea..0000000000
--- a/packaging/Makefile.nmake
+++ /dev/null
@@ -1,10 +0,0 @@
-# This is no longer used and can probably be removed.
-
-include ../config.nmake
-
-clean:
-	rm -rf wireshark.manifest
-
-distclean:	clean
-
-maintainer-clean:	distclean
diff --git a/packaging/nsis/CMakeLists.txt b/packaging/nsis/CMakeLists.txt
index dec5cb5dbc..00e920c72b 100644
--- a/packaging/nsis/CMakeLists.txt
+++ b/packaging/nsis/CMakeLists.txt
@@ -43,16 +43,6 @@ set(NSIS_FILES
 	PARENT_SCOPE
 )
 
-# Check for leftover NMake-generated files.
-foreach(_nsh_file all-manifest.nsh config.nsh gtk-dll-manifest.nsh qt-dll-manifest.nsh)
-	if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${_nsh_file})
-		message(FATAL_ERROR
-			"Found ${CMAKE_CURRENT_SOURCE_DIR}/${_nsh_file}.\n"
-			"Please run nmake -f Makefile.nmake distclean in ${CMAKE_SOURCE_DIR}."
-		)
-	endif()
-endforeach()
-
 # Variables required for config.nsh
 set(PROGRAM_NAME ${CMAKE_PROJECT_NAME})
 file(TO_NATIVE_PATH "${CMAKE_SOURCE_DIR}" TOP_SRC_DIR)
@@ -83,7 +73,7 @@ set(PRODUCT_VERSION ${PROJECT_MAJOR_VERSION}.${PROJECT_MINOR_VERSION}.${PROJECT_
 set(WTAP_VERSION ${PROJECT_VERSION})
 
 # To do:
-# - Sync the various version names between CMake, NMake, and NSIS.
+# - Sync the various version names between CMake and NSIS.
 # - Set CMakeLists.txt version strings in make-version.pl
 # - Add a VERSION_EXTRA cmake option
 set (VERSION "${PROJECT_VERSION}")
@@ -218,8 +208,7 @@ macro( ADD_NSIS_PACKAGE_TARGET )
 	)
 	set_target_properties(nsis_package_prep PROPERTIES FOLDER "Packaging")
 
-	# Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis to match
-	# the NMake environment for now.
+	# Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/nsis
 	# Note that executables and DLLs *must* be built separately
 	add_custom_target(nsis_package
 		COMMAND ${MAKENSIS_EXECUTABLE} ${NSIS_DEFINES}
diff --git a/packaging/nsis/Custom.nmake b/packaging/nsis/Custom.nmake
deleted file mode 100644
index 49979f9367..0000000000
--- a/packaging/nsis/Custom.nmake
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Add your custom plugins here
-CUSTOM_PLUGINS= \
-# Example:
-# 	../../plugins/foo/foo.dll 	
-
diff --git a/packaging/nsis/Makefile.am b/packaging/nsis/Makefile.am
index 22de5e1819..a02722a44f 100644
--- a/packaging/nsis/Makefile.am
+++ b/packaging/nsis/Makefile.am
@@ -6,13 +6,11 @@ EXTRA_DIST = \
 	CMakeLists.txt	\
 	common.nsh	\
 	config.nsh.in	\
-	Custom.nmake \
 	custom_diameter_xmls.txt \
 	custom_mibs.txt	\
 	custom_plugins.txt	\
 	custom_radius_dict.txt	\
 	GetWindowsVersion.nsh \
-	Makefile.nmake \
 	servicelib.nsh \
 	uninstall.nsi	\
 	VersionCompare.nsh \
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
deleted file mode 100644
index 63a6d1add7..0000000000
--- a/packaging/nsis/Makefile.nmake
+++ /dev/null
@@ -1,312 +0,0 @@
-#
-# NSIS is a free packager/installer/uninstaller program for Win32.
-# It was originally written for the Winamp package, but various
-# freeware and non-freeware packages are using it, too.
-#
-# http://www.nullsoft.com/free/nsis/
-
-include ../../config.nmake
-# Contains a list of custom plugins(default empty)
-include Custom.nmake
-
-TOP_SRC_DIR=$(MAKEDIR)\..\..
-# Must be absolue for uninstall.nsi
-STAGING_DIR=$(MAKEDIR)\..\..\$(INSTALL_DIR)
-
-EXE=../../tshark.exe ../../editcap.exe \
-!IFDEF GTK_DIR
-	../../wireshark-gtk.exe \
-!ENDIF
-	../../text2pcap.exe ../../mergecap.exe ../../capinfos.exe $(WIRESHARK_LIB_DIR)\WinPcap_$(WINPCAP_VERSION).exe
-DLL=../../wiretap/wiretap-$(WTAP_VERSION).dll ../../wsutil/libwsutil.dll ../../codecs/libwscodecs.dll
-DOC=../../doc/ws.css				\
-	../../doc/androiddump.html		\
-	../../doc/capinfos.html			\
-	../../doc/ciscodump.html			\
-	../../doc/dumpcap.html			\
-	../../doc/editcap.html			\
-	../../doc/extcap.html			\
-	../../doc/mergecap.html			\
-	../../doc/randpktdump.html		\
-	../../doc/rawshark.html			\
-	../../doc/sshdump.html			\
-	../../doc/text2pcap.html		\
-	../../doc/tshark.html			\
-	../../doc/wireshark-filter.html		\
-	../../doc/wireshark.html		\
-	$(STAGING_DIR)/COPYING.txt	\
-	$(STAGING_DIR)/NEWS.txt		\
-	$(STAGING_DIR)/README.txt		\
-	$(STAGING_DIR)/README.windows.txt
-
-GPL=../../COPYING
-HELP=$(STAGING_DIR)/help/capture_filters.txt \
-	$(STAGING_DIR)/help/capturing.txt \
-	$(STAGING_DIR)/help/display_filters.txt \
-	$(STAGING_DIR)/help/faq.txt \
-	$(STAGING_DIR)/help/getting_started.txt \
-	$(STAGING_DIR)/help/overview.txt \
-	$(STAGING_DIR)/help/toc
-
-PLUGINS= \
-	../../plugins/docsis/docsis.dll \
-	../../plugins/ethercat/ethercat.dll \
-	../../plugins/gryphon/gryphon.dll \
-	../../plugins/irda/irda.dll \
-	../../plugins/m2m/m2m.dll \
-	../../plugins/mate/mate.dll \
-	../../plugins/opcua/opcua.dll \
-	../../plugins/profinet/profinet.dll \
-	../../plugins/stats_tree/stats_tree.dll \
-	../../plugins/unistim/unistim.dll \
-	../../plugins/wimax/wimax.dll \
-	../../plugins/wimaxasncp/wimaxasncp.dll \
-	../../plugins/wimaxmacphy/wimaxmacphy.dll \
-	$(CUSTOM_PLUGINS)
-
-NSI=\
-	wireshark.nsi \
-	uninstall.nsi \
-	common.nsh \
-	GetWindowsVersion.nsh \
-	servicelib.nsh \
-	AdditionalTasksPage.ini \
-	WinPcapPage.ini \
-	USBPcapPage.ini
-
-UNINSTALL_INSTALLER = $(STAGING_DIR)\uninstall_installer.exe
-
-DELIVERABLES=$(EXE) $(DLL) $(DOC) $(DOC_dos) $(GPL) $(HELP) $(PLUGINS)
-
-!IFDEF MAKENSIS
-all: wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
-!ELSE
-all: _FORCE_
-	@echo ? NSIS not available (MAKENSIS not defined in config.nmake)
-	@echo.
-	@exit 1
-!ENDIF
-
-# fetch the latest available user-guide.chm version
-user-guide.chm::
-	if exist ..\..\docbook\user-guide.chm xcopy ..\..\docbook\user-guide.chm . /Y /D
-	if exist $(WIRESHARK_LIB_DIR)\user-guide\user-guide.chm xcopy $(WIRESHARK_LIB_DIR)\user-guide\user-guide.chm . /Y /D
-
-common.nsh: config.nsh
-config.nsh: config.nsh.in ..\..\config.nmake
-	sed \
-		-e s/@PROGRAM_NAME@/$(PROGRAM_NAME)/ \
-		-e 's/@TOP_SRC_DIR@/$(TOP_SRC_DIR:\=\\\\)/' \
-		-e 's/@STAGING_DIR@/$(STAGING_DIR:\=\\\\)/' \
-		-e s/@USER_GUIDE_DIR@/./ \
-		-e s/@WIRESHARK_TARGET_PLATFORM@/$(WIRESHARK_TARGET_PLATFORM)/ \
-		-e s/@TARGET_MACHINE@/$(TARGET_MACHINE)/ \
-		-e s/@MSC_VER_REQUIRED@/$(MSC_VER_REQUIRED)/ \
-		-e 's/@WIRESHARK_LIB_DIR@/$(WIRESHARK_LIB_DIR:\=\\\\)/' \
-		-e s/@WINPCAP_PACKAGE_VERSION@/$(WINPCAP_VERSION)/ \
-		-e s/@PCAP_DISPLAY_VERSION@/$(WINPCAP_VERSION:_=.)/ \
-		-e s/@INTL_DLL@/$(INTL_DLL)/ \
-		-e s/@VERSION@/$(VERSION)/ \
-		-e s/@VERSION_MAJOR@/$(VERSION_MAJOR)/ \
-		-e s/@VERSION_MINOR@/$(VERSION_MINOR)/ \
-		-e s/@PRODUCT_VERSION@/$(PRODUCT_VERSION)/ \
-		-e s/@WTAP_VERSION@/$(WTAP_VERSION)/ \
-		-e 's/@MSVCR_DLL@/$(MSVCR_DLL:\=\\\\)/' \
-!IFDEF VCREDIST_EXE
-		-e 's/@VCREDIST_EXE@/$(VCREDIST_EXE:\=\\\\)/' \
-!ENDIF
-		-e s/@ENABLE_LIBWIRESHARK@/$(ENABLE_LIBWIRESHARK)/ \
-		-e 's/@SMI_DIR@/$(SMI_DIR:\=\\\\)/' \
-!IFDEF GTK_DIR
-		-e 's/@GTK_DIR@/$(GTK_DIR:\=\\\\)/' \
-!ENDIF
-!IF EXIST("..\..\wireshark-qt-release\wireshark.exe")
-		-e s/@QT_DIR@/..\\..\\wireshark-qt-release/ \
-!ENDIF
-		-e 's/\(^^!define .*\) \"*@.*@\"*/; \1/' \
-	    < config.nsh.in > $@
-
-wireshark.nsi: all-manifest.nsh qt-dll-manifest.nsh gtk-dll-manifest.nsh common.nsh
-
-all-manifest.nsh: Makefile.nmake ..\..\config.nmake
-	@echo # Files required for all sections. Generated from Makefile.nmake > $@
-	@echo # GLib >> $@
-	@echo File "$(STAGING_DIR)\libgio-2.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\libglib-2.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\libgobject-2.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\libgmodule-2.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\$(INTL_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\gspawn-$(WIRESHARK_TARGET_PLATFORM)-helper.exe" >> $@
-	@echo File "$(STAGING_DIR)\gspawn-$(WIRESHARK_TARGET_PLATFORM)-helper-console.exe" >> $@
-!IF "$(C_ARES_DIR)" != ""
-	@echo # C-Ares >> $@
-	@echo File "$(STAGING_DIR)\libcares-2.dll" >> $@
-!ENDIF
-!IF "$(GNUTLS_DIR)" != ""
-	@echo # GnuTLS >> $@
-	@echo File "$(STAGING_DIR)\libffi-6.dll" >> $@
-	@echo File "$(STAGING_DIR)\$(GCC_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\libgcrypt-20.dll" >> $@
-	@echo File "$(STAGING_DIR)\libgmp-10.dll" >> $@
-	@echo File "$(STAGING_DIR)\libgnutls-28.dll" >> $@
-	@echo File "$(STAGING_DIR)\$(GPGERROR_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\libhogweed-2-4.dll" >> $@
-	@echo File "$(STAGING_DIR)\libnettle-4-6.dll" >> $@
-	@echo File "$(STAGING_DIR)\libp11-kit-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\libtasn1-6.dll" >> $@
-!ENDIF
-!IF "$(KFW_DIR)" != ""
-	@echo # Kerberos >> $@
-	@echo File "$(STAGING_DIR)\$(COMERR_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\$(KRB5_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\$(K5SPRT_DLL)" >> $@
-!ENDIF
-!IFDEF LUA_DIR
-	@echo # Lua >> $@
-	@echo File "$(STAGING_DIR)\lua52.dll" >> $@
-	@echo File "..\..\epan\wslua\init.lua" >> $@
-	@echo File "..\..\epan\wslua\console.lua" >> $@
-	@echo File "..\..\epan\wslua\dtd_gen.lua" >> $@
-!ENDIF
-!IFDEF GEOIP_DIR
-	@echo File "$(STAGING_DIR)\libGeoIP-1.dll" >> $@
-!ENDIF
-!IFDEF SMI_DIR
-	@echo # SMI >> $@
-	@echo File "$(STAGING_DIR)\libsmi-2.dll" >> $@
-!ENDIF
-!IFDEF LIBSSH_DIR
-	@echo File "$(STAGING_DIR)\libssh.dll" >> $@
-!ENDIF
-!IFDEF WINSPARKLE_DIR
-	@echo # WinSparkle >> $@
-	@echo File "$(STAGING_DIR)\WinSparkle.dll" >> $@
-!ENDIF
-!IF "$(ZLIB_DIR)" != ""
-	@echo # Zlib >> $@
-	@echo File "$(STAGING_DIR)\zlib1.dll" >> $@
-!ENDIF
-
-gtk-dll-manifest.nsh: Makefile.nmake ..\..\config.nmake
-	@echo # Files required for the GTK+ section. Generated from Makefile.nmake > $@
-	@echo # Mandatory >> $@
-	@echo File "$(STAGING_DIR)\$(GDK_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\libgdk_pixbuf-2.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\$(GTK_DLL)" >> $@
-	@echo File "$(STAGING_DIR)\libatk-1.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\libpango-1.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\libpangowin32-1.0-0.dll" >> $@
-	@echo # Optional >> $@
-!IFDEF NEED_CAIRO_DLL
-	@echo File "$(STAGING_DIR)\libcairo-2.dll" >> $@
-	@echo File "$(STAGING_DIR)\libpangocairo-1.0-0.dll" >> $@
-!ENDIF
-!IFDEF NEED_CAIRO_GOBJECT_DLL
-	@echo File "$(STAGING_DIR)\libcairo-gobject-2.dll" >> $@
-!ENDIF
-!IFDEF NEED_EXPAT_DLL
-	@echo File "$(STAGING_DIR)\${EXPAT_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_FFI_DLL
-	@echo File "$(STAGING_DIR)\$(FFI_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_FONTCONFIG_DLL
-	@echo File "$(STAGING_DIR)\$(FONTCONFIG_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_FREETYPE_DLL
-	@echo File "$(STAGING_DIR)\libpangoft2-1.0-0.dll" >> $@
-	@echo File "$(STAGING_DIR)\$(FREETYPE_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_HARFBUZZ_DLL
-	@echo File "$(STAGING_DIR)\$(HARFBUZZ_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_JASPER_DLL
-	@echo File "$(STAGING_DIR)\$(JASPER_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_JPEG_DLL
-	@echo File "$(STAGING_DIR)\$(JPEG_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_LZMA_DLL
-	@echo File "$(STAGING_DIR)\$(LZMA_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_PIXMAN_DLL
-	@echo File "$(STAGING_DIR)\$(PIXMAN_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_PNG_DLL
-	@echo File "$(STAGING_DIR)\$(PNG_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_SEH_DLL
-	@echo File "$(STAGING_DIR)\$(SEH_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_SJLJ_DLL
-	@echo File "$(STAGING_DIR)\$(SJLJ_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_TIFF_DLL
-	@echo File "$(STAGING_DIR)\$(TIFF_DLL)" >> $@
-!ENDIF
-!IFDEF NEED_XML_DLL
-	@echo File "$(STAGING_DIR)\$(XML_DLL)" >> $@
-!ENDIF
-	@echo # Subdirectories >> $@
-	@echo SetOutPath ^$INSTDIR\$(GTK_ETC_DIR) >> $@
-	@echo File "$(GTK_DIR)\$(GTK_ETC_DIR)\*.*" >> $@
-!IFDEF GTK_ENGINES_DIR
-	@echo SetOutPath ^$INSTDIR\$(GTK_ENGINES_DIR) >> $@
-	@echo File "$(STAGING_DIR)\$(GTK_ENGINES_DIR)\libpixmap.dll" >> $@
-	@echo File "$(STAGING_DIR)\$(GTK_ENGINES_DIR)\libwimp.dll" >> $@
-!ENDIF
-!IFDEF GTK_MODULES_DIR
-	@echo SetOutPath ^$INSTDIR\$(GTK_MODULES_DIR) >> $@
-	@echo File "$(STAGING_DIR)\$(GTK_MODULES_DIR)\libgail.dll" >> $@
-!ENDIF
-!IFDEF GTK_SCHEMAS_DIR
-	@echo SetOutPath ^$INSTDIR\$(GTK_SCHEMAS_DIR) >> $@
-	@echo File "$(STAGING_DIR)\$(GTK_SCHEMAS_DIR)\*.*" >> $@
-!ENDIF
-
-qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 Makefile.nmake
-!IF EXIST("$(QT5_BASE_DIR)\bin\qmake.exe")
-	set PATH=%PATH%;$(QT5_BASE_DIR)\bin
-!ENDIF
-	$(POWERSHELL) windeployqt-to-nsis.ps1 \
-		-Executable ..\..\wireshark-qt-release\wireshark.exe \
-		-FilePath $@
-
-$(STAGING_DIR)\uninstall.exe : $(NSI)
-	rm -f $(UNINSTALL_INSTALLER)
-	$(MAKENSIS) uninstall.nsi
-	$(UNINSTALL_INSTALLER)
-	rm -f $(UNINSTALL_INSTALLER)
-
-uninstall-exe : $(STAGING_DIR)\uninstall.exe
-
-wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe : user-guide.chm $(NSI) $(DELIVERABLES) Makefile.nmake $(STAGING_DIR)\uninstall.exe
-	$(MAKENSIS) wireshark.nsi
-
-clean:
-	rm -f all-manifest.nsh
-	rm -f config.nsh
-	rm -f gtk-dll-manifest.nsh
-	rm -f NEWS.txt
-	rm -f qt-dll-manifest.nsh
-	rm -f user-guide.chm
-	rm -f $(UNINSTALL_INSTALLER)
-	rm -f wireshark-$(WIRESHARK_TARGET_PLATFORM)-$(VERSION).exe
-
-distclean: clean
-	rm -f wireshark-$(WIRESHARK_TARGET_PLATFORM)-*.exe
-
-maintainer-clean: distclean
-
-$(DOC):
-	cd ../../doc
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-	cd ../packaging/nsis
-
-$(EXE) $(DLL):
-	cd ../..
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-	cd packaging/nsis
-
-####
-_FORCE_:  ## Assumption: no file named _FORCE_ exists in the current directory
diff --git a/packaging/nsis/wireshark.nsi b/packaging/nsis/wireshark.nsi
index 145fad17ed..cbb9439cf6 100644
--- a/packaging/nsis/wireshark.nsi
+++ b/packaging/nsis/wireshark.nsi
@@ -408,7 +408,7 @@ Delete "$INSTDIR\vcredist_${TARGET_MACHINE}.exe"
 !else
 !ifdef MSVCR_DLL
 ; msvcr*.dll (MSVC V7 or V7.1) - simply copy the dll file
-!echo "IF YOU GET AN ERROR HERE, check the MSVC_VARIANT setting in config.nmake: MSVC2005 vs. MSVC2005EE."
+!echo "IF YOU GET AN ERROR HERE, check the CMAKE_GENERATOR setting"
 File "${MSVCR_DLL}"
 !endif ; MSVCR_DLL
 !endif ; VCREDIST_EXE
diff --git a/packaging/portableapps/Makefile.nmake b/packaging/portableapps/Makefile.nmake
deleted file mode 100644
index 2a9af43365..0000000000
--- a/packaging/portableapps/Makefile.nmake
+++ /dev/null
@@ -1,133 +0,0 @@
-#
-
-TOPDIR		= ..\..
-TOOLS_DIR	= $(TOPDIR)\tools
-
-include ../../config.nmake
-
-PROGRAM_PORTABLE	= $(PROGRAM_NAME)Portable
-
-STAGING_DIR	= $(PROGRAM_PORTABLE)
-APP 		= $(STAGING_DIR)\App
-APPINFO		= $(APP)\AppInfo
-LAUNCHER_DIR	= $(APPINFO)\Launcher
-WIRESHARK_DIR 	= $(APP)\$(PROGRAM_NAME)
-DATA		= $(STAGING_DIR)\Data
-OTHER		= $(STAGING_DIR)\Other
-SOURCE		= $(OTHER)\Source
-
-APPINFO_INI	= $(APPINFO)\appinfo.ini
-LAUNCHER_INI	= $(LAUNCHER_DIR)\$(PROGRAM_PORTABLE).ini
-
-COPY		= xcopy
-MKDIR		= mkdir
-COPY_FLAGS	= /d /y
-!IFNDEF WIN32_SETUP_OPT
-WIN32_SETUP_OPT	= --download
-!ENDIF
-
-# XXX This should be defined in config.nmake.
-!IF EXIST("$(TOPDIR)\wireshark-qt-release\wireshark.exe")
-QT_DIR		= "$(TOPDIR)\wireshark-qt-release"
-!ENDIF
-!IF EXIST("$(TOPDIR)\wireshark-qt-release\Qt5Core.dll")
-NEED_QT5_DLL	= USE
-!ENDIF
-!IF EXIST("$(TOPDIR)\wireshark-qt-release\QtCore4.dll")
-NEED_QT4_DLL	= USE
-!ENDIF
-
-UPX_FLAGS = -q
-
-PAPPS_VERSION=$(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_MICRO).0
-PAPPS_PACKAGE=$(PROGRAM_PORTABLE)_$(VERSION).paf.exe
-
-all: package
-
-package: $(PAPPS_PACKAGE)
-
-dirs:
-	if not exist $(STAGING_DIR) $(MKDIR) $(STAGING_DIR)
-	if not exist $(APP) $(MKDIR) $(APP)
-	if not exist $(APPINFO) $(MKDIR) $(APPINFO)
-	if not exist $(LAUNCHER_DIR) $(MKDIR) $(LAUNCHER_DIR)
-	if not exist $(WIRESHARK_DIR) $(MKDIR) $(WIRESHARK_DIR)
-	if not exist $(DATA) $(MKDIR) $(DATA)
-	if not exist $(OTHER) $(MKDIR) $(OTHER)
-	if not exist $(SOURCE) $(MKDIR) $(SOURCE)
-
-# XXX - Figure out how to use the PA AppCompactor non-interactively and
-# use it instead.
-#pack:	distribution
-#!IFDEF UPX
-#	-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe
-#	-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll
-#	-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\plugins\$(VERSION)\*.dll
-#	-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\loaders\*.dll
-#	-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\lib\gtk-2.0\$(GTK_LIB_DIR)\immodules\*.dll
-#	-$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\$(GTK_WIMP_DLLDST_DIR)\*.dll
-#!ENDIF
-
-$(APPINFO_INI): dirs appinfo.tmpl $(TOPDIR)\config.nmake
-	sed -e 's/@PORTABLEAPPS_PACKAGE_VERSION@/$(PAPPS_VERSION)/g' \
-	    -e 's/@VERSION@/$(VERSION)/g' \
-	< appinfo.tmpl > $@
-
-$(LAUNCHER_INI): dirs $(PROGRAM_PORTABLE).ini
-	copy $(PROGRAM_PORTABLE).ini $(LAUNCHER_INI) /y
-
-appinfo: $(APPINFO_INI) $(LAUNCHER_INI)
-	copy help.html $(STAGING_DIR)\help.html /y
-	copy $(TOPDIR)\image\wireshark.ico $(APPINFO)\appicon.ico /y
-	copy $(TOPDIR)\image\wsicon16.png $(APPINFO)\appicon_16.png /y
-	copy $(TOPDIR)\image\wsicon32.png $(APPINFO)\appicon_32.png /y
-	copy $(TOPDIR)\image\wsicon128.png $(APPINFO)\appicon_128.png /y
-
-# It'd be nice if we could get some sort of status or debugging output. For now
-# just cross our fingers.
-applauncher: appinfo
-	$(PORTABLEAPPS_DIR)\PortableApps.comLauncher\PortableApps.comLauncherGenerator.exe \
-		$(MAKEDIR)\$(PROGRAM_PORTABLE)
-
-appbinaries: applauncher
-	xcopy $(TOPDIR)\wireshark-qt-release $(WIRESHARK_DIR) /D /I /E /Y /exclude:xcopy-deploy-exclude.txt
-	xcopy $(TOPDIR)\capinfos.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\captype.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\dumpcap.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\editcap.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\mergecap.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\randpkt.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\reordercap.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\rawshark.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\text2pcap.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\tfshark.exe $(WIRESHARK_DIR) /d
-	xcopy $(TOPDIR)\tshark.exe $(WIRESHARK_DIR) /d
-
-source: dirs
-	$(COPY) readme.txt $(SOURCE) $(COPY_FLAGS)
-	$(TEXTIFY) -Destination $(SOURCE) \
-                $(TOPDIR)/COPYING \
-                $(TOPDIR)/NEWS \
-                $(TOPDIR)/README.windows
-
-$(PAPPS_PACKAGE) : dirs appinfo appbinaries source
-!IFDEF PORTABLEAPPS_DIR
-	$(PORTABLEAPPS_DIR)\PortableApps.comInstaller\PortableApps.comInstaller.exe \
-		$(MAKEDIR)\$(PROGRAM_PORTABLE)
-!ELSE
-!MESSAGE PORTABLEAPPS_DIR not configured in config.nmake. Skipping.
-!ENDIF
-
-clean:
-	cd ..
-	$(MAKE) -f Makefile.nmake $@
-	cd portableapps
-	rm -rf $(STAGING_DIR)
-	rm -rf appinfo.ini
-	rm -rf $(PAPPS_PACKAGE)
-	rm -rf *~ *.*~
-
-distclean:	clean
-	rm -rf WiresharkPortable*.paf.exe
-
-maintainer-clean:	distclean
diff --git a/packaging/wix/CMakeLists.txt b/packaging/wix/CMakeLists.txt
index 9d14c0ee62..1f8281e20c 100644
--- a/packaging/wix/CMakeLists.txt
+++ b/packaging/wix/CMakeLists.txt
@@ -386,8 +386,7 @@ macro( ADD_WIX_PACKAGE_TARGET )
 	)
 	set_target_properties(wix_package_prep PROPERTIES FOLDER "Packaging")
 
-	# Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix to match
-	# the NMake environment for now.
+	# Dump the installer into ${CMAKE_CURRENT_SOURCE_DIR}/packaging/wix
 	# Note that executables and DLLs *must* be built separately
 	add_custom_target(wix_package
 		COMMAND ${WIX_CANDLE_EXECUTABLE} ${WIX_CANDLE_DEFINES} ${WIX_SOURCE_FILES}