From 7446376b428d835d056b733a70d51192608da0a5 Mon Sep 17 00:00:00 2001
From: Bryan Kowal <Bryan.Kowal@raytheon.com>
Date: Thu, 16 May 2013 11:01:40 -0500
Subject: [PATCH] Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit
 builds

- 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: dccc6e4a96f4c7e4aae4cfc806b21c331fb472ba [formerly 7e849f0af3fdc3178a2ecbf0716ffc5572ff7be1] [formerly dccc6e4a96f4c7e4aae4cfc806b21c331fb472ba [formerly 7e849f0af3fdc3178a2ecbf0716ffc5572ff7be1] [formerly 22d4494918f7b54506617127426d036fc41c8753 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918f7b54506617127426d036fc41c8753
Former-commit-id: 88cc3a6011af1ce09389ad657ac3e43ceb8a52d5 [formerly 560fb81038d68a55f7d23c47bd0524d6c9669aa7]
Former-commit-id: e95c2d36b4d97cefdf9f84266a1cd42136803d2e
---
 cave/build/p2-build.xml                      |  8 +++----
 msi/build/A2Staging/Scripts/assembleCAVE.ps1 | 22 +++++++++++++++-----
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/cave/build/p2-build.xml b/cave/build/p2-build.xml
index 4f45e35e9f..a58df6cf46 100644
--- a/cave/build/p2-build.xml
+++ b/cave/build/p2-build.xml
@@ -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" />
diff --git a/msi/build/A2Staging/Scripts/assembleCAVE.ps1 b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
index a8a6135b4b..8ec84ede48 100644
--- a/msi/build/A2Staging/Scripts/assembleCAVE.ps1
+++ b/msi/build/A2Staging/Scripts/assembleCAVE.ps1
@@ -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
\ No newline at end of file