[releng] Re-added emf.base.rmap redirect

4 files changed, 24 insertions, 35 deletions

diff --git a/releng/org.eclipse.emf.releng.buckminster/releng/local/commands.txt b/releng/org.eclipse.emf.releng.buckminster/releng/local/commands.txt
index e2672199e..43cf4b1de 100644
--- a/releng/org.eclipse.emf.releng.buckminster/releng/local/commands.txt
+++ b/releng/org.eclipse.emf.releng.buckminster/releng/local/commands.txt
@@ -1,45 +1,30 @@
-importprefs -F ${checkout.location}/releng/org.eclipse.emf.releng.buckminster/releng/buckminster.workspace.epf
 importproxysettings
 
 setpref complianceLevel=1.5
 setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform"
 
-import -Dbuild.type=N -Dwithout.gdt=true -Dwithout.rap=true "${checkout.location}/releng/org.eclipse.emf.releng.buckminster/releng/emf.base-all.mspec"
-import -Dbuild.type=N -Dwithout.gdt=true -Dwithout.rap=true "${checkout.location}/releng/org.eclipse.emf.releng.buckminster/releng/emf-all.mspec"
-import -Dbuild.type=N -Dwithout.gdt=true -Dwithout.rap=true "${checkout.location}/releng/org.eclipse.emf.xcore.releng/releng/xcore-platform.mspec"
-resolve -Dbuild.type=N -Dwithout.gdt=true -Dwithout.rap=true "${checkout.location}/releng/org.eclipse.emf.xcore.releng/releng/xcore.cquery"
+# Import all but rap.sdk cause it has a bad dependency to eclipse 3.8
+import -DuseMirror=false -Dbuild.type=${BUILD_TYPE} -Dwithout.gdt=true  -Dwithout.rap=true "${checkout.location}org.eclipse.emf.releng.buckminster/releng/emf-all.mspec"
+# Import sources produced by the EMF Base build into the target platform
+import -DuseMirror=false -Dbuild.type=${BUILD_TYPE} -Dwithout.gdt=true "${checkout.location}org.eclipse.emf.releng.buckminster/releng/emf-platform.base.sources.cquery"
 build
 
-junit --stderr --stdout --launch "org.eclipse.emf.test.core/Test EMF Core.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Core.xml"
-
-#importproxysettings
-
-setpref complianceLevel=1.5
-setpref targetPlatformPath="${WORKSPACE}/buildroot/target.platform"
-#setpref org.eclipse.buckminster.core.maxParallelResolutions=1
-#setpref org.eclipse.buckminster.core.maxParallelMaterializations=1
-
-# Import all but rap.sdk cause it has a bad dependency to eclipse 4.3
-#import --properties "${releng.proj.loc}/releng/local/local-build.properties" -Dbuild.type=${BUILD_TYPE} -Dwithout.gdt=true  -Dwithout.rap=true "${releng.proj.loc}/releng/emf-all.mspec"
-#import --properties "${releng.proj.loc}/releng/local/local-build.properties" -Dbuild.type=${BUILD_TYPE} -Dwithout.gdt=true "${releng.proj.loc}/releng/emf-platform.base.sources.cquery"
-#build
-
-#junit --launch "org.eclipse.emf.test.core/Test EMF Core.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Core.xml"
-#junit --launch "org.eclipse.emf.test.databinding/Test EMF Databinding.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Databinding.xml"
-#junit --launch "org.eclipse.emf.test.xml/Test EMF XML.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF XML.xml"
-#junit --launch "org.eclipse.emf.test.tools/Test EMF Tools.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Tools.xml"
-#junit --launch "org.eclipse.emf.test.edit/Test EMF Edit.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Edit.xml"
-#junit --launch "org.eclipse.emf.test.databinding.edit/Test EMF Databinding Edit.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Databinding Edit.xml"
-#junit --launch "org.eclipse.emf.test.examples/Test EMF Examples.launch" --flatXML --output "${WORKSPACE}/buildroot/test.results/Test EMF Examples.xml"
+junit --launch "org.eclipse.emf.test.core/Test EMF Core.launch" --flatXML --output "${WORKSPACE}/build-result/test-results/Test EMF Core.xml"
+junit --launch "org.eclipse.emf.test.databinding/Test EMF Databinding.launch" --flatXML --output "${WORKSPACE}/build-result/test-results/Test EMF Databinding.xml"
+junit --launch "org.eclipse.emf.test.xml/Test EMF XML.launch" --flatXML --output "${WORKSPACE}/build-result/test-results/Test EMF XML.xml"
+junit --launch "org.eclipse.emf.test.tools/Test EMF Tools.launch" --flatXML --output "${WORKSPACE}/build-result/test-results/Test EMF Tools.xml"
+junit --launch "org.eclipse.emf.test.edit/Test EMF Edit.launch" --flatXML --output "${WORKSPACE}/build-result/test-results/Test EMF Edit.xml"
+junit --launch "org.eclipse.emf.test.databinding.edit/Test EMF Databinding Edit.launch" --flatXML --output "${WORKSPACE}/build-result/test-results/Test EMF Databinding Edit.xml"
+junit --launch "org.eclipse.emf.test.examples/Test EMF Examples.launch" --flatXML --output "${WORKSPACE}/buildroot/test-results/Test EMF Examples.xml"
 
 # Freeze galileo target platform information 
