diff Makefile.mingw @ 15752:e11859350489

Updates to the win32 installer. It isn't complete yet, but this a good saving point.

--- a/Makefile.mingw	Tue Feb 27 09:06:05 2007 +0000
+++ b/Makefile.mingw	Wed Feb 28 17:27:30 2007 +0000
@@ -10,7 +10,7 @@
 
 # Generate a X.X.X.X version for the installer file versioning header
 # The last digit will be 99 for a final release, 0 for dev or unknown, or the beta number
-GAIM_PRODUCT_VERSION = $(shell \
+PIDGIN_PRODUCT_VERSION = $(shell \
 awk 'BEGIN {FS="."} { \
     if (int($$3) == $$3) { \
         $$4 = "99"; \
@@ -38,7 +38,7 @@
 
 # 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 = \
+EXTERNAL_DLLS = \
 	freebl3.dll \
 	libgtkspell.dll \
 	libmeanwhile-1.dll \
@@ -54,7 +54,7 @@
 	ssl3.dll
 
 #build an expression for `find` to use to ignore the above files
-NON_GAIM_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(NON_GAIM_DLLS))
+EXTERNAL_DLLS_FIND_EXP = $(patsubst %,-o -name %,$(EXTERNAL_DLLS))
 
 .PHONY: all install installer installer_nogtk installer_debug installers clean uninstall create_release_install_dir
 
@@ -72,16 +72,19 @@
 	rm -rf $(GAIM_INSTALL_DIR).release
 	cp -R $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release
 	find $(GAIM_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
-	 -not \( -false $(NON_GAIM_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
+	 -not \( -false $(EXTERNAL_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" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	mv pidgin/win32/nsis/pidgin*.exe ./
 
 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" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" gaim-installer.nsi
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installer_debug: install
-	$(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
+	$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(GAIM_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(GAIM_INSTALL_DIR)" /DDEBUG /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+	mv pidgin/win32/nsis/pidgin*.exe ./
 
 installers: installer installer_nogtk installer_debug
 
@@ -89,7 +92,7 @@
 	$(MAKE) -C $(GAIM_PO_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
 	$(MAKE) -C $(GAIM_GTK_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
 	$(MAKE) -C $(GAIM_LIB_TOP) -f $(GAIM_WIN32_MAKEFILE) clean
-	rm -f $(GAIM_CONFIG_H) VERSION gaim*.exe
+	rm -f $(GAIM_CONFIG_H) VERSION pidgin*.exe
 
 uninstall:
 	rm -rf $(GAIM_INSTALL_PERLMOD_DIR) $(GAIM_INSTALL_PLUGINS_DIR) $(GAIM_INSTALL_PO_DIR) $(GAIM_INSTALL_DIR) $(GAIM_INSTALL_DIR).release