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.

svn path=/trunk/; revision=10976

2 files changed, 23 insertions, 12 deletions

diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake
index 10d2672997..4748a599b9 100644
--- 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 8d6dad5e03..2c683f9645 100644
--- 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"