[Gaim-commits] SF.net SVN: gaim: [18156] trunk

[<dat...@us...>]

Revision: 18156
          http://svn.sourceforge.net/gaim/?rev=18156&view=rev
Author:   datallah
Date:     2007-01-18 09:41:47 -0800 (Thu, 18 Jan 2007)

Log Message:
-----------
Have the wingaim installer read the GTK version to be installed from the installer "source" instead of maintaining the version in the installer script and having to update it.

Modified Paths:
--------------
    trunk/Makefile.mingw
    trunk/gaim-installer.nsi

Modified: trunk/Makefile.mingw
===================================================================
--- trunk/Makefile.mingw	2007-01-18 13:30:17 UTC (rev 18155)
+++ trunk/Makefile.mingw	2007-01-18 17:41:47 UTC (rev 18156)
@@ -31,6 +31,11 @@
     exit; \
 }' VERSION)
 
+GTK_INSTALL_VERSION = $(shell \
+  source ../gtk_installer/version.sh; \
+  echo $$gtk_version \
+)
+
 # Any *.dll or *.exe files included in win32-install-dir that we don't compile
 # should be included in this list so they don't get stripped
 NON_GAIM_DLLS = \
@@ -70,13 +75,13 @@
 	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec strip --strip-unneeded {} ';'
 
 installer: create_release_install_dir
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DWITH_GTK /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installer_nogtk: create_release_install_dir
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installer_debug: install
-	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG gaim-installer.nsi
+	$(MAKENSIS) /V3 /DGAIM_VERSION="$(GAIM_VERSION)" /DGAIM_PRODUCT_VERSION="$(GAIM_PRODUCT_VERSION)" /DGAIM_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
 
 installers: installer installer_nogtk installer_debug
 

Modified: trunk/gaim-installer.nsi
===================================================================
--- trunk/gaim-installer.nsi	2007-01-18 13:30:17 UTC (rev 18155)
+++ trunk/gaim-installer.nsi	2007-01-18 17:41:47 UTC (rev 18156)
@@ -64,7 +64,6 @@
 !define GAIM_UNINST_EXE				"gaim-uninst.exe"
 
 !define GTK_MIN_VERSION				"2.6.10"
-!define GTK_INSTALL_VERSION			"2.10.6"
 !define GTK_REG_KEY				"SOFTWARE\GTK\2.0"
 !define PERL_REG_KEY				"SOFTWARE\Perl"
 !define PERL_DLL				"perl58.dll"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.