/pidgin/main: 1d3a0e42cb09: Windows: fix prepare script for win6...

Tomasz Wasilczyk twasilczyk at pidgin.im
Mon Nov 25 10:51:57 EST 2013


Changeset: 1d3a0e42cb09e63053e9a75a40cfa75c9ad17d93
Author:	 Tomasz Wasilczyk <twasilczyk at pidgin.im>
Date:	 2013-11-25 16:51 +0100
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/1d3a0e42cb09

Description:

Windows: fix prepare script for win64. A patch provided by TLemur. Fixes #15819

diffstat:

 pidgin/win32/prepare-workspace.sh |  9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diffs (24 lines):

diff --git a/pidgin/win32/prepare-workspace.sh b/pidgin/win32/prepare-workspace.sh
--- a/pidgin/win32/prepare-workspace.sh
+++ b/pidgin/win32/prepare-workspace.sh
@@ -4,12 +4,19 @@
 #
 # Written by Tomek Wasilczyk <tomkiewicz at cpw.pidgin.im>, licensed under GNU GPL
 
+PLATFORM=`uname -m`
+
 # configuration
 
 BONJOUR_GUID_PACKED="5CA28B3B1DEA7654999C464610C010EB 2EA34582882FE334694F0BCD7D8DE336"
 ACTIVEPERL_GUID_PACKED="BC98F31FB8440B94CB3674649419766C 547A2C684F806164DB756F228DAB5840 5E7EC16051106BB43818746C209BC8D7"
 PERL_DIR_FALLBACK="/cygdrive/c/Perl/bin"
-NSIS_DIR_REGKEY="HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@"
+if [ "$PLATFORM" == "x86_64" ]; then
+       NSIS_DIR_REGKEY="HKEY_LOCAL_MACHINE/SOFTWARE/Wow6432Node/NSIS/@"
+else
+       NSIS_DIR_REGKEY="HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@"
+fi
+
 
 DEBUG_SKIP_DOWNLOADING=0
 DEBUG_SKIP_INSTALL=0



More information about the Commits mailing list