summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Schierer <lschiere@pidgin.im>2007-10-21 05:02:53 +0000
committerLuke Schierer <lschiere@pidgin.im>2007-10-21 05:02:53 +0000
commit2b675620633bfe564a7f3bb4170c2c2e72d7b219 (patch)
tree35662ef51d9c0df9ed25813b8c564182779405b3
parent968b7b23c580bb57e27de155e86a20e448b45ce6 (diff)
downloadpidgin-2b675620633bfe564a7f3bb4170c2c2e72d7b219.tar.gz
applied changes from 60b78c93bfc38b72c6e9fdde59d0e2507bccc4bd
through 216358713db91ffb0fc0dca95ad096c85290a20f
-rw-r--r--Makefile.mingw19
1 files changed, 13 insertions, 6 deletions
diff --git a/Makefile.mingw b/Makefile.mingw
index f4f1bc3060..764a7ffa27 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -36,6 +36,9 @@ GTK_INSTALL_VERSION = $(shell \
echo $$gtk_version \
)
+STRIPPED_RELEASE_DIR = $(PIDGIN_TREE_TOP)/pidgin-$(PIDGIN_VERSION)-win32bin
+
+
# 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
EXTERNAL_DLLS = \
@@ -71,24 +74,28 @@ install: all $(PIDGIN_INSTALL_DIR)
$(MAKE) -C share -f $(MINGW_MAKEFILE) install
create_release_install_dir: install
- rm -rf $(PIDGIN_INSTALL_DIR).release
- cp -R $(PIDGIN_INSTALL_DIR) $(PIDGIN_INSTALL_DIR).release
- find $(PIDGIN_INSTALL_DIR).release \( -name '*.dll' -o -name '*.exe' \) \
+ rm -rf $(STRIPPED_RELEASE_DIR)
+ cp -R $(PIDGIN_INSTALL_DIR) $(STRIPPED_RELEASE_DIR)
+ find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \
-not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) -exec $(STRIP) --strip-unneeded {} ';'
installer: create_release_install_dir
- $(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+ $(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DWITH_GTK /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /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 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_INSTALL_DIR).release" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
+ $(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" /DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi
mv pidgin/win32/nsis/pidgin*.exe ./
installer_debug: install
$(MAKENSIS) /V3 /DPIDGIN_VERSION="$(PIDGIN_VERSION)" /DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" /DPIDGIN_INSTALL_DIR="$(PIDGIN_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
+installer_zip: create_release_install_dir
+ rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip
+ zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR)
+
+installers: installer installer_nogtk installer_debug installer_zip
Doxyfile.mingw: Doxyfile.in
sed -e "s/@PACKAGE@/pidgin/" -e "s/@VERSION@/$(PIDGIN_VERSION)/" -e "s/@top_srcdir@/$(PIDGIN_TREE_TOP)/g" -e "s/@enable_dot@/NO/" Doxyfile.in > Doxyfile.mingw