Mercurial > pidgin
comparison Makefile.mingw @ 32740:200a6032d8ec
makensis on Windows now accepts - or / as an argument prefix (since 2.25).
This means that we can just use - directly and not make it configurable.
This will alleviate issues for people using the MSYS shell.
Thanks to renatosilva for this.
Fixes #14960
author | Daniel Atallah <daniel.atallah@gmail.com> |
---|---|
date | Tue, 28 Feb 2012 22:41:57 +0000 |
parents | c43570e34d81 |
children | 2908b16efa07 |
comparison
equal
deleted
inserted
replaced
32739:bba25395d28e | 32740:200a6032d8ec |
---|---|
137 find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \ | 137 find $(STRIPPED_RELEASE_DIR) \( -name '*.dll' -o -name '*.exe' \) \ |
138 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \ | 138 -not \( -false $(EXTERNAL_DLLS_FIND_EXP) \) \ |
139 -exec $(STRIP) --strip-unneeded {} ';' | 139 -exec $(STRIP) --strip-unneeded {} ';' |
140 | 140 |
141 installer: generate_installer_includes | 141 installer: generate_installer_includes |
142 $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi | 142 $(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 |
143 mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./ | 143 mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION).exe ./ |
144 | 144 |
145 installer_offline: generate_installer_includes | 145 installer_offline: generate_installer_includes |
146 $(MAKENSIS) $(MAKENSISOPT)V3 $(MAKENSISOPT)DPIDGIN_VERSION="$(PIDGIN_VERSION)" $(MAKENSISOPT)DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" $(MAKENSISOPT)DOFFLINE_INSTALLER $(MAKENSISOPT)DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" $(MAKENSISOPT)DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi | 146 $(MAKENSIS) -V3 -DPIDGIN_VERSION="$(PIDGIN_VERSION)" -DPIDGIN_PRODUCT_VERSION="$(PIDGIN_PRODUCT_VERSION)" -DOFFLINE_INSTALLER -DPIDGIN_INSTALL_DIR="$(STRIPPED_RELEASE_DIR)" -DGTK_INSTALL_VERSION="$(GTK_INSTALL_VERSION)" pidgin/win32/nsis/pidgin-installer.nsi |
147 mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./ | 147 mv pidgin/win32/nsis/pidgin-$(PIDGIN_VERSION)-offline.exe ./ |
148 | 148 |
149 installer_zip: create_release_install_dir | 149 installer_zip: create_release_install_dir |
150 rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip | 150 rm -f pidgin-$(PIDGIN_VERSION)-win32-bin.zip |
151 zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR) | 151 zip -9 -r pidgin-$(PIDGIN_VERSION)-win32-bin.zip $(STRIPPED_RELEASE_DIR) |