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>

10 files changed, 2 insertions, 329 deletions

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 22beddcd27..9e9f69c5a3 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -59,7 +59,6 @@ EXTRA_DIST = \
 	install_rpms_for_devel.sh			\
 	lex.py						\
 	list_protos_in_cap.sh				\
-	Makefile.nmake					\
 	make-dissector-reg.py				\
 	make-manuf					\
 	make-sminmpec.pl				\
@@ -69,7 +68,6 @@ EXTRA_DIST = \
 	make-usb.py					\
 	make_charset_table.c				\
 	msnchat						\
-	native-nmake.cmd				\
 	ncp2222.py					\
 	netscreen2dump.py				\
 	npl						\
@@ -95,7 +93,6 @@ EXTRA_DIST = \
 	valgrind-wireshark.sh				\
 	vg-suppressions					\
 	win-setup.ps1					\
-	win-setup.sh					\
 	wireshark_be.py					\
 	wireshark_gen.py				\
 	WiresharkXML.py					\
diff --git a/tools/Makefile.nmake b/tools/Makefile.nmake
deleted file mode 100644
index e89f47d045..0000000000
--- a/tools/Makefile.nmake
+++ /dev/null
@@ -1,31 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-
-all: lemon
-
-clean-local:
-	rm -f *.pyc
-
-clean:  clean-local
-	cd lemon
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean
-	cd ..
-
-distclean-local: clean-local
-
-distclean: distclean-local
-	cd lemon
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake distclean
-	cd ..
-
-maintainer-clean-local: distclean-local
-
-maintainer-clean: maintainer-clean-local
-	cd lemon
-	$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake maintainer-clean
-	cd ..
-
-lemon::
-	cd lemon
-	..\native-nmake $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
-	cd ..
diff --git a/tools/delete_includes.py b/tools/delete_includes.py
index 20cdf6f1dd..249b722668 100755
--- a/tools/delete_includes.py
+++ b/tools/delete_includes.py
@@ -41,7 +41,7 @@ if lastdir == 'tools':
 
 # Make command depends upon platform.
 if sys.platform.startswith('win'):
-    default_make_command = ['nmake', '-f', 'Makefile.nmake']
+    default_make_command = ['msbuild', '/m', '/p:Configuration=RelWithDebInfo', 'Wireshark.sln']
 else:
     default_make_command = ['make']
 
diff --git a/tools/lemon/Makefile.am b/tools/lemon/Makefile.am
index 605f0744fb..476f844608 100644
--- a/tools/lemon/Makefile.am
+++ b/tools/lemon/Makefile.am
@@ -48,6 +48,5 @@ EXTRA_DIST = \
 	lemonflex-head.inc	\
 	lemonflex-tail.inc	\
 	lempar.c		\
-	Makefile.nmake		\
 	README			\
 	CMakeLists.txt
diff --git a/tools/lemon/Makefile.nmake b/tools/lemon/Makefile.nmake
deleted file mode 100644
index fe9ff34442..0000000000
--- a/tools/lemon/Makefile.nmake
+++ /dev/null
@@ -1,19 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-
-include ..\..\config.nmake
-
-CFLAGS=$(WARNINGS_ARE_ERRORS) -I..\..\ $(LOCAL_CFLAGS)
-
-.c.obj::
-	$(CC) $(CFLAGS) -Fd.\ -c $<
-
-all : lemon.exe
-
-clean:
-	rm -f lemon.obj lemon.exe lemon.ilk *.nativecodeanalysis.xml *.pdb *.sbr lemon.exe.manifest
-
-distclean: clean
-
-maintainer-clean: distclean
diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py
index 947b581a6e..38efc15976 100755
--- a/tools/make-dissector-reg.py
+++ b/tools/make-dissector-reg.py
@@ -48,8 +48,7 @@ elif registertype in ("dissectors", "dissectorsinfile"):
  * Do not modify this file. Changes will be overwritten.
  *
  * Generated automatically by the "register.c" target in
- * epan/dissectors/Makefile or Makefile.nmake using
- * %s
+ * epan/dissectors/Makefile using %s
  * and information in epan/dissectors/register-cache.pkl.
  *
  * You can force this file to be regenerated completely by deleting
diff --git a/tools/native-nmake.cmd b/tools/native-nmake.cmd
deleted file mode 100755
index 5d95c9a7a1..0000000000
--- a/tools/native-nmake.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-@echo off
-
-rem 
-set WIRESHARK_TARGET_PLATFORM=
-
-if NOT DEFINED VCINSTALLDIR goto RUN_NMAKE
-
-if NOT EXIST "%VCINSTALLDIR%\vcvarsall.bat" goto RUN_NMAKE
-
-call "%VCINSTALLDIR%\vcvarsall.bat"
-
-:RUN_NMAKE
-%1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/tools/tpg/Makefile.am b/tools/tpg/Makefile.am
index 52ceac1e60..b937b50735 100644
--- a/tools/tpg/Makefile.am
+++ b/tools/tpg/Makefile.am
@@ -37,7 +37,6 @@ EXTRA_DIST = \
 	V2P.pl			\
 	TPG.pm			\
 	tpg.pl			\
