From Lars Roland: define an "installation" version of GTK+ 2.x and Pango

in "config.nmake", and use that in the NSIS script when generating the
NSIS installer, so it puts GTK+ and Pango in the appropriate
subdirectories.  Also, when uninstalling, remove both of the sets of
subdirectories.

As per his suggestion, get rid of the "GTK1_VERSION" and "GTK2_VERSION"
macros, and just directly insert the values where those macros were used
- "GTK1_VERSION" wasn't used at all, and "GTK2_VERSION" was only used
immediately below where it was defined, and stuff elsewhere, such as in
the NSIS script, didn't use them and would break if you changed them
anyway.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@10976 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/config.nmake b/config.nmake
index f1ed3036a816068828aa18b41eb5e2c05c6ecd48..618c31674c3b9cde0fac8c694bb09380235cb198 100644 (file)
--- a/config.nmake
+++ b/config.nmake
@@ -1,4 +1,4 @@
-# $Id: config.nmake,v 1.88 2004/05/13 03:34:14 gerald Exp $
+# $Id: config.nmake,v 1.89 2004/05/23 22:21:30 guy Exp $
 
 VERSION=0.10.4
 #
@@ -56,6 +56,13 @@ GLIB_DIR=$(ETHEREAL_LIBS)\glib
 GTK1_DIR=$(ETHEREAL_LIBS)\gtk+
 #GTK2_DIR=$(ETHEREAL_LIBS)\gtk2
 
+# Declare the version of your gtk2 and pango. (MAJOR + MINOR Version number
+# but without MICRO version number) 
+# These macros are used by the nsis installer script.
+#
+GTK2_INST_VERSION=2.2
+PANGO_INST_VERSION=1.2
+
 #
 # If you have GTK-Wimp, set this to the pathname of the directory in
 # which the files are stored.
@@ -187,7 +194,6 @@ GLIB_LIBS=$(GLIB_DIR)\lib\glib-$(GLIB_VERSION).lib \
        $(GLIB_DIR)\lib\gobject-$(GLIB_VERSION).lib
 
 # GTK+ 1.3
-GTK1_VERSION=1.3
 GTK1_CFLAGS=$(GLIB_CFLAGS) /I$(GTK1_DIR)\include /I$(GTK1_DIR)\include\gdk \
        /I$(GTK1_DIR)\lib\gtk+\include
 GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
@@ -195,18 +201,16 @@ GTK1_LIBS=$(GTK1_DIR)\lib\gtk.lib \
        $(GLIB_LIBS)
 
 # GTK+ 2.x
-GTK2_VERSION=2.0
-GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-$(GTK2_VERSION) \
-       /I$(GTK2_DIR)\lib\gtk-$(GTK2_VERSION)\include \
+GTK2_CFLAGS=$(GLIB_CFLAGS) /I$(GTK2_DIR)\include\gtk-2.0 \
+       /I$(GTK2_DIR)\lib\gtk-2.0\include \
        /I$(GTK2_DIR)\include\atk-1.0 \
        /I$(GTK2_DIR)\include\pango-1.0
-GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-$(GTK2_VERSION).lib \
-       $(GTK2_DIR)\lib\gdk-win32-$(GTK2_VERSION).lib \
-       $(GTK2_DIR)\lib\gdk_pixbuf-$(GTK2_VERSION).lib \
+GTK2_LIBS=$(GTK2_DIR)\lib\gtk-win32-2.0.lib \
+       $(GTK2_DIR)\lib\gdk-win32-2.0.lib \
+       $(GTK2_DIR)\lib\gdk_pixbuf-2.0.lib \
        $(GTK2_DIR)\lib\pango-1.0.lib \
        $(GLIB_LIBS)
 
-
 !IFDEF WINPCAP_VERSION
 # Nmake uses carets to escape special characters
 WINPCAP_CONFIG=^#define HAVE_LIBPCAP 1

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 10d2672997aaba08b8b08bbb4bccb29f738f22f1..4748a599b9eb38ab346832bde80b7478fbd385d9 100644 (file)
--- a/packaging/nsis/Makefile.nmake
+++ b/packaging/nsis/Makefile.nmake
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.nmake,v 1.41 2004/05/13 20:54:39 obiot Exp $
+# $Id: Makefile.nmake,v 1.42 2004/05/23 22:21:30 guy Exp $
 #
 # NSIS is a free packager/installer/uninstaller program for Win32.
 # It was originally written for the Winamp package, but various
@@ -97,6 +97,8 @@ $(DEST)-setup-$(VERSION).exe : ethereal.nsi $(DELIVERABLES) Makefile.nmake
 !ENDIF
 !IFDEF GTK2_DIR
        /DGTK2_DIR=$(GTK2_DIR) \
+       /DGTK2_INST_VERSION=$(GTK2_INST_VERSION) \
+       /DPANGO_INST_VERSION=$(PANGO_INST_VERSION) \
 !ENDIF 
 !IFDEF GTK_WIMP_DIR
        /DGTK_WIMP_DIR=$(GTK_WIMP_DIR) \

diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index 8d6dad5e03966213f756852f7e405a00914caac3..2c683f9645aaa672ed0838e839a50cd0b3d54df0 100644 (file)
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -1,7 +1,7 @@
 ;
 ; ethereal.nsi
 ;
-; $Id: ethereal.nsi,v 1.55 2004/05/21 17:31:16 ulfl Exp $
+; $Id: ethereal.nsi,v 1.56 2004/05/23 22:21:30 guy Exp $
 
  
 !ifdef MAKENSIS_MODERN_UI
@@ -226,16 +226,15 @@ File "${GTK2_DIR}\bin\libatk-1.0-0.dll"
 File "${GTK2_DIR}\bin\libpango-1.0-0.dll"
 File "${GTK2_DIR}\bin\libpangowin32-1.0-0.dll"
 SetOutPath $INSTDIR\etc\gtk-2.0
-File "${GTK2_DIR}\etc\gtk-2.0\gdk-pixbuf.loaders"
-File "${GTK2_DIR}\etc\gtk-2.0\gtk.immodules"
+File "${GTK2_DIR}\etc\gtk-2.0\*.*"
 SetOutPath $INSTDIR\etc\pango
-File "${GTK2_DIR}\etc\pango\pango.modules"
-SetOutPath $INSTDIR\lib\gtk-2.0\2.2.0\loaders
-File "${GTK2_DIR}\lib\gtk-2.0\2.2.0\loaders\libpixbufloader-*.dll"
-SetOutPath $INSTDIR\lib\gtk-2.0\2.2.0\immodules
-File "${GTK2_DIR}\lib\gtk-2.0\2.2.0\immodules\im-*.dll"
-SetOutPath $INSTDIR\lib\pango\1.2.0\modules
-File "${GTK2_DIR}\lib\pango\1.2.0\modules\pango-*.dll"
+File "${GTK2_DIR}\etc\pango\pango.*"
+SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\loaders
+File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_INST_VERSION}.0\loaders\libpixbufloader-*.dll"
+SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\immodules
+File "${GTK2_DIR}\lib\gtk-2.0\${GTK2_INST_VERSION}.0\immodules\im-*.dll"
+SetOutPath $INSTDIR\lib\pango\${PANGO_INST_VERSION}.0\modules
+File "${GTK2_DIR}\lib\pango\${PANGO_INST_VERSION}.0\modules\pango-*.dll"
 
 SectionEnd
 !endif
@@ -243,7 +242,7 @@ SectionEnd
 !ifdef GTK_WIMP_DIR
 Section "GTK-Wimp" SecGTKWimp
 ;-------------------------------------------
-SetOutPath $INSTDIR\lib\gtk-2.0\2.2.0\engines
+SetOutPath $INSTDIR\lib\gtk-2.0\${GTK2_INST_VERSION}.0\engines
 File "${GTK_WIMP_DIR}\libwimp.dll"
 SetOutPath $INSTDIR\share\themes\Default\gtk-2.0
 File "${GTK_WIMP_DIR}\Theme\gtk-2.0\gtkrc"
@@ -387,7 +386,11 @@ Delete "$INSTDIR\etc\pango\*.*"
 Delete "$INSTDIR\lib\gtk-2.0\2.2.0\engines\*.*"
 Delete "$INSTDIR\lib\gtk-2.0\2.2.0\loaders\*.*"
 Delete "$INSTDIR\lib\gtk-2.0\2.2.0\immodules\*.*"
+Delete "$INSTDIR\lib\gtk-2.0\2.4.0\engines\*.*"
+Delete "$INSTDIR\lib\gtk-2.0\2.4.0\loaders\*.*"
+Delete "$INSTDIR\lib\gtk-2.0\2.4.0\immodules\*.*"
 Delete "$INSTDIR\lib\pango\1.2.0\modules\*.*"
+Delete "$INSTDIR\lib\pango\1.4.0\modules\*.*"
 Delete "$INSTDIR\share\themes\Default\gtk-2.0\*.*"
 Delete "$INSTDIR\help\*.*"
 Delete "$INSTDIR\plugins\${VERSION}\*.*"
@@ -414,9 +417,15 @@ RMDir "$INSTDIR\lib\gtk-2.0\2.2.0\engines"
 RMDir "$INSTDIR\lib\gtk-2.0\2.2.0\loaders"
 RMDir "$INSTDIR\lib\gtk-2.0\2.2.0\immodules"
 RMDir "$INSTDIR\lib\gtk-2.0\2.2.0"
+RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\engines"
+RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\loaders"
+RMDir "$INSTDIR\lib\gtk-2.0\2.4.0\immodules"
+RMDir "$INSTDIR\lib\gtk-2.0\2.4.0"
 RMDir "$INSTDIR\lib\gtk-2.0"
 RMDir "$INSTDIR\lib\pango\1.2.0\modules"
 RMDir "$INSTDIR\lib\pango\1.2.0"
+RMDir "$INSTDIR\lib\pango\1.4.0\modules"
+RMDir "$INSTDIR\lib\pango\1.4.0"
 RMDir "$INSTDIR\lib\pango"
 RMDir "$INSTDIR\lib"
 RMDir "$INSTDIR\share\themes\Default\gtk-2.0"