Merge "Revert "Issue #2033 - msi build updates"" into development

Former-commit-id: 2059cbc573 [formerly 2059cbc573 [formerly 7157d5791045a456ebe9eef1c8ce21e549bf0761]]
Former-commit-id: b09988c403
Former-commit-id: 74b1f23db7
This commit is contained in:
Greg Armendariz 2013-10-07 10:01:14 -05:00 committed by Gerrit Code Review
commit 25e168e8a2

View file

@ -1,35 +1,19 @@
function installCAVERepository([string]$feature_group, [string]$component, [string]$repo)
function installCAVERepository([string]$feature_group, [string]$repo)
{
$component_zip = $component + ".zip"
New-Item -path ${A2_PREPARE_CAVE_DIR} `
-name $component -type directory | Out-Null
if ($? -ne $true) { EXIT 1; }
pushd .
cd ${A2_PREPARE_CAVE_DIR}/$component
jar xvf ${A2_PREPARE_CAVE_DIR}/$component_zip
popd
$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}/$component/awips2/cave/.repository/$repo_zip
jar xvf ${A2_PREPARE_CAVE_DIR}/$repo_zip
popd
.\cave.exe -nosplash -application org.eclipse.equinox.p2.director `
-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; }
$etc_directory = ${A2_PREPARE_CAVE_DIR} + "\" + ${component} + "\awips2\cave\etc"
if ( Test-Path ${etc_directory} ) {
echo "Copying etc directory to destination ..."
Copy-Item ${etc_directory} -destination ${A2_PREPARE_CAVE_DIR}\cave -recurse -force
if ($? -ne $true) { EXIT 1; }
}
Remove-Item -recurse -force ${A2_PREPARE_CAVE_DIR}/$component
Remove-Item -recurse -force ${A2_PREPARE_CAVE_DIR}/$repo
if ($? -ne $true) { EXIT 1; }
echo "`n"
@ -46,11 +30,10 @@ foreach ($feature in $feature_list)
{
Write-Host Installing Feature: $feature
$feature_group = $feature + ".feature.group"
$component = $feature + "-win32.x86"
$repo = $feature + "-repo-win32.x86"
installCAVERepository -feature_group "$feature_group" `
-component "$component" -repo $repo
-repo "$repo"
}
popd
EXIT 0