Bug 413862 - Restore "forced exports" mechanism
- releng: new feature, use 2.3.1.qualifier, building
diff --git a/releng/build-scripts/build/OTDT-Build/allElements.xml b/releng/build-scripts/build/OTDT-Build/allElements.xml
index 8dcbbdd..f166213 100644
--- a/releng/build-scripts/build/OTDT-Build/allElements.xml
+++ b/releng/build-scripts/build/OTDT-Build/allElements.xml
@@ -27,6 +27,11 @@
<property name="id" value="org.eclipse.objectteams.otequinox" />
</ant>
+ <ant antfile="${genericTargets}" target="${target}" >
+ <property name="type" value="feature" />
+ <property name="id" value="org.eclipse.objectteams.otequinox.turbo" />
+ </ant>
+
<ant antfile="${genericTargets}" target="${target}" >
<property name="type" value="feature" />
<property name="id" value="org.eclipse.objectteams.otdt" />
@@ -92,6 +97,14 @@
</ant>
</target>
+ <!-- set output repository for otequinox.turbo.feature: -->
+ <property name="assemble.org.eclipse.objectteams.otequinox.turbo.p2" value="true" />
+ <target name="assemble.org.eclipse.objectteams.otequinox.turbo.p2">
+ <ant antfile="${assembleScriptName}" dir="${buildDirectory}">
+ <property name="p2.build.repo" value="file://${otdtUpdatesDir}"/>
+ </ant>
+ </target>
+
<!-- set output repository for otdt.feature: -->
<property name="assemble.org.eclipse.objectteams.otdt.p2" value="true" />
<target name="assemble.org.eclipse.objectteams.otdt.p2">
diff --git a/releng/build-scripts/build/p2helper.xml b/releng/build-scripts/build/p2helper.xml
index 1874100..dd32c6c 100644
--- a/releng/build-scripts/build/p2helper.xml
+++ b/releng/build-scripts/build/p2helper.xml
@@ -56,6 +56,12 @@
<param name="sourceUpdatesDir" value="${otdtUpdatesDir}"/>
<param name="targetEclipseDir" value="${test.eclipseDir}"/>
</antcall>
+ <!-- optional: -->
+ <antcall target="installFeature">
+ <param name="feature" value="org.eclipse.objectteams.otequinox.turbo.feature.group"/>
+ <param name="sourceUpdatesDir" value="${otdtUpdatesDir}"/>
+ <param name="targetEclipseDir" value="${test.eclipseDir}"/>
+ </antcall>
<antcall target="installFeature">
<param name="feature" value="org.eclipse.objectteams.otdt.feature.group"/>
<param name="sourceUpdatesDir" value="${otdtUpdatesDir}"/>
diff --git a/releng/map/otdt.map.in b/releng/map/otdt.map.in
index d98c58b..d9295cc 100644
--- a/releng/map/otdt.map.in
+++ b/releng/map/otdt.map.in
@@ -5,6 +5,7 @@
feature@org.eclipse.objectteams.otdt.source.feature=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.source.feature,tag=branches/maintenance/OTDT_2.3.x
feature@org.eclipse.objectteams.otdt.core.patch=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otdt.core.patch,tag=branches/maintenance/OTDT_2.3.x
feature@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.feature,tag=branches/maintenance/OTDT_2.3.x
+feature@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=features/org.eclipse.objectteams.otequinox.turbo.feature,tag=branches/maintenance/OTDT_2.3.x
!-- Also don't use version numbers for those plugins that hold the various otre jars: --
plugin@org.eclipse.jdt.core,3.10.0.v_OTDT_r231_qualifier=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=org.eclipse.jdt.core,tag=branches/maintenance/OTDT_2.3.x
@@ -23,6 +24,7 @@
plugin@org.eclipse.objectteams.otredyn=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otredyn,tag=branches/maintenance/OTDT_2.3.x
!the following is also referenced in otdt.doc/buildDoc.xml (plugin-name without version):
plugin@org.eclipse.objectteams.otequinox=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox,tag=branches/maintenance/OTDT_2.3.x
+plugin@org.eclipse.objectteams.otequinox.turbo=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.otequinox.turbo,tag=branches/maintenance/OTDT_2.3.x
plugin@org.eclipse.objectteams.eclipse.monitor=GIT,repo=git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,path=plugins/org.eclipse.objectteams.eclipse.monitor,tag=builds/201406101339
!not currently maintained:
diff --git a/releng/map/otdt.psf b/releng/map/otdt.psf
index 2391aab..f08cd7d 100644
--- a/releng/map/otdt.psf
+++ b/releng/map/otdt.psf
@@ -19,8 +19,10 @@
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otdt.ui"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otdt.ui.help"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otequinox"/>
+<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otequinox.turbo"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otequinox.branding"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,features/org.eclipse.objectteams.otequinox.feature"/>
+<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,features/org.eclipse.objectteams.otequinox.turbo.feature"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otre"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.otredyn"/>
<project reference="1.0,git://git.eclipse.org/gitroot/objectteams/org.eclipse.objectteams.git,master,plugins/org.eclipse.objectteams.runtime"/>