Mercurial > pidgin.yaz
changeset 15364:d9ef62fb7e7b
[gaim-migrate @ 18156]
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.
committer: Tailor Script <tailor@pidgin.im>
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Thu, 18 Jan 2007 17:41:47 +0000 |
parents | 6945eb35fba5 |
children | bb8b9d5604cb |
files | Makefile.mingw gaim-installer.nsi |
diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.mingw Thu Jan 18 13:30:17 2007 +0000 +++ b/Makefile.mingw Thu Jan 18 17:41:47 2007 +0000 @@ -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
--- a/gaim-installer.nsi Thu Jan 18 13:30:17 2007 +0000 +++ b/gaim-installer.nsi Thu Jan 18 17:41:47 2007 +0000 @@ -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"