directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pamarce...@apache.org
Subject svn commit: r1245387 - /directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
Date Fri, 17 Feb 2012 10:58:12 GMT
Author: pamarcelot
Date: Fri Feb 17 10:58:12 2012
New Revision: 1245387

URL: http://svn.apache.org/viewvc?rev=1245387&view=rev
Log:
Fix for DIRSTUDIO-782 (Improve Windows installer with JRE detection and creation of 'Apache
Directory Studio.ini' file).
Fixed one last issue with the 64 bit installer which was not looking for the installed JRE
in the 64 bit Windows registry.

Modified:
    directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi

Modified: directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
URL: http://svn.apache.org/viewvc/directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi?rev=1245387&r1=1245386&r2=1245387&view=diff
==============================================================================
--- directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
(original)
+++ directory/studio/trunk/application/application-win32-x86_64-exe/src/main/resources/installer.nsi
Fri Feb 17 10:58:12 2012
@@ -314,6 +314,7 @@
     # Returns (on stack): 0 - JRE not found. -1 - JRE found but too old. Otherwise - Path
to JAVA EXE
     # Stack value will be overwritten!
     Function DetectJRE
+      SetRegView 64
       Exch $0	; Get version requested
             ; Now the previous value of $0 is on the stack, and the asked for version of
JDK is in $0
       Push $1	; $1 = Java version string (ie 1.5.0)
@@ -368,6 +369,7 @@
     ;  Return
        Goto DetectJREEnd
     DetectJREEnd:
+        SetRegView 32
         ; Top of stack is return value, then r4,r3,r2,r1
         Exch	; => r4,rv,r3,r2,r1,r0
         Pop $4	; => rv,r3,r2,r1r,r0



Mime
View raw message