diff pidgin/win32/nsis/pidgin-installer.nsi @ 29911:c65c406d0d8d

The rest of the plumbing needed to build the GTK+ Runtime zip included in the installer
author Daniel Atallah <daniel.atallah@gmail.com>
date Mon, 01 Mar 2010 14:41:17 +0000
parents 996eb83a1162
children daa02d44df13
line wrap: on
line diff
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Mon Mar 01 04:29:18 2010 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Mon Mar 01 14:41:17 2010 +0000
@@ -28,6 +28,7 @@
 ShowInstDetails show
 ShowUninstDetails show
 SetDateSave on
+RequestExecutionLevel highest
 
 ; $name and $INSTDIR are set in .onInit function..
 
@@ -340,7 +341,7 @@
 !ifdef OFFLINE_INSTALLER
 
   SetOutPath $PLUGINSDIR
-  File /oname=gtk.zip "..\..\..\..\gtk_installer\gtk-runtime-${GTK_INSTALL_VERSION}.zip"
+  File /oname=gtk.zip ".\gtk-runtime-${GTK_INSTALL_VERSION}.zip"
 
 !else
 
@@ -356,6 +357,9 @@
 
 !endif
 
+  ;Delete the old Gtk directory
+  RMDir /r "$INSTDIR\Gtk"
+
   SetOutPath "$INSTDIR"
   nsisunz::UnzipToLog $R1 "$INSTDIR"
   Pop $R0