From 6baa1b544c84a766d9f9d356e9940eccaf0a128f Mon Sep 17 00:00:00 2001 From: Pascal Quantin Date: Wed, 8 Jun 2016 15:57:00 +0200 Subject: Remove Nmake build system MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I3bd474f3cda9667dec66426b5729449953df3e61 Reviewed-on: https://code.wireshark.org/review/15777 Petri-Dish: Pascal Quantin Tested-by: Petri Dish Buildbot Reviewed-by: Jörg Mayer Reviewed-by: Balint Reczey --- packaging/nsis/CMakeLists.txt | 15 +- packaging/nsis/Custom.nmake | 6 - packaging/nsis/Makefile.am | 2 - packaging/nsis/Makefile.nmake | 312 ------------------------------------------ packaging/nsis/wireshark.nsi | 2 +- 5 files changed, 3 insertions(+), 334 deletions(-) delete mode 100644 packaging/nsis/Custom.nmake delete mode 100644 packaging/nsis/Makefile.nmake (limited to 'packaging/nsis') 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 -- cgit v1.2.1