xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #2851 - 64-bit Windows build updates; also supports 32-bit builds

Browse source 
Amend: remove generated files

Change-Id: I727391745ff9cbaaa1a3953567f909da1da01630

Former-commit-id: 72a8f0406f [formerly 20e1e788dd5ca68497d5496586b30a8463dd0ca8]
Former-commit-id: c9ee6a38d0
This commit is contained in:
Bryan Kowal 2014-03-31 12:34:57 -05:00
parent 1504b3532e
commit 5f2c5fb681
19 changed files with 216 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/AWIPSII.CAVE.csproj Normal file
View file

@ -0,0 +1,52 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{1F23042E-FD8D-496D-969C-3693FF0664A6}</ProjectGuid>
<OutputType>Exe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>AWIPSII.CAVE</RootNamespace>
<AssemblyName>AWIPSII.CAVE</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Client</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<PlatformTarget>x86</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<None Include="AWIPSII.wixproj">
<SubType>Designer</SubType>
</None>
<None Include="AWIPSII.wxs">
<SubType>Designer</SubType>
</None>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>

3
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/AWIPSII.CAVE.csproj.user Normal file
View file

@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</Project>

35
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/AWIPSII.wixproj Normal file
View file

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition="'$(Configuration)' == ''">Debug</Configuration>
<Platform Condition="'$(Platform)' == ''">x64</Platform>
<Version Condition=" '$(Version)' == '' ">1.0.0.0</Version>
<StagingDirectory Condition=" '${StagingDirectory}' == '' ">C:\A2Staging\AWIPS II\</StagingDirectory>
<ProductVersion>3.5</ProductVersion>
<ProjectGuid>9F9450DE-A24F-412D-8E34-69BEEA3043DA</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputType>Package</OutputType>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<OutputPath>bin\$(Configuration)</OutputPath>
<DefineConstants>Debug;ProductVersion=$(Version)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\$(Configuration)</OutputPath>
<DefineConstants>ProductVersion=$(Version)</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Compile Include="AWIPSII.wxs" />
<Compile Include="AWIPSII_CAVE.wxs" />
<Compile Include="AWIPSII_ALERTVIZ.wxs" />
</ItemGroup>
<PropertyGroup>
<OutputName>AWIPS II CAVE</OutputName>
<LinkerAdditionalOptions>-ext WixUIExtension -b "$(StagingDirectory)" -dWixUIBannerBmp=cave_msi_banner.bmp -dWixUIDialogBmp=cave_msi_dialog.bmp</LinkerAdditionalOptions>
<WixToolPath>C:\Users\Public\Documents\wix35-binaries\</WixToolPath>
<WixTargetsPath>$(WixToolPath)Wix.targets</WixTargetsPath>
<WixTasksPath>$(WixToolPath)wixtasks.dll</WixTasksPath>
<DefineSolutionProperties>false</DefineSolutionProperties>
</PropertyGroup>
<Import Project="$(WixTargetsPath)"/>
</Project>

98
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/AWIPSII.wxs Normal file
View file

