Issue #2423 - Windows Java 7 Updates. Note: AWIPSII.Environment is not an Eclipse plugin project

Former-commit-id: 5c40f6f030 [formerly 0ea8a8b08c] [formerly 7881af2c69] [formerly 0bbf1cd01f [formerly 7881af2c69 [formerly db5f7bf2c2cc1abae67462a78a2b52fe0bc1f3fa]]]
Former-commit-id: 0bbf1cd01f
Former-commit-id: a57d7af13c6f4eee411ccc79768e7251e34f24aa [formerly 697cde0f3a]
Former-commit-id: 1ecf059cd7
This commit is contained in:
Bryan Kowal 2013-10-09 13:25:40 -05:00
parent a62c0c89f0
commit bc98e950b6
4 changed files with 2816 additions and 3262 deletions

View file

@ -40,9 +40,7 @@
<None Include="AWIPSII.wxs">
<SubType>Designer</SubType>
</None>
<None Include="AWIPSII_JAVA.wxs">
<SubType>Designer</SubType>
</None>
<None Include="AWIPSII_JAVA.wxs" />
<None Include="AWIPSII_PYTHON.wxs">
<SubType>Designer</SubType>
</None>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="8A1F2DCB-5527-4D32-BC7A-E4295EA72940" Name="AWIPS II Runtime Environment"
Language="1033" Version="1.0.2.0" Manufacturer="Raytheon"
Language="1033" Version="1.0.3.0" Manufacturer="Raytheon"
UpgradeCode="8924277C-5B6A-4EEB-AE9F-5471481F92A6">
<Package Manufacturer="Raytheon" InstallerVersion="200"
Compressed="yes" InstallScope="perMachine" />
@ -34,7 +34,7 @@
<RegistryValue Type="string" Name="JavaJreDirectory"
Value="[INSTALLDIR]AWIPS II\Java\jre" />
<RegistryValue Type="string" Name="JavaVersion"
Value="6.0.430" />
Value="7.0.40" />
<RegistryValue Type="string" Name="JAIVersion"
Value="1.1.3" />
<RegistryValue Type="string" Name="JAIImageIOVersion"

File diff suppressed because it is too large Load diff