GuillaumeHemmen/projectlibre-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/projectlibre/code synced 2024-11-01 03:21:46 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix for MSI on 64bit windows 7/8

Browse source
This commit is contained in:
Laurent chretienneau 2013-06-29 21:43:22 +02:00
parent 65020c509c
commit 675c3786ca
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
openproj_build/resources/wix/projectlibre.wxs
View file

@ -187,10 +187,13 @@
</DirectoryRef>
<Property Id="JAVA_CURRENT_VERSION">
<RegistrySearch Id="JRE_KEY" Root="HKLM" Key="SOFTWARE\JavaSoft\Java Runtime Environment" Name="CurrentVersion" Type="raw" />
<RegistrySearch Id="JRE_KEY" Root="HKLM" Key="SOFTWARE\JavaSoft\Java Runtime Environment" Name="CurrentVersion" Type="raw" Win64="no"/>
</Property>
<Condition Message="Java is not installed. ProjectLibre requires Java version 6 or later. Please install Java: http://www.java.com/download"><![CDATA[(Installed OR JAVA_CURRENT_VERSION) AND JAVA_CURRENT_VERSION <> ""]]></Condition>
<Condition Message="ProjectLibre requires Java 6 or later. Please install the latest Java version : http://www.java.com/download"><![CDATA[(Installed OR JAVA_CURRENT_VERSION) AND JAVA_CURRENT_VERSION >= "1.6"]]></Condition>
<Property Id="JAVA_CURRENT_VERSION64">
<RegistrySearch Id="JRE_KEY64" Root="HKLM" Key="SOFTWARE\JavaSoft\Java Runtime Environment" Name="CurrentVersion" Type="raw" Win64="yes"/>
</Property>
<Condition Message="Java is not installed. ProjectLibre requires Java version 6 or later. Please install Java: http://www.java.com/download"><![CDATA[(Installed OR JAVA_CURRENT_VERSION OR JAVA_CURRENT_VERSION64) AND (JAVA_CURRENT_VERSION <> "" OR JAVA_CURRENT_VERSION64 <> "") ]]></Condition>
<Condition Message="ProjectLibre requires Java 6 or later. Please install the latest Java version : http://www.java.com/download"><![CDATA[(Installed OR JAVA_CURRENT_VERSION OR JAVA_CURRENT_VERSION64) AND (JAVA_CURRENT_VERSION >= "1.6" OR JAVA_CURRENT_VERSION64 >= "1.6")]]></Condition>
<Feature Id="DefaultFeature" Title="Main Feature" Level="1">
<ComponentRef Id="ApplicationFiles" />