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

Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds

Browse source 
- The new p2 director is not able to install zipped repositories; so, each repository
  is now unzipped before installation during the CAVE Assembly phase of the Windows
  32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
  in the correct order during the CAVE Assembly phase of the Windows 32-bit build


Former-commit-id: eb3a64c073ce95be0993b5aff1bd057b6d42f015
This commit is contained in:
Bryan Kowal 2013-05-16 11:01:40 -05:00
parent 1e726506e0
commit 7e849f0af3
2 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cave/build/p2-build.xml
View file

@ -168,6 +168,10 @@
<param name="feature"
value="com.raytheon.uf.viz.common.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.localization.perspective.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.core.feature" />
@ -192,10 +196,6 @@
<param name="feature"
value="com.raytheon.uf.viz.d2d.core.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.uf.viz.localization.perspective.feature" />
</antcall>
<antcall target="p2.build.repo">
<param name="feature"
value="com.raytheon.viz.radar.feature" />

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

@ -1,8 +1,20 @@
function installCAVERepository([string]$feature_group, [string]$repo_zip)
function installCAVERepository([string]$feature_group, [string]$repo)
{
$repo_zip = $repo + ".zip"
New-Item -path ${A2_PREPARE_CAVE_DIR} `
-name $repo -type directory | Out-Null
if ($? -ne $true) { EXIT 1; }
pushd .
cd ${A2_PREPARE_CAVE_DIR}/$repo
jar xvf ${A2_PREPARE_CAVE_DIR}/$repo_zip
popd
.\cave.exe -nosplash -application org.eclipse.equinox.p2.director `
-i $feature_group -repository "jar:file:///${A2_PREPARE_CAVE_DIR}\$repo_zip!" | Out-Host
if ($? -ne $true) { echo "ERROR: Unable to install feature: $feature_group."; echo "FATAL: Build Failed!"; EXIT 1; }
-i $feature_group -repository "file:${A2_PREPARE_CAVE_DIR}/$repo" | Out-Host
if ($? -ne $true) { echo "ERROR: Unable to install feature: $feature_group."; echo "FATAL: Build Failed!"; EXIT 1; }
Remove-Item -recurse -force ${A2_PREPARE_CAVE_DIR}/$repo
if ($? -ne $true) { EXIT 1; }
echo "`n"
}
@ -18,10 +30,10 @@ foreach ($feature in $feature_list)
{
Write-Host Installing Feature: $feature
$feature_group = $feature + ".feature.group"
$repo_zip = $feature + "-repo-win32.x86.zip"
$repo = $feature + "-repo-win32.x86"
installCAVERepository -feature_group "$feature_group" `
-repo_zip "$repo_zip"
-repo "$repo"
}
popd
EXIT 0