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

Add a deprecation warning to config.nmake. 

Add a deprecation warning to config.nmake which can be disabled by setting
YES_I_KNOW_ABOUT_THE_DEPRECATION. Note that it will become a warning at
some point in the future.

Make a list of files that will be removed or updated in Makefile.nmake.

Change-Id: I50d68eb3dea1bf5baee1e8a90d007c06d3aa1fa3
Reviewed-on: https://code.wireshark.org/review/14591
Reviewed-by: Gerald Combs <gerald@wireshark.org>
This commit is contained in:
Gerald Combs 2016-03-23 08:45:36 -07:00
parent 162df2509c
commit b48fc66cbc
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Makefile.nmake
View File

@ -7,6 +7,24 @@
include config.nmake
include <win32.mak>
##### Deprecation #####
# Support for NMake and QMake will be removed in June 2016. Removal includes
# the following files:
#
# Makefile.nmake in the top level and most subdirectories.
# Makefile.nmake.inc
# config.nmake
# epan/dissectors/asn1/Makefile.inc.nmake
# epan/dissectors/asn1/Makefile.preinc.nmake
# packaging/nsis/Custom.nmake
# plugins/*/moduleinfo.nmake
# tools/native-nmake.cmd
# tools/win-setup.sh
#
# Additionally, the following files reference the nmake environment:
# make-version.pl
# The autotools 'dist' target
############### no need to modify below this line #########
CC = cl

13
config.nmake
View File

@ -1,6 +1,19 @@
# Some more information about the settings in this file can be found in
# the file README.windows and the Developer's Guide (available online).
##### Deprecation #####
# Support for NMake and QMake will be removed in June 2016.
# Uncomment the following line or pass YES_I_KNOW_ABOUT_THE_DEPRECATION=1
# on the command line to override.
#YES_I_KNOW_ABOUT_THE_DEPRECATION=1
!IFNDEF YES_I_KNOW_ABOUT_THE_DEPRECATION
!MESSAGE Nmake is being deprecated. Please consider using CMake instead.
!MESSAGE See https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html
!MESSAGE for details.
!ERROR Set YES_I_KNOW_ABOUT_THE_DEPRECATION to disable this message.
!ENDIF
##### Program name #####
# Changing the name is experimental and may break the installer/uninstaller and possibly other stuff.
# Application data will still be under the same dir as Wireshark so preference files, profiles, and etc