diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-12 22:33:35 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2015-04-12 21:30:54 +0000 |
| commit | 0c700d895898e629dbf747716d62fadcde5f187f (patch) | |
| tree | b45f3d4791b65ac04ab176a2111b7a4c2b9649c8 | |
| parent | c0d94c2a75adff93fc0307946e88081332dd28fd (diff) | |
| download | wireshark-0c700d895898e629dbf747716d62fadcde5f187f.tar.gz | |
Windows: fix generation of PortableApps.com installer
Change-Id: I249268ce21ddfbdc7f149609a950736b4fe2ae07
Reviewed-on: https://code.wireshark.org/review/8036
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
| -rw-r--r-- | Makefile.nmake | 2 | ||||
| -rw-r--r-- | packaging/portableapps/Makefile.nmake | 2 | ||||
| -rw-r--r-- | ui/qt/Wireshark.pro | 15 |
3 files changed, 18 insertions, 1 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index ec82c16dcb..92581610f7 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -535,6 +535,8 @@ PYTHON = $(PYTHON) MSVC_VARIANT = $(MSVC_VARIANT) MSVCR_DLL = "$(MSVCR_DLL:\=/)" +WIRESHARK_TARGET_PLATFORM = $(WIRESHARK_TARGET_PLATFORM) + QMAKE_CFLAGS *= $(STANDARD_CFLAGS) # NOMINMAX keeps windows.h from defining "min" and "max" via windef.h. # This avoids conflicts with the C++ standard library. diff --git a/packaging/portableapps/Makefile.nmake b/packaging/portableapps/Makefile.nmake index f5add0b0d3..efe08ea07e 100644 --- a/packaging/portableapps/Makefile.nmake +++ b/packaging/portableapps/Makefile.nmake @@ -69,6 +69,7 @@ dirs: #!IFDEF UPX # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\[a-z]*.exe # -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\*.dll +# -$(UPX) $(UPX_FLAGS) $(FILES)\$(APP)\$(WIRESHARK)\extcap\*.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 @@ -98,7 +99,6 @@ applauncher: appinfo appbinaries: applauncher xcopy $(TOPDIR)\wireshark-qt-release $(WIRESHARK_DIR) /D /I /E /Y - xcopy $(TOPDIR)\extcap\androiddump.exe $(WIRESHARK_DIR)\extcap /d xcopy $(TOPDIR)\capinfos.exe $(WIRESHARK_DIR) /d xcopy $(TOPDIR)\captype.exe $(WIRESHARK_DIR) /d xcopy $(TOPDIR)\dumpcap.exe $(WIRESHARK_DIR) /d diff --git a/ui/qt/Wireshark.pro b/ui/qt/Wireshark.pro index 38c04a2bb4..5972a9a11e 100644 --- a/ui/qt/Wireshark.pro +++ b/ui/qt/Wireshark.pro @@ -466,6 +466,8 @@ win32 { ../../epan/libwireshark.dll ../../wiretap/wiretap-$${WTAP_VERSION}.dll ../../wsutil/libwsutil.dll \ $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \ $${GLIB_DIR}/bin/$${INTL_DLL} \ + $${GLIB_DIR}/bin/gspawn-$${WIRESHARK_TARGET_PLATFORM}-helper.exe \ + $${GLIB_DIR}/bin/gspawn-$${WIRESHARK_TARGET_PLATFORM}-helper-console.exe \ $${C_ARES_DIR}/bin/libcares-2.dll $${ZLIB_DIR}/zlib1.dll \ $${GNUTLS_DIR}/bin/libffi-6.dll $${GNUTLS_DIR}/bin/$${GCC_DLL} \ $${GNUTLS_DIR}/bin/libgcrypt-20.dll $${GNUTLS_DIR}/bin/libgmp-10.dll \ @@ -491,6 +493,19 @@ win32 { QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLUGINS_DIR} $(MKDIR) $${PLUGINS_DIR}$$escape_expand(\\n\\t)) QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\\..\\$${INSTALL_DIR}\\plugins\\*.dll $(DESTDIR)plugins$$escape_expand(\\n\\t)) + EXTCAP_DIR = $(DESTDIR)extcap + QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${EXTCAP_DIR} $(MKDIR) $${EXTCAP_DIR}$$escape_expand(\\n\\t)) + EXTRA_EXTCAP_BINFILES = \ + ../../androiddump.exe ../../wiretap/wiretap-$${WTAP_VERSION}.dll ../../wsutil/libwsutil.dll \ + $${GLIB_DIR}/bin/libglib-2.0-0.dll $${GLIB_DIR}/bin/libgmodule-2.0-0.dll \ + $${GLIB_DIR}/bin/$${INTL_DLL} $${ZLIB_DIR}/zlib1.dll \ + $${GNUTLS_DIR}/bin/$${GCC_DLL} $${GNUTLS_DIR}/bin/libgcrypt-20.dll \ + $${GNUTLS_DIR}/bin/$${GPGERROR_DLL} + EXTRA_EXTCAP_BINFILES ~= s,/,\\,g + for(FILE,EXTRA_EXTCAP_BINFILES){ + QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${FILE} $(DESTDIR)extcap$$escape_expand(\\n\\t)) + } + # This doesn't depend on wireshark-gtk2. It also doesn't work. #PLUGINS_IN_PWD=$${IN_PWD} #PLUGINS_OUT_PWD=$${OUT_PWD} |