-#perform --properties "${releng.proj.loc}/releng/local/local-build.properties" "org.eclipse.emf.all#jar.contents"
-#perform --properties "${releng.proj.loc}/releng/local/local-build.properties" "org.eclipse.emf.gwt.sdk#jar.contents"
+perform "org.eclipse.emf.all#jar.contents"
+perform "org.eclipse.emf.gwt.sdk#jar.contents"
 
-# Import rap.sdk now, eclipse 4.3 will be imported in the TP too
-#import --properties "${releng.proj.loc}/releng/local/local-build.properties" -Dbuild.type=${BUILD_TYPE} -Dwithout.gdt=true "${releng.proj.loc}/releng/rap/emf.rap.mspec"
-#build
+# Import rap.sdk now, eclipse 3.8 will be imported in the TP too
+import -Dbuild.type=${BUILD_TYPE} -Dwithout.gdt=true "${checkout.location}org.eclipse.emf.releng.buckminster/releng/rap/emf.rap.mspec"
+build
 
 # Package all together
-#perform --properties "${releng.proj.loc}/releng/local/local-build.properties" "org.eclipse.emf.build#build"
-#perform --properties "${releng.proj.loc}/releng/local/local-build.properties" "org.eclipse.emf.releng.buckminster#setup.promoter"
+perform "org.eclipse.emf.build#build"
+perform "org.eclipse.emf.releng.buckminster#setup.promoter"
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.ant b/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.ant
index ecfbdd84a..0dffdb956 100644
--- a/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.ant
+++ b/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.ant
@@ -17,7 +17,7 @@
     </description>
 
 	<!-- Local Xtext git repository -->
-	<property name="checkout.location" value="${user.home}/git/emf-master/" />
+	<property name="checkout.location" value="${user.home}/git/org.eclipse.emf-master/" />
 	<property name="releng.proj.loc" value="${checkout.location}/releng/org.eclipse.emf.releng.buckminster" />
 	<!-- Buckminster headless 3.7 to use. See http://www.eclipse.org/buckminster/downloads.html -->
 	<property name="buckminster.home" location="${user.home}/buckminster" />
@@ -74,11 +74,12 @@
 	<target name="start-build" depends="-cleanup" description="description">
 		<exec executable="${buckminster.home}/buckminster">
 			<arg value="-Declipse.p2.mirrors=false" />
+			<arg value="-Dgoogle.web.toolkit.repository=http://archive.eclipse.org/modeling/emf/emf/gwt/4.3/" />
 			<arg value="-DBUILD_TYPE=${BUILD_TYPE}" />
 			<arg value="-DWORKSPACE=${WORKSPACE}" />
 			<arg value="-Dgit.clones.root=${user.home}/git" />
 			<arg value="-Dreleng.proj.loc=${releng.proj.loc}" />
-			<arg value="-Dcheckout.location=${checkout.location}" />
+			<arg value="-Dcheckout.location=${checkout.location}/releng/" />
 			<arg value="-Declipse.target.platform=${ECLIPSE.TARGET.ALIAS}" />
 			<arg line="-data ${WORKSPACE}/buckminster.workspace" />
 			<arg line="-configuration ${WORKSPACE}/configuration" />
diff --git a/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.properties b/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.properties
index a3c3b1d0b..f7c0b6cbd 100644
--- a/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.properties
+++ b/releng/org.eclipse.emf.releng.buckminster/releng/local/local-build.properties
@@ -18,4 +18,5 @@ site.pack200=true
 site.retain.unpacked=true
 site.signing=false
 eclipse.target.platform=Galileo
+google.web.toolkit.repository=http://archive.eclipse.org/modeling/emf/emf/gwt/4.3/
 BUILD_TYPE=N
\ No newline at end of file
diff --git a/releng/org.eclipse.emf.releng.buckminster/releng/rap/emf.rap.rmap b/releng/org.eclipse.emf.releng.buckminster/releng/rap/emf.rap.rmap
index 4190b78ac..876cdf3fd 100755
--- a/releng/org.eclipse.emf.releng.buckminster/releng/rap/emf.rap.rmap
+++ b/releng/org.eclipse.emf.releng.buckminster/releng/rap/emf.rap.rmap
@@ -6,6 +6,8 @@
 	<locator pattern="^org\.eclipse\.emf\.(?:base|common|ecore|ecore\.xmi|ecore\.change)(?:\.source)?$" searchPathRef="emf.base" failOnError="true" />
 	
 	<locator pattern="^((?!org\.eclipse\.emf).)*$" searchPathRef="rap" failOnError="true" />
+	<!-- refer the resolution to the base RMAP to resolve the emf.rap.sdk-->
+	<redirect href="../emf.base.rmap" pattern="^org\.eclipse\.emf\.rap(?:\..+)?$" /> 
 
 	
 	<searchPath name="emf.base">