-	Makefile.nmake		\
 	README
 
 TPG.pm: tpg.yp
diff --git a/tools/tpg/Makefile.nmake b/tools/tpg/Makefile.nmake
deleted file mode 100644
index 214b9f767e..0000000000
--- a/tools/tpg/Makefile.nmake
+++ /dev/null
@@ -1,14 +0,0 @@
-## Makefile for building wireshark.exe with Microsoft C and nmake
-## Use: $(MAKE) /$(MAKEFLAGS) -f makefile.nmake
-#
-
-include ..\..\config.nmake
-
-all : TPG.pm
-
-clean:
-	rm -f TPG.pm tpg.output
-
-distclean: clean
-
-maintainer-clean: distclean
diff --git a/tools/win-setup.sh b/tools/win-setup.sh
deleted file mode 100755
index 023975f134..0000000000
--- a/tools/win-setup.sh
+++ /dev/null
@@ -1,244 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2013 Gerald Combs <gerald@wireshark.org>
-#
-# Wireshark - Network traffic analyzer
-# By Gerald Combs <gerald@wireshark.org>
-# Copyright 1998 Gerald Combs
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# The cygwin version of bash has an option to ignore the extra CR at
-# the end of a script line that would cause an error otherwise. Use this
-# option if supported.
-# Note: The following line must be the first non-comment line
-(set -o igncr) 2>/dev/null && set -o igncr; # comment is needed as well
-
-err_exit () {
-	echo ""
-	echo "ERROR: $1"
-	shift
-	for str in "$@" ; do
-		echo "$str"
-	done
-	echo ""
-	exit 1
-}
-
-usage () {
-	echo "Usage:"
-	echo "	$0 --appverify <appname> [<appname>] ..."
-	echo "  $0 --libverify <destination> <subdirectory> <package>"
-	echo "	$0 --download  <destination> <subdirectory> <package> <tag> <platform>"
-	echo "	$0 --settag    <destination> <tag>"
-	echo "	$0 --checktag  <destination> <tag>"
-	echo ""
-	exit 1
-}
-
-# Try to find our proxy settings, and set http_proxy/use_proxy accordingly.
-find_proxy() {
-	# Someone went to the trouble of configuring wget.
-	if grep "^use_proxy *= *on" $HOME/.wgetrc > /dev/null 2>&1 ; then
-		return
-	fi
-
-	# ...and wget can't fetch two registry keys because...?
-	proxy_enabled=$(regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyEnable 2>/dev/null | tr -d '\012')
-	#
-	# Bash's test command appears not to use short-circuit evaluation,
-	# so
-	#
-	#	-n "$proxy_enabled" -a "$proxy_enabled" -ne 0
-	#
-	# causes a complaint if "$proxy_enabled" is an empty string -
-	# the first test fails, but the second test is done anyway,
-	# and generates a complaint about the LHS of -ne not being
-	# numeric.  Therefore, we do the tests separately.
-	#
-	if [ -n "$proxy_enabled" ] ; then
-		if [ "$proxy_enabled" -ne 0 ] ; then
-			export http_proxy=$(regtool get /HKCU/Software/Microsoft/Windows/CurrentVersion/Internet\ Settings/ProxyServer 2>/dev/null)
-			echo "Using Internet Explorer proxy settings."
-		fi
-	fi
-
-	if [ -z "$http_proxy" -a -z "$HTTP_PROXY" ] ; then
-		echo "No HTTP proxy specified (http_proxy and HTTP_PROXY are empty)."
-		# a proxy might also be specified using .wgetrc, so don't switch off the proxy
-		#use_proxy="-Y off"
-		return
-	fi
-
-	# We found a proxy somewhere
-	use_proxy="-Y on"
-	if [ -z "$http_proxy" ] ; then
-		echo "HTTP proxy ($HTTP_PROXY) has been specified and will be used."
-		export http_proxy=$HTTP_PROXY
-	else
-		echo "HTTP proxy ($http_proxy) has been specified and will be used."
-	fi
-}
-
-# Main
-TAG_FILE="current_tag.txt"
-if [ -z "$*" ] ; then
-	usage
-fi
-case "$1" in
---appverify)
-	shift
-	if [ -z "$*" ] ; then
-		usage
-	fi
-
-	echo "Checking for required applications:"
-	which which > /dev/null 2>&1 || \
-		err_exit "Can't find 'which'.  Unable to proceed."
-
-	MISSING_APPS=
-	PATH_RE=""
-	for APP in $* ; do
-
-		case "$APP" in
-			--windowsonly)
-				PATH_RE="^/cygdrive/.*/"
-				continue
-				;;
-			--cygwinonly)
-				PATH_RE="^/usr/.*/"
-				continue
-				;;
-		esac
-
-		APP_PATH=$(cygpath --unix "$APP")
-		if [ -x "$APP_PATH" -a ! -d "$APP_PATH" ] ; then
-			APP_LOC="$APP_PATH"
-		else
-			APP_LOC=$(which "$APP_PATH" 2> /dev/null)
-		fi
-		echo "$APP_LOC" | grep "$PATH_RE" > /dev/null 2>&1
-		IN_PATH=$?
-		if [ "$APP_LOC" = "" -o $IN_PATH -ne 0 ] ; then
-			MISSING_APPS="$MISSING_APPS $APP"
-		else
-			echo "	$APP: $APP_LOC $res"
-		fi
-
-		PATH_RE=""
-	done
-
-	if [ -n "$MISSING_APPS" ]; then
-		echo
-		echo "Can't find: $MISSING_APPS"
- 		err_exit "These application(s) are either not installed or simply can't be found in the current PATH: $PATH." \
- 		"" "For additional help, please visit:" "    http://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html"
-	fi
-	;;
---libverify)
-	if [ -z "$2" -o -z "$3" -o -z "$4" ] ; then
-		usage
-	fi
-	DEST_PATH=$(cygpath "$2")
-	PACKAGE_PATH=$4
-	PACKAGE=$(basename "$PACKAGE_PATH")
-	if [ ! -e "$DEST_PATH/$PACKAGE" ] ; then
-		err_exit "Package $PACKAGE is needed but is apparently not downloaded; 'nmake -f ... setup' required ?"
-	fi
-	;;
---download)
-	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"
-	fi
-	# DOWNLOAD_PREFIX MUST be in the form
-	#   http://anonsvn.wireshark.org/wireshark-win32-libs/tags/<date>/packages
-	# or
-	#   http://anonsvn.wireshark.org/wireshark-win64-libs/tags/<date>/packages
-	# or
-	#   /packages to test uploads before creating the tag.
-	#DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/trunk/packages"
-	DOWNLOAD_PREFIX="http://anonsvn.wireshark.org/wireshark-$WIRESHARK_TARGET_PLATFORM-libs/tags/$DOWNLOAD_TAG/packages"
-
-	PACKAGE=$(basename "$PACKAGE_PATH")
-	echo ""
-	echo "****** $PACKAGE ******"
-	find_proxy
-	echo "Downloading $4 into '$DEST_PATH', installing into $3"
-	if [ ! -d "$DEST_PATH/$DEST_SUBDIR" ] ; then
-		mkdir -p "$DEST_PATH/$DEST_SUBDIR" || \
-			err_exit "Can't create '$DEST_PATH/$DEST_SUBDIR'"
-	fi
-	cd "$DEST_PATH" || err_exit "Can't find '$DEST_PATH'"
-	PKG_PATH="$PWD"
-	wget $use_proxy -nc "$DOWNLOAD_PREFIX/$PACKAGE_PATH" || \
-		err_exit "Can't download $DOWNLOAD_PREFIX/$PACKAGE_PATH"
-	cd "$DEST_SUBDIR" || err_exit "Can't find $DEST_SUBDIR"
-	echo "Extracting '$PKG_PATH/$PACKAGE' into '$PKG_PATH/$DEST_SUBDIR'"
-	if [[ "$PACKAGE" == *.zip ]] ; then
-		unzip -oq "$PKG_PATH/$PACKAGE" ||
-			err_exit "Couldn't unpack '$PKG_PATH/$PACKAGE'"
-		echo "Verifying that the DLLs and EXEs in $DEST_SUBDIR are executable."
-		# XX: Note that find will check *all* dlls/exes in DEST_SUBDIR and below
-		#     which may be more than those just unzipped depending upon DEST_SUBDIR.
-		#     This may cause extra repeated checks but will do no harm.
-		for i in $(/usr/bin/find . \( -name '*\.dll' -o -name '*\.exe' \)) ; do
-			if [ ! -x "$i" ] ; then
-				echo "Changing file permissions (add executable bit) to:"
-				echo "$i"
-				chmod a+x "$i"
-			fi
-		done
-	fi
-	;;
---settag)
-	if [ -z "$2"  -o -z "$3" ] ; then
-		usage
-	fi
-	DEST_PATH=$(cygpath "$2")
-	DOWNLOAD_TAG=$3
-	echo "$DOWNLOAD_TAG" > "$DEST_PATH/$TAG_FILE"
-	;;
---checktag)
-	if [ -z "$2" -o -z "$3" ] ; then
-		usage
-	fi
-	DEST_PATH=$(cygpath "$2")
-	WIN_PATH=$(cygpath --windows "$2")
-	DOWNLOAD_TAG=$3
-	LAST_TAG=$(cat "$DEST_PATH/$TAG_FILE" 2> /dev/null)
-	if [ "$DOWNLOAD_TAG" != "$LAST_TAG" ] ; then
-		if [ -z "$LAST_TAG" ] ; then
-			LAST_TAG="(unknown)"
-		fi
-		err_exit \
-			"The contents of '$WIN_PATH\\$TAG_FILE' is $LAST_TAG." \
-			"It should be $DOWNLOAD_TAG."
-	fi
-	;;
-*)
-	usage
-	;;
-esac
-
-exit 0