updated build to use local files

5 files changed, 111 insertions, 21 deletions

diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/TODO b/build/org.eclipse.emf.teneo.releng.buckminster/TODO
new file mode 100644
index 000000000..ccf568c3c
--- /dev/null
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/TODO
@@ -0,0 +1,7 @@
+- Create a single param to do builds against different platforms and branches
+> Helios
+> Indigo
+> Juno
+
+- Use local repositories for builds done at hudson
+- Maybe download p2 site from github?
\ No newline at end of file
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
index 41abae77b..2258d9658 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/buckminster.properties
@@ -44,4 +44,5 @@ signing.type=eclipse.local
 teneo.download.area=/home/data/httpd/download.eclipse.org/modeling/emf/teneo
 buckminster.p2.site=http://download.eclipse.org/tools/buckminster/headless-3.6
 director.url=http://download.eclipse.org/tools/buckminster/products/director_latest.zip
+thirdparty.url=http://www.elver.org/eclipse/update/teneotexodeps.zip
 #eclipse.staging.area=${env.HUDSON_HOME}/jobs/${env.JOB_NAME}/signing
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml
index 54311de11..763736166 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build.xml
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build.xml
@@ -48,7 +48,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
 	</condition>
 
 	<!-- Is used in buck.minster also -->
-	<condition property="build.type" value="${env.BUILDTYPE}" else="N">
+	<condition property="build.type" value="${env.BUILDTYPE}" else="Indigo">
 		<isset property="env.BUILDTYPE" />
 	</condition>
 
@@ -71,6 +71,7 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
 	<property name="rootPath" location="${buildsPath}" />
 
 	<property name="buildRoot" location="${rootPath}/build" />
+	<property name="thirdPartyPath" location="${rootPath}/thirdparty" />
 	<property name="testRoot" location="${rootPath}/test" />
 	<property name="toolsPath" location="${rootPath}/tools" />
 	<property name="buildSitePath" location="${rootPath}/result/p2site" />
@@ -172,6 +173,15 @@ http://dev.eclipse.org/viewsvn/index.cgi/trunk/org.eclipse.buckminster.releng/bu
 		<delete file="${director.zip}" />
 	</target>
 
+	<target name="get.thirdparty">
+		<echo message="Fetching thirdparty files" />
+		<tempfile destdir="${java.io.tmpdir}" prefix="thirdparty-" suffix=".zip" property="thirdparty.zip" deleteonexit="true" />
+		<get src="${thirdparty.url}" dest="${thirdparty.zip}" />
+		<mkdir dir="${thirdPartyPath}" />
+		<unzip src="${thirdparty.zip}" dest="${thirdPartyPath}" />
+		<delete file="${thirdparty.zip}" />
+	</target>
+
 	<target name="install.buckminster" unless="buckminster.exists" depends="get.director">
 		<echo message="Configuring headless buckminster with needed features" />
 		<eclipse.launch app="director">
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
index a37fb7746..b9868804b 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/build/teneo.rmap
@@ -12,7 +12,8 @@
 	xmlns:pmp="http://www.eclipse.org/buckminster/PDEMapProvider-1.0"
 	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0">
 
- 	<property key="build.type" mutable="true" value="N"/>
+ 	<property key="build.type" mutable="true" value="Indigo"/>
+ 	<property key="eclipse.download" value="http://download.eclipse.org"/>
  
 	<searchPath name="teneo.plugins">
 		<provider componentTypes="osgi.bundle" readerType="git" source="true">
@@ -51,20 +52,55 @@
   	</searchPath>
 
   	<searchPath name="target.platform">
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=N)">
-      		<uri format="http://download.eclipse.org/releases/helios"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
+      		<uri format="{0}/releases/juno">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
     	</provider>
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=R))">
-      		<uri format="http://download.eclipse.org/eclipse/updates/3.6"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
+      		<uri format="{0}/eclipse/updates/3.8milestones/">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
     	</provider>
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=R)">
-      		<uri format="http://download.eclipse.org/releases/galileo"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Indigo)">
+      		<uri format="{0}/releases/helios">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
     	</provider>
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=R))">
-      		<uri format="http://www.elver.org/eclipse/update"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Indigo)">
+      		<uri format="{0}/eclipse/updates/3.7">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Helios)">
+      		<uri format="{0}/releases/helios">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Helios)">
+      		<uri format="{0}/eclipse/updates/3.6">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Galileo)">
+      		<uri format="{0}/releases/galileo">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Galileo)">
+      		<uri format="{0}/eclipse/updates/3.5">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      		<uri format="{0}">
+	      		<bc:propertyRef key="thirdPartyPath"/>
+      		</uri>
     	</provider>
 		<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
-			<uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20111018035124/repository/"/>
+			<uri format="{0}/tools/orbit/downloads/drops/S20111018035124/repository/">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
 		</provider>
   	</searchPath>
 
diff --git a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
index 4c72da4d5..459e21455 100755
--- a/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
+++ b/build/org.eclipse.emf.teneo.releng.buckminster/test/teneo.rmap
@@ -12,7 +12,8 @@
 	xmlns:pmp="http://www.eclipse.org/buckminster/PDEMapProvider-1.0"
 	xmlns:bc="http://www.eclipse.org/buckminster/Common-1.0">
 
- 	<property key="build.type" mutable="true" value="N"/>
+ 	<property key="build.type" mutable="true" value="Indigo"/>
+ 	<property key="eclipse.download" value="http://download.eclipse.org"/>
  	
   	<searchPath name="teneo.platform">
     	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
@@ -65,20 +66,55 @@
   	</searchPath>
 
   	<searchPath name="target.platform">
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=N)">
-      		<uri format="http://download.eclipse.org/releases/helios"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
+      		<uri format="{0}/releases/juno">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Juno)">
+      		<uri format="{0}/eclipse/updates/3.8milestones/">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Indigo)">
+      		<uri format="{0}/releases/helios">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Indigo)">
+      		<uri format="{0}/eclipse/updates/3.7">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Helios)">
+      		<uri format="{0}/releases/helios">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
+    	</provider>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Helios)">
+      		<uri format="{0}/eclipse/updates/3.6">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
     	</provider>
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=R))">
-      		<uri format="http://download.eclipse.org/eclipse/updates/3.6"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Galileo)">
+      		<uri format="{0}/releases/galileo">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
     	</provider>
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=R)">
-      		<uri format="http://download.eclipse.org/releases/galileo"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(build.type=Galileo)">
+      		<uri format="{0}/eclipse/updates/3.5">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
     	</provider>
-    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false" resolutionFilter="(|(build.type=N)(build.type=R))">
-      		<uri format="http://www.elver.org/eclipse/update"/>
+    	<provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false">
+      		<uri format="{0}">
+	      		<bc:propertyRef key="thirdPartyPath"/>
+      		</uri>
     	</provider>
 		<provider readerType="p2" componentTypes="osgi.bundle" mutable="false" source="false">
-			<uri format="http://download.eclipse.org/tools/orbit/downloads/drops/S20111018035124/repository/"/>
+			<uri format="{0}/tools/orbit/downloads/drops/S20111018035124/repository/">
+				<bc:propertyRef key="eclipse.download"/>
+      		</uri>
 		</provider>
   	</searchPath>