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

get rid of the COMMON_FILES_GNU setting, 

by getting the DLL's from the "source tree"

svn path=/trunk/; revision=9415
This commit is contained in:
Ulf Lamping 2003-12-22 21:41:40 +00:00
parent 9499f200a6
commit f86e376f5b
3 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.nmake
View File

@ -1,4 +1,4 @@
# $Id: config.nmake,v 1.69 2003/12/22 21:34:13 ulfl Exp $
# $Id: config.nmake,v 1.70 2003/12/22 21:39:41 ulfl Exp $
VERSION=0.10.0
#
@ -87,7 +87,17 @@ ADNS_DIR=C:\ethereal-win32-libs\adns-1.0-win32-01
#
PCRE_DIR=C:\ethereal-win32-libs\pcre-4.4
COMMON_FILES_GNU=c:\program files\common files\gnu
#
# Set ICONV_DIR to the pathname of the directory in which the
# ICONV include files and library resides.
#
ICONV_DIR=C:\ethereal-win32-libs\libiconv-1.9.1.bin.woe32
#
# Set GETTEXT_DIR to the pathname of the directory in which the
# GETTEXT include files and library resides.
#
GETTEXT_DIR=C:\ethereal-win32-libs\gettext-runtime-0.12.1.bin.woe32
LOCAL_CFLAGS=-Zi
LOCAL_LDFLAGS=/DEBUG

23
packaging/nsis/Makefile.nmake
View File

@ -1,5 +1,5 @@
#
# $Id: Makefile.nmake,v 1.30 2003/12/18 19:01:29 guy Exp $
# $Id: Makefile.nmake,v 1.31 2003/12/22 21:41:40 ulfl Exp $
#
# NSIS is a free packager/installer/uninstaller program for Win32.
# It was originally written for the Winamp package, but various
@ -46,11 +46,24 @@ ethereal-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES)
$(MAKENSIS) \
!IF "$(GTK_VERSION)" == "2.0"
/DGTK2 \
/DGTK_DIR=$(GTK_DIR) \
!ENDIF
/DVERSION=$(VERSION) /DWTAP_VERSION=$(WTAP_VERSION) \
/DCOMMON_FILES_GNU=$(COMMON_FILES_GNU) /DNET_SNMP_DIR=$(NET_SNMP_DIR) \
/DPCRE_DIR=$(PCRE_DIR) ethereal.nsi
/DGTK_DIR=$(GTK_DIR) \
/DGLIB_DIR=$(GLIB_DIR) \
/DICONV_DIR=$(ICONV_DIR) \
/DGETTEXT_DIR=$(GETTEXT_DIR) \
/DVERSION=$(VERSION) \
/DWTAP_VERSION=$(WTAP_VERSION) \
/DNET_SNMP_DIR=$(NET_SNMP_DIR) \
!IF "$(ADNS_DIR)" != ""
/DADNS_DIR=$(ADNS_DIR) \
!ENDIF
!IF "$(PCRE_DIR)" != ""
/DPCRE_DIR=$(PCRE_DIR) \
!ENDIF
!IF "$(ZLIB_DIR)" != ""
/DZLIB_DIR=$(ZLIB_DIR) \
!ENDIF
ethereal.nsi
clean:
rm -f ethereal-setup-$(VERSION).exe

30
packaging/nsis/ethereal.nsi
View File

@ -1,7 +1,7 @@
;
; ethereal.nsi
;
; $Id: ethereal.nsi,v 1.34 2003/12/22 07:57:43 ulfl Exp $
; $Id: ethereal.nsi,v 1.35 2003/12/22 21:41:40 ulfl Exp $
; ============================================================================
; Header configuration
@ -71,19 +71,25 @@ SetShellVarContext all
SetOutPath $INSTDIR
File "..\..\wiretap\wiretap-${WTAP_VERSION}.dll"
File "${COMMON_FILES_GNU}\iconv.dll"
File "${COMMON_FILES_GNU}\libglib-2.0-0.dll"
File "${COMMON_FILES_GNU}\libgmodule-2.0-0.dll"
File "${COMMON_FILES_GNU}\libgobject-2.0-0.dll"
File "${COMMON_FILES_GNU}\intl.dll"
File "${COMMON_FILES_GNU}\zlib1.dll"
File "${COMMON_FILES_GNU}\adns_dll.dll"
File "${COMMON_FILES_GNU}\pcre.dll"
File "${GLIB_DIR}\bin\libglib-2.0-0.dll"
File "${GLIB_DIR}\bin\libgmodule-2.0-0.dll"
File "${GLIB_DIR}\bin\libgobject-2.0-0.dll"
File "${ICONV_DIR}\bin\iconv.dll"
File "${GETTEXT_DIR}\bin\intl.dll"
!ifdef ZLIB_DIR
File "${ZLIB_DIR}\zlib1.dll"
!endif
!ifdef ADNS_DIR
File "${ADNS_DIR}\adns_win32\LIB\adns_dll.dll"
!endif
!ifdef PCRE_DIR
File "${PCRE_DIR}\bin\pcre.dll"
File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt"
!endif
File "..\..\FAQ"
File "..\..\README"
File "..\..\README.win32"
File "..\..\manuf"
File "${PCRE_DIR}\man\cat3\pcrepattern.3.txt"
;
; Install the Diameter DTD and XML files in the "diameter" subdirectory
@ -117,8 +123,8 @@ File "..\..\ethereal.exe"
File "..\..\doc\ethereal.html"
File "..\..\doc\ethereal-filter.html"
!ifndef GTK2
File "${COMMON_FILES_GNU}\libgtk-0.dll"
File "${COMMON_FILES_GNU}\libgdk-0.dll"
File "${GTK_DIR}\lib\libgtk-0.dll"
File "${GTK_DIR}\lib\libgdk-0.dll"
!else
File "${GTK_DIR}\bin\libgdk-win32-2.0-0.dll"
File "${GTK_DIR}\bin\libgdk_pixbuf-2.0-0.dll"