Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4FC5291D7 for ; Fri, 17 Feb 2012 10:58:34 +0000 (UTC) Received: (qmail 89696 invoked by uid 500); 17 Feb 2012 10:58:34 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 89624 invoked by uid 500); 17 Feb 2012 10:58:33 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 89614 invoked by uid 99); 17 Feb 2012 10:58:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2012 10:58:33 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 17 Feb 2012 10:58:32 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id AAFA2238890D for ; Fri, 17 Feb 2012 10:58:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@directory.apache.org From: pamarcelot@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120217105812.AAFA2238890D@eris.apache.org> 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