Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorsbouchet2012-03-14 14:56:49 +0000
committersbouchet2012-03-14 14:56:49 +0000
commit940f7565f042baa73d9bf54dde7601ba64094994 (patch)
tree4fc8f08570453f61f13bb07f191c1a9caefb4d17 /releng
parentf871ad6ed2532d8441abef11b79e8bdc369c7950 (diff)
downloadorg.eclipse.eef-940f7565f042baa73d9bf54dde7601ba64094994.tar.gz
org.eclipse.eef-940f7565f042baa73d9bf54dde7601ba64094994.tar.xz
org.eclipse.eef-940f7565f042baa73d9bf54dde7601ba64094994.zip
fixed promotion
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.eef.update/promoter.xml14
1 files changed, 8 insertions, 6 deletions
diff --git a/releng/org.eclipse.emf.eef.update/promoter.xml b/releng/org.eclipse.emf.eef.update/promoter.xml
index 04d44c7d3..deed488a0 100644
--- a/releng/org.eclipse.emf.eef.update/promoter.xml
+++ b/releng/org.eclipse.emf.eef.update/promoter.xml
@@ -9,7 +9,7 @@
Contributors:
Obeo - initial API and implementation
- $Id: promoter.xml,v 1.24 2012/03/14 13:50:39 sbouchet Exp $
+ $Id: promoter.xml,v 1.25 2012/03/14 14:56:49 sbouchet Exp $
-->
<project name="Promoter" default="main">
<!--
@@ -58,7 +58,7 @@ then place it in the following location. You can also redefine the path in the p
$${thirdPartyJarsDir}/ant-contrib.jar = ${thirdPartyJarsDir}/ant-contrib.jar
Or, to download this automatically, see $${relengCommonBuilderDir}/build.properties#thirdPartyDownloadLicenseAcceptance.
-</fail>
+ </fail>
</target>
<target name="get.ant-contrib" if="thirdPartyDownloadLicenseAcceptanceOK">
@@ -225,8 +225,8 @@ $${thirdPartyJarsDir}/ant-contrib.jar = ${thirdPartyJarsDir}/ant-contri
</unzip>
<!-- adding p2.index -->
- <echo file="${build.repository.directory}/p2.index" message="version = 1
-metadata.repository.factory.order = content.xml,\!
+ <echo file="${build.repository.directory}/p2.index" message="version = 1${line.separator}
+metadata.repository.factory.order = content.xml,\!${line.separator}
artifact.repository.factory.order = artifacts.xml,\!" />
<!-- Adding p2.mirrorsURL and p2.statsURI to the repository -->
@@ -240,8 +240,10 @@ artifact.repository.factory.order = artifacts.xml,\!" />
<zip destfile="${build.repository.directory}/artifacts.jar" basedir="${build.repository.directory}" includes="artifacts.xml" />
+ <!--
<delete file="${build.repository.directory}/artifacts.xml" />
<delete file="${build.repository.directory}/artifacts.original.xml" />
+ -->
<!-- END download stats -->
<!-- Add to composite repo -->
@@ -257,8 +259,8 @@ artifact.repository.factory.order = artifacts.xml,\!" />
<available file="${composite.repository.directory}/p2.index" type="file" />
</not>
<then>
- <echo file="${composite.repository.directory}/p2.index" message="version=1
-metadata.repository.factory.order=compositeContent.jar,!
+ <echo file="${composite.repository.directory}/p2.index" message="version=1${line.separator}
+metadata.repository.factory.order=compositeContent.jar,!${line.separator}
artifact.repository.factory.order=compositeArtifacts.jar,!" />
</then>
</if>

Back to the top