Updated the Windows installer script for improved detection of XSB.

git-svn-id: http://svn.logtalk.org/logtalk/trunk@6571 ac9c905b-388a-4ddf-9b6a-4063a022bc57

RELEASE_NOTES.txt

@@ -56,9 +56,9 @@ RELEASE NOTES
     customizing the installation directory. Thanks to Daniel Moniz for
     the bug report and Gavin Lambert for diagnosing the bug.
 
-    Updated the Windows installer script to default to install only the
-    per-user files when run by a non-admin user on a computer where Logtalk
-    is already installed.
+    Updated the Windows installer script for improved detection of XSB and to
+    default to install only the per-user files when run by a non-admin user on
+    a computer where Logtalk is already installed.
 
     Added basic support for the LaTeX "listings "package. Added notes on the
     "minted" and "texmates" LaTeX packages.

scripts/windows/logtalk.iss

@@ -441,7 +441,12 @@ var
   XSB_DIR: String;
 begin
   if RegQueryStringValue(HKLM, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\', 'XSB_DIR', XSB_DIR) then
-    Result := XSB_DIR + '\config\i686-pc-cygwin\bin\xsb.exe'
+    if FileExists(XSB_DIR + '\config\i686-pc-cygwin\bin\xsb.exe') then
+      Result := XSB_DIR + '\config\i686-pc-cygwin\bin\xsb.exe'
+    else if FileExists(XSB_DIR + '\config\x64-pc-windows\bin\xsb.exe') then
+      Result := XSB_DIR + '\config\x64-pc-windows\bin\xsb.exe'
+    else if FileExists(XSB_DIR + '\config\x86-pc-windows\bin\xsb.exe') then
+      Result := XSB_DIR + '\config\x86-pc-windows\bin\xsb.exe'
   else
     Result := 'prolog_compiler_not_installed'
 end;
@@ -463,7 +468,12 @@ var
   XSB_DIR: String;
 begin
   if RegQueryStringValue(HKLM, 'SYSTEM\CurrentControlSet\Control\Session Manager\Environment\', 'XSB_DIR', XSB_DIR) then
-    Result := XSB_DIR + '\config\i686-pc-cygwin-mt\bin\xsb.exe'
+    if FileExists(XSB_DIR + '\config\i686-pc-cygwin-mt\bin\xsb.exe') then
+      Result := XSB_DIR + '\config\i686-pc-cygwin-mt\bin\xsb.exe'
+    else if FileExists(XSB_DIR + '\config\x64-pc-windows-mt\bin\xsb.exe') then
+      Result := XSB_DIR + '\config\x64-pc-windows-mt\bin\xsb.exe'
+    else if FileExists(XSB_DIR + '\config\x86-pc-windows-mt\bin\xsb.exe') then
+      Result := XSB_DIR + '\config\x86-pc-windows-mt\bin\xsb.exe'
   else
     Result := 'prolog_compiler_not_installed'
 end;