@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="8A1F2DCB-5527-4D32-BC7A-E4295EA72942" Name="AWIPS II CAVE x64"
Language="1033" Version="$(var.ProductVersion)" Manufacturer="Raytheon"
UpgradeCode="8924277C-5B6A-4EEB-AE9F-5471481F92A5">
<Package Manufacturer="Raytheon" InstallerVersion="200"
Compressed="yes" InstallScope="perMachine" />
<Property Id="MSIFASTINSTALL" Value="3" />
<Media Id="1" Cabinet="product.cab" EmbedCab="yes" />
<Property Id="RUNTIMEENVIRONMENT">
<RegistrySearch Id="RuntimeEnvironment"
Root="HKLM"
Key="Software\Raytheon\Runtime Environment"
Type="raw"
Name="Name"
Win64="yes" />
</Property>
<Condition Message="The AWIPS II Runtime Environment (x64) must be installed before AWIPS II CAVE can be installed.">
<![CDATA[Installed OR RUNTIMEENVIRONMENT]]>
</Condition>
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="ProgramFiles64Folder" Name="PFiles">
<Directory Id="INSTALLDIR" Name="Raytheon">
<Directory Id="AwipsII" Name="AWIPS II">
<Directory Id="CaveDir" Name="CAVE">
<Component Id="caveBatch" Guid="8924277C-5B6A-4EEB-AE9F-5471481F92A6" Win64="yes">
<File Id="caveBAT" Name="cave.bat"
DiskId="1" Source="SourceDir\CAVE\cave.bat" />
<Shortcut Id="caveDesktopShortcut" Directory="DesktopFolder" Name="CAVE"
WorkingDirectory="CaveDir" Advertise="yes" Icon="cave.exe" IconIndex="0"
Arguments="-component thinclient" />
<Shortcut Id="caveStartMenu" Directory="ProgramMenuDir" Name="CAVE"
WorkingDirectory="CaveDir" Advertise="yes" Icon="cave.exe" IconIndex="0"
Arguments="-component thinclient" />
</Component>
</Directory>
<Directory Id="AlertvizDir" Name="AlertViz">
<Component Id="alertvizBatch" Guid="8924277C-5B6A-4EEB-AE9F-5471481F92B4" Win64="yes">
<File Id="alertvizBAT" Name="alertviz.bat"
DiskId="1" Source="SourceDir\AlertViz\alertviz.bat" />
<Shortcut Id="alertvizDesktopShortcut" Directory="DesktopFolder" Name="AlertViz"
WorkingDirectory="AlertvizDir" Advertise="yes" Icon="alertviz.exe" IconIndex="0"
Arguments="-component thinalertviz" />
<Shortcut Id="alertvizStartMenu" Directory="ProgramMenuDir" Name="AlertViz"
WorkingDirectory="AlertvizDir" Advertise="yes" Icon="alertviz.exe" IconIndex="0"
Arguments="-component thinalertviz" />
</Component>
</Directory>
</Directory>
</Directory>
<Directory Id="ProgramMenuFolder" Name="Programs">
<Directory Id="ProgramMenuDir" Name="AWIPS II">
<Component Id="ProgramMenuDir" Guid="62D7CF96-A3A5-4DCE-86A5-751D698B5CA3">
<RemoveFolder Id="ProgramMenuDir" On="uninstall" />
<RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]"
Type="string" Value="" KeyPath="yes" />
<Shortcut Id="UninstallProduct" Name="Uninstall CAVE" Description="Uninstalls AWIPS II CAVE"
Target="[SystemFolder]msiexec.exe" Arguments="/x [ProductCode]" />
</Component>
</Directory>
</Directory>
</Directory>
<Directory Id="DesktopFolder" Name="Desktop" />
</Directory>
<Feature Id="AWIPS_II_CAVE" Title="AWIPS II CAVE" Level="1"
Display="expand" Description="AWIPS II Common AWIPS Visualization Environment (CAVE)"
ConfigurableDirectory="INSTALLDIR">
<ComponentRef Id="caveBatch" />
<ComponentRef Id="ProgramMenuDir" />
<ComponentGroupRef Id="AWIPSII_CAVE" />
</Feature>
<Feature Id="AWIPS_II_ALERTVIZ" Title="AWIPS II AlertViz" Level="1"
Display="expand" Description="AWIPS II AlertViz"
ConfigurableDirectory="INSTALLDIR">
<ComponentRef Id="alertvizBatch" />
<ComponentGroupRef Id="AWIPSII_ALERTVIZ" />
</Feature>
<UIRef Id="WixUI_FeatureTree" />
<UIRef Id="WixUI_ErrorProgressText" />
<Icon Id="cave.exe" SourceFile="SourceDir\CAVE\cave.exe" />
<Icon Id="alertviz.exe" SourceFile="SourceDir\AlertViz\alertviz.exe" />
</Product>
</Wix>

