diff options
author | lgoubet | 2011-03-23 10:46:54 +0000 |
---|---|---|
committer | lgoubet | 2011-03-23 10:46:54 +0000 |
commit | b282e0a6fc749f1edf42620c9c1918a01206265d (patch) | |
tree | 0a186547a170fe278851717d0cd1f54d0c727286 | |
parent | 115fd07bedf97321ea9c4a50c95b6c783f368c27 (diff) | |
parent | 9f8ee14162d59f259c8f5796295a7703abc3e792 (diff) | |
download | org.eclipse.emf.compare-b282e0a6fc749f1edf42620c9c1918a01206265d.tar.gz org.eclipse.emf.compare-b282e0a6fc749f1edf42620c9c1918a01206265d.tar.xz org.eclipse.emf.compare-b282e0a6fc749f1edf42620c9c1918a01206265d.zip |
Merge branch 'refs/heads/master' of ssh://lgoubet@git.eclipse.org/gitroot/emfcompare/org.eclipse.emf.compare.git
-rw-r--r-- | packaging/org.eclipse.emf.compare.releng.buckminster/promoter.ant | 4 | ||||
-rw-r--r-- | packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap | 15 |
2 files changed, 13 insertions, 6 deletions
diff --git a/packaging/org.eclipse.emf.compare.releng.buckminster/promoter.ant b/packaging/org.eclipse.emf.compare.releng.buckminster/promoter.ant index f0b2d389f..0574eb193 100644 --- a/packaging/org.eclipse.emf.compare.releng.buckminster/promoter.ant +++ b/packaging/org.eclipse.emf.compare.releng.buckminster/promoter.ant @@ -18,7 +18,7 @@ <entry key="eclipse.home" value="${eclipse.home}" />
<entry key="build.id" value="${build.id}" />
<entry key="hudson.build.id" value="${hudson.build.id}" />
- <entry key="build.root" value="/shared/jobs/emf-compare-1.1/lastSuccessful" />
+ <entry key="build.root" value="/shared/jobs/emf-compare-1.2.0/lastSuccessful" />
<entry key="packages.base" value="EMF.Compare.downloads" />
<entry key="downloads.area" value="/home/data/httpd/download.eclipse.org/modeling/emf/compare" />
</propertyfile>
@@ -157,7 +157,7 @@ <fail message="saved.downloads.area property must be defined" unless="saved.downloads.area" />
<!-- defaults -->
- <property name="version" value="1.1.1" />
+ <property name="version" value="1.2.0" />
<property name="packages.directory" location="${saved.build.root}/archive/${saved.packages.base}" />
diff --git a/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap b/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap index 281b7aa2b..c699f7f6a 100644 --- a/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap +++ b/packaging/org.eclipse.emf.compare.releng.buckminster/releng/compare-platform.rmap @@ -12,9 +12,9 @@ <rm:locator pattern="^org\.eclipse\.gmf(?:\..+)?$" searchPathRef="indigo-staging"/> <rm:locator pattern="^org\.eclipse\.gef(?:\..+)?$" searchPathRef="indigo-staging"/> <rm:locator pattern="^org\.eclipse\.draw2d(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.apache(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^org\.w3c(?:\..+)?$" searchPathRef="indigo-staging"/> - <rm:locator pattern="^javax(?:\..+)?$" searchPathRef="indigo-staging"/> + <rm:locator pattern="^org\.apache(?:\..+)?$" searchPathRef="orbit"/> + <rm:locator pattern="^org\.w3c(?:\..+)?$" searchPathRef="orbit"/> + <rm:locator pattern="^javax(?:\..+)?$" searchPathRef="orbit"/> <rm:locator pattern="^org\.eclipse\.team\.svn(?:\..+)?$" searchPathRef="indigo-staging"/> <rm:locator searchPathRef="platform"/> <rm:searchPath name="local.releng"> @@ -39,11 +39,18 @@ </rm:uri> </rm:provider> </rm:searchPath> + <rm:searchPath name="orbit"> + <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> + <rm:uri format="{0}/tools/orbit/downloads/drops/S20110124210048/repository"> + <bc:propertyRef key="eclipse.download"/> + </rm:uri> + </rm:provider> + </rm:searchPath> <rm:searchPath name="platform"> <rm:provider componentTypes="eclipse.feature,osgi.bundle" readerType="p2" source="false" mutable="false"> <rm:uri format="{0}/eclipse/updates/3.7milestones"> <bc:propertyRef key="eclipse.download"/> </rm:uri> </rm:provider> - </rm:searchPath> + </rm:searchPath> </rm:rmap> |