Try copying our plugins to an accessible directory. This assumes you've set

WIRESHARK_RUN_FROM_BUILD_DIRECTORY in your run environment.

On Windows, generate a QMake include file (config.pri) from config.nmake.

svn path=/trunk/; revision=40600
This commit is contained in:
Gerald Combs 2012-01-20 01:10:40 +00:00
parent 41c54f9e5d
commit 0829150550
2 changed files with 35 additions and 15 deletions

View File

@ -390,6 +390,18 @@ config.h : config.h.win32 config.nmake
-e "s/@WANT_PACKET_EDITOR@/$(WANT_PACKET_EDITOR)/" \
< config.h.win32 > $@
ui\qt\config.pri: config.nmake
@echo Creating <<ui\qt\config.pri
VERSION = $(VERSION)
WIRESHARK_LIB_DIR = $(WIRESHARK_LIB_DIR)
GLIB_DIR = $(GTK_DIR)
C_ARES_DIR = $(C_ARES_DIR)
ZLIB_DIR = $(ZLIB_DIR)
GNUTLS_DIR = $(GNUTLS_DIR)
SMI_DIR = $(SMI_DIR)
KFW_DIR = $(KFW_DIR)
LUA_DIR = $(LUA_DIR)
<<KEEP
ps.c: tools\rdps.py print.ps
$(PYTHON) tools\rdps.py print.ps ps.c

View File

@ -21,14 +21,12 @@ unix {
}
# XXX We need to figure out how to pull this in from config.nmake.
win32:WIRESHARK_LIB_DIR = c:/wireshark-win32-libs
win32:GLIB_DIR = $${WIRESHARK_LIB_DIR}/gtk2
win32:C_ARES_DIR = $${WIRESHARK_LIB_DIR}/c-ares-1.7.1-win32ws
win32:ZLIB_DIR = $${WIRESHARK_LIB_DIR}/zlib125
win32:GNUTLS_DIR = $${WIRESHARK_LIB_DIR}/gnutls-2.10.3-1.11-win32ws
win32:SMI_DIR = $${WIRESHARK_LIB_DIR}/libsmi-svn-40773-win32ws
win32:KFW_DIR = $${WIRESHARK_LIB_DIR}/kfw-3-2-2-i386-ws-vc6
win32:LUA_DIR = $${WIRESHARK_LIB_DIR}/lua5.1.4
win32 {
!include( config.pri ) {
error(Can't find config.pri. Have you run "nmake -f Makefile.nmake" two directories up?)
}
}
INCLUDEPATH += ../.. ../../wiretap
win32:INCLUDEPATH += \
@ -160,23 +158,23 @@ win32:QMAKE_CFLAGS += $${WIRESHARK_LOCAL_CFLAGS}
win32:QMAKE_CXXFLAGS += $${WIRESHARK_LOCAL_CFLAGS}
# http://stackoverflow.com/questions/3984104/qmake-how-to-copy-a-file-to-the-output
unix:!mac {
unix: {
EXTRA_BINFILES = \
../../dumpcap \
../../lib/*.so \
}
unix:!mac {
for(FILE,EXTRA_BINFILES){
QMAKE_POST_LINK += $$quote(cp $${FILE} .$$escape_expand(\n\t))
}
}
# qmake 2.01a / Qt 4.7.0 doesn't set DESTDIR on OS X.
mac {
EXTRA_BINFILES = \
../../dumpcap \
for(FILE,EXTRA_BINFILES){
QMAKE_POST_LINK += $$quote(cp $${FILE} Wireshark.app/Contents/MacOS$$escape_expand(\n\t))
}
}
win32 {
EXTRA_BINFILES = \
../../dumpcap.exe \
@ -193,9 +191,19 @@ win32 {
EXTRA_BINFILES ~= s,/,\\,g
for(FILE,EXTRA_BINFILES){
message("$${DESTDIR_WIN}")
QMAKE_POST_LINK +=$$quote(cmd /c copy /y $${FILE} $(DESTDIR)$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote($(COPY_FILE) $${FILE} $(DESTDIR)$$escape_expand(\n\t))
}
PLUGINS_DIR = $(DESTDIR)\plugins\\$${VERSION}
QMAKE_POST_LINK +=$$quote($(CHK_DIR_EXISTS) $${PLUGINS_DIR} $(MKDIR) $${PLUGINS_DIR}$$escape_expand(\n\t))
QMAKE_POST_LINK +=$$quote($(COPY_FILE) ..\..\wireshark-gtk2\plugins\\$${VERSION}\*.dll $(DESTDIR)\plugins\\$${VERSION}$$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}
#QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)\\..\\..\\plugins$$escape_expand(\n\t))
#QMAKE_POST_LINK +=$$quote(nmake -f Makefile.nmake INSTALL_DIR=$$replace(PLUGINS_OUT_PWD, /, \\)\\$(DESTDIR)$$escape_expand(\n\t))
#QMAKE_POST_LINK +=$$quote(cd $$replace(PLUGINS_IN_PWD, /, \\)$$escape_expand(\n\t))
}
macx:QMAKE_LFLAGS += \