BIN
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/cave_msi_banner.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 84 KiB

BIN
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/cave_msi_dialog.bmp Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 451 KiB

BIN
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE/ipr.gif Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

20
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE_amd64.sln Normal file
View file

@ -0,0 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 11.00
# Visual C# Express 2010
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AWIPSII.CAVE", "AWIPSII.CAVE\AWIPSII.CAVE.csproj", "{1F23042E-FD8D-496D-969C-3693FF0664A6}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x86 = Debug|x86
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{1F23042E-FD8D-496D-969C-3693FF0664A6}.Debug|x86.ActiveCfg = Debug|x86
{1F23042E-FD8D-496D-969C-3693FF0664A6}.Debug|x86.Build.0 = Debug|x86
{1F23042E-FD8D-496D-969C-3693FF0664A6}.Release|x86.ActiveCfg = Release|x86
{1F23042E-FD8D-496D-969C-3693FF0664A6}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
EndGlobal

BIN
msi/AWIPSII.CAVE_amd64/AWIPSII.CAVE_amd64.suo Normal file
View file

Binary file not shown.

2
msi/build/A2Staging/AWIPS_II_CAVE.SED
View file

@ -32,6 +32,6 @@ AdminQuietInstCmd=
UserQuietInstCmd= UserQuietInstCmd=
FILE0="AWIPS_II_CAVE.msi" FILE0="AWIPS_II_CAVE.msi"
[SourceFiles] [SourceFiles]
SourceFiles0=C:\Users\Bryan Kowal\Documents\Visual Studio 2010\Projects\AWIPSII.CAVE\AWIPSII.CAVE\bin\Debug\ SourceFiles0=C:\A2Staging
[SourceFiles0] [SourceFiles0]
%FILE0%= %FILE0%=

BIN
msi/build/A2Staging/Scripts/WiXBuild.ps1
View file

Binary file not shown.

BIN
msi/build/A2Staging/Scripts/Win32Build_CAVE.ps1
View file

Binary file not shown.

8
msi/build/A2Staging/Scripts/assembleCAVE.ps1
View file

@ -40,6 +40,12 @@ New-Item -path ${A2_PREPARE_CAVE_DIR}\cave `
-name etc -type directory | Out-Null -name etc -type directory | Out-Null
if ($? -ne $true) { EXIT 1; } if ($? -ne $true) { EXIT 1; }
$repo_suffix = "-repo-win32.x86"
if ("${AWIPS2_BUILD_ARCHITECTURE}" -eq "x64")
{
$repo_suffix = "-repo-win32.x86_64"
}
echo "`n" echo "`n"
$feature_list = Get-Content "${A2_PREPARE_CAVE_DIR}\features.txt" $feature_list = Get-Content "${A2_PREPARE_CAVE_DIR}\features.txt"
Write-Host Feature Count = $feature_list.count Write-Host Feature Count = $feature_list.count
@ -47,7 +53,7 @@ foreach ($feature in $feature_list)
{ {
Write-Host Installing Feature: $feature Write-Host Installing Feature: $feature
$feature_group = $feature + ".feature.group" $feature_group = $feature + ".feature.group"
$repo = $feature + "-repo-win32.x86" $repo = $feature + $repo_suffix
installCAVERepository -feature_group "$feature_group" ` installCAVERepository -feature_group "$feature_group" `
-repo "$repo" -repo "$repo"

BIN
msi/build/A2Staging/Scripts/awipscmGet.ps1
View file

Binary file not shown.

BIN
msi/build/A2Staging/Scripts/awipscmPut.ps1
View file

Binary file not shown.

BIN
msi/build/A2Staging/Scripts/environment.ps1
View file

Binary file not shown.

BIN
msi/build/A2Staging/Scripts/package.ps1
View file

Binary file not shown.

BIN
msi/build/A2Staging/Scripts/prepare.ps1
View file

Binary file not shown.

BIN
msi/build/A2Staging/Scripts/updateXML.ps1 Normal file
View file

Binary file not shown.