From b72e77fdc056918bca59e64f7636c3f626205f43 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Thu, 3 Oct 2013 16:09:48 -0500
Subject: [PATCH] Revert "Issue #2033 - msi build updates"

Undo copying localization into etc at build time.

This reverts commit d35b6790d013a8eddd10469d301e11e853d2875f [formerly e46254cef176ad73afc806a4d8626747114200c2] [formerly 7208eadbfb1a74fdfec20b074a8984e58fb18137 [formerly 7208eadbfb1a74fdfec20b074a8984e58fb18137 [formerly 18394168994e3683ecd2ba114be12ba2a547b62c]]].


Former-commit-id: 02e1055f19694196aaa37c7d06398391d4f8a86c [formerly 02e1055f19694196aaa37c7d06398391d4f8a86c [formerly f705e71d62e84d82cb8e880e0b17e18710f61d97]]
Former-commit-id: 3d6ff3f0fac34d318263e8b7709c709d221b7e3b
Former-commit-id: ac0b2bd9ebc2f60689bf3d9be6d66277dbd7c010
---
 msi/build/A2Staging/Scripts/assembleCAVE.ps1 | 25 ++++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/msi/build/A2Staging/Scripts/assembleCAVE.ps1 b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
index cb45da2e6e..8ec84ede48 100644
--- a/msi/build/A2Staging/Scripts/assembleCAVE.ps1
+++ b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
@@ -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
\ No newline at end of file