Modify the packages to enable the build of 3.8-based packages.juno38

* Add a new property platform.site that allows to add a new URL
  of the Eclipse Platform 3.8 repository
* Change Buckminster rmap to use this new repository in its search
  map before using the main Juno repository

3 files changed, 38 insertions, 10 deletions

diff --git a/features/org.eclipse.epp.allpackages.juno.feature/build.xml b/features/org.eclipse.epp.allpackages.juno.feature/build.xml
index 3ebe930f..f3abee18 100644
--- a/features/org.eclipse.epp.allpackages.juno.feature/build.xml
+++ b/features/org.eclipse.epp.allpackages.juno.feature/build.xml
@@ -6,7 +6,8 @@
 	<property name="build.root" location="${user.home}/epp.build" />
 	<property file="${build.root}/build.properties" />
 	<property name="bm.headless.site" value="http://download.eclipse.org/tools/buckminster/headless-3.5/" />
-	<property name="juno.site" value="http://download.eclipse.org/releases/staging" />
+	<property name="juno.site" value="http://download.eclipse.org/releases/juno" />
+	<property name="platform.site" value="http://download.eclipse.org/eclipse/updates/3.8" />
 	<property name="buildtools" location="${build.root}/tools" />
 	<property name="workspace" location="${build.root}/ws" />
 	<property name="targetPlatformPath" location="${build.root}/TP" />
@@ -86,6 +87,7 @@
 		</eclipse.launch>
 		<eclipse.launch app="buckminster">
 			<args>
+				<jvmarg value="-Dplatform.site=${platform.site}" />
 				<jvmarg value="-Djuno.site=${juno.site}" />
 				<arg value="-data" />
 				<arg value="${workspace}" />
@@ -106,6 +108,7 @@
 	<target name="build.workspace" depends="build.tp">
 		<eclipse.launch app="buckminster">
 			<args>
+				<jvmarg value="-Dplatform.site=${platform.site}" />
 				<jvmarg value="-Djuno.site=${juno.site}" />
 				<arg value="-data" />
 				<arg value="${workspace}" />
@@ -124,7 +127,7 @@
 		<eclipse.launch app="buckminster">
 			<args>
 				<jvmarg value="-Dqualifier.replacement.*=generator:lastModified" />
-				<jvmarg value="-Dgenerator.lastModified.format=yyyyMMdd-HHmm" />
+				<jvmarg value="-Dgenerator.lastModified.format=yyyyMMdd-HHmm'-38'" />
 				<jvmarg value="-Dtarget.os=*" />
 				<jvmarg value="-Dtarget.ws=*" />
 				<jvmarg value="-Dtarget.arch=*" />
@@ -143,7 +146,7 @@
 		<eclipse.launch app="buckminster">
 			<args>
 				<jvmarg value="-Dqualifier.replacement.*=generator:lastModified" />
-				<jvmarg value="-Dgenerator.lastModified.format=yyyyMMdd-HHmm" />
+				<jvmarg value="-Dgenerator.lastModified.format=yyyyMMdd-HHmm'-38'" />
 				<jvmarg value="-Dtarget.os=*" />
 				<jvmarg value="-Dtarget.ws=*" />
 				<jvmarg value="-Dtarget.arch=*" />
@@ -152,9 +155,8 @@
 				<jvmarg value="-Dbuild.id=${build.id}" />
 				<jvmarg value="-Dcbi.include.source=false" />
                 <jvmarg value="-Dsite.pack200=true" />
-                <jvmarg value="-Dsite.signing=true" />
                 <jvmarg value="-Dstaging.area=/home/data/httpd/download-staging.priv/technology/epp/" />
-                <jvmarg value="-Dsigning.type=eclipse.local" />
+<!--                <jvmarg value="-Dsigning.type=eclipse.local" />   -->
 				<arg value="-data" />
 				<arg value="${workspace}" />
 				<arg value="perform" />
diff --git a/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap b/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
index a91ec6d3..12aa07e6 100644
--- a/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
+++ b/features/org.eclipse.epp.allpackages.juno.feature/epp.rmap
@@ -3,6 +3,7 @@
   <rm:locator pattern="^org\.eclipse\.epp\.allpackages\..*$" searchPathRef="org.eclipse.epp.allpackages.juno"/>
   <rm:locator pattern="^org\.eclipse\.epp\.package\..*\.feature$" searchPathRef="org.eclipse.epp.packages.feature"/>
   <rm:locator pattern="^org\.eclipse\.epp\.package\..*$" searchPathRef="org.eclipse.epp.packages"/>
+  <rm:locator pattern="^org\.eclipse\..*$" searchPathRef="platform" failOnError="false"/>
   <rm:locator searchPathRef="juno" failOnError="false"/>
   <rm:searchPath name="org.eclipse.epp.allpackages.juno">
     <rm:provider componentTypes="eclipse.feature" readerType="git">
@@ -31,6 +32,15 @@
       <rm:property key="git.remote.uri" value="git://git.eclipse.org/gitroot/epp/org.eclipse.epp.packages.git"/>
     </rm:provider>
   </rm:searchPath>
+  <rm:searchPath name="platform">
+    <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
+      <rm:uri format="{0}?importType=binary">
+        <bc:propertyRef key="platform.site"/>
+      </rm:uri>
+      <rm:property	 key="buckminster.mutable" value="false" />
+      <rm:property key="buckminster.source" value="false" />
+    </rm:provider>
+  </rm:searchPath>
   <rm:searchPath name="juno">
     <rm:provider componentTypes="osgi.bundle,eclipse.feature" readerType="p2" source="false" mutable="false">
       <rm:uri format="{0}?importType=binary">
diff --git a/packages/org.eclipse.epp.package.common.feature/p2.inf b/packages/org.eclipse.epp.package.common.feature/p2.inf
index dea66aa0..b3d4845a 100644
--- a/packages/org.eclipse.epp.package.common.feature/p2.inf
+++ b/packages/org.eclipse.epp.package.common.feature/p2.inf
@@ -2,13 +2,29 @@
 properties.1.name=org.eclipse.equinox.p2.type.category
 properties.1.value=false
 
-#instructions.configure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/juno,name:EPP Packages Repository);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/juno,name:EPP Packages Repository);
 
+# Temporary fix for bug 382574 (Juno)
+# An internal error occurred during: "Indexing help...". 
+# Help system needs property set if Lucene 3.x present
+#instructions.configure=\
+#org.eclipse.equinox.p2.touchpoint.eclipse.addJvmArg(jvmArg:-Dhelp.lucene.tokenizer=standard);
+#
 #instructions.unconfigure=\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/technology/epp/packages/juno);\
-#org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/technology/epp/packages/juno);
+#org.eclipse.equinox.p2.touchpoint.eclipse.removeJvmArg(jvmArg:-Dhelp.lucene.tokenizer=standard);
+
+# Adding a virtual dependency to platform 3.x
+requires.1.namespace=org.eclipse.equinox.p2.iu
+requires.1.name=org.eclipse.rcp.feature.group
+requires.1.range=[3.0.0,4.0.0)
+requires.2.namespace=org.eclipse.equinox.p2.iu
+requires.2.name=org.eclipse.platform.feature.group
+requires.2.range=[3.0.0,4.0.0)
 
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.8/,name:Eclipse 3.8);\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.8/,name:Eclipse 3.8);
 
+instructions.unconfigure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:0,location:http${#58}//download.eclipse.org/eclipse/updates/3.8/);\
+org.eclipse.equinox.p2.touchpoint.eclipse.removeRepository(type:1,location:http${#58}//download.eclipse.org/eclipse/updates/3.8/);