From d951c034cb018578b0b9c3c09e6aaed55df77302 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Wed, 9 Jul 2008 18:21:12 +0000
Subject: [PATCH] Introduce download script

git-svn-id: https://svn.argeo.org/slc/trunk@1401 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 .../src/main/scripts/download.build.xml       | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/maven/plugins/maven-argeo-pde-plugin/src/main/scripts/download.build.xml b/maven/plugins/maven-argeo-pde-plugin/src/main/scripts/download.build.xml
index cc093f674..9cc23eca1 100644
--- a/maven/plugins/maven-argeo-pde-plugin/src/main/scripts/download.build.xml
+++ b/maven/plugins/maven-argeo-pde-plugin/src/main/scripts/download.build.xml
@@ -14,8 +14,10 @@
 		<doZip target="eclipse"
 		       file="eclipse-RCP-3.3.2-delta-pack.zip"
 		       url="http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/eclipse/downloads/drops/R-3.3.2-200802211800/eclipse-RCP-3.3.2-delta-pack.zip" />
-		<doZip target="eclipse" file="" url="" />
 
+		<!--
+		<doZip target="eclipse" file="" url="" />
+-->
 		<!-- WTP -->
 		<doZip target="pluginPath/eclipse-WTP-2.0.2"
 		       file="wtp-R-2.0.2-20080223205547.zip"
@@ -45,6 +47,7 @@
 			<retrieve url="@{url}" downloadfile="@{downloadFile}" />
 			<mkdir dir="${eclipseBuildDir}/@{target}" />
 			<unzip dest="${eclipseBuildDir}/@{target}" src="@{downloadFile}" />
+			<removeEclipseDir dir="${eclipseBuildDir}/@{target}" />
 		</sequential>
 	</macrodef>
 
@@ -62,6 +65,7 @@
 			<untar dest="${eclipseBuildDir}/@{target}"
 			       src="@{downloadFile}"
 			       compression="gzip" />
+			<removeEclipseDir dir="${eclipseBuildDir}/@{target}" />
 		</sequential>
 	</macrodef>
 
@@ -74,7 +78,21 @@
 			     dest="@{downloadFile}"
 			     verbose="true"
 			     usetimestamp="true" />
+		</sequential>
+	</macrodef>
 
+	<macrodef name="removeEclipseDir">
+		<attribute name="dir" />
+		<sequential>
+			<echo message="Remove eclipse dir from @{dir} if present" />
+			<move todir="@{dir}">
+				<fileset dir="@{dir}">
+					<include name="eclipse/plugins/**" />
+					<include name="eclipse/features/**" />
+				</fileset>
+				<globmapper from="eclipse/*" to="*" />
+			</move>
+			<delete dir="@{dir}/eclipse" />
 		</sequential>
 	</macrodef>
 </project>
\ No newline at end of file
-- 
2.39.5