Revert "Issue #2033 - msi build updates"

Undo copying localization into etc at build time.

This reverts commit 50d9790e17 [formerly 3bf9b72f52] [formerly 7208eadbfb] [formerly e46254cef1 [formerly 7208eadbfb [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]].


Former-commit-id: 3d6ff3f0fa [formerly 02e1055f19 [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]
Former-commit-id: 02e1055f19
Former-commit-id: 1632c72103
This commit is contained in:
Bryan Kowal 2013-10-03 16:09:48 -05:00
parent 354af07416
commit 28e14d1520

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" $repo_zip = $repo + ".zip"
New-Item -path ${A2_PREPARE_CAVE_DIR} ` New-Item -path ${A2_PREPARE_CAVE_DIR} `
-name $repo -type directory | Out-Null -name $repo -type directory | Out-Null
if ($? -ne $true) { EXIT 1; } if ($? -ne $true) { EXIT 1; }
pushd . pushd .
cd ${A2_PREPARE_CAVE_DIR}/$repo 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 popd
.\cave.exe -nosplash -application org.eclipse.equinox.p2.director ` .\cave.exe -nosplash -application org.eclipse.equinox.p2.director `
-i $feature_group -repository "file:${A2_PREPARE_CAVE_DIR}/$repo" | Out-Host -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; } 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" Remove-Item -recurse -force ${A2_PREPARE_CAVE_DIR}/$repo
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
if ($? -ne $true) { EXIT 1; } if ($? -ne $true) { EXIT 1; }
echo "`n" echo "`n"
@ -46,11 +30,10 @@ 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"
$component = $feature + "-win32.x86"
$repo = $feature + "-repo-win32.x86" $repo = $feature + "-repo-win32.x86"
installCAVERepository -feature_group "$feature_group" ` installCAVERepository -feature_group "$feature_group" `
-component "$component" -repo $repo -repo "$repo"
} }
popd popd
EXIT 0 EXIT 0