Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorSilenio Quarti2013-12-06 16:18:21 +0000
committerSilenio Quarti2013-12-06 16:18:21 +0000
commit72c26472b6269957b427fbc4b5251d5f3d047745 (patch)
tree328936e99519431252072c5262fbeb7a3e3c15ea /releng
parent38ce3e64440c1f5b4d2414987af381845829f78d (diff)
downloadrt.equinox.framework-72c26472b6269957b427fbc4b5251d5f3d047745.tar.gz
rt.equinox.framework-72c26472b6269957b427fbc4b5251d5f3d047745.tar.xz
rt.equinox.framework-72c26472b6269957b427fbc4b5251d5f3d047745.zip
Bug 420471 - rt.equinox.framework/bundles/org.eclipse.equinox.executable should be removed (from master)I20131209-0800I20131208-2000
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml12
1 files changed, 4 insertions, 8 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 6faa96d88..d0401531b 100644
--- a/releng/org.eclipse.equinox.launcher.releng/build.xml
+++ b/releng/org.eclipse.equinox.launcher.releng/build.xml
@@ -129,10 +129,10 @@
<target name="buildLocal" if="local" >
<property name="tmpdir" value="${basedir}/${fragmentFolder}.${gitTag}"/>
- <property file="${localGit}/rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/make_version.mak" />
+ <property file="${localGit}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/make_version.mak" />
<mkdir dir="${tmpdir}" />
<copy todir="${tmpdir}">
- <fileset dir="${localGit}/rt.equinox.framework/bundles/org.eclipse.equinox.executable/library" includes="**" />
+ <fileset dir="${localGit}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library" includes="**" />
</copy>
<exec dir="${tmpdir}/${ws}" executable="${tmpdir}/${ws}/build.bat" failonerror="true">
<arg line="${arch}"/>
@@ -156,8 +156,8 @@
</condition>
<property name="remotetmpdir" value="${remotebuilddir}/${fragmentFolder}.${gitTag}"/>
<property name="zip_file" value="${fragmentFolder}.${gitTag}.library.zip"/>
- <property file="${localGit}/rt.equinox.framework/bundles/org.eclipse.equinox.executable/library/make_version.mak" />
- <zip basedir="${localGit}/rt.equinox.framework/bundles/org.eclipse.equinox.executable/library" includes="**" destfile="${basedir}/${zip_file}"/>
+ <property file="${localGit}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/make_version.mak" />
+ <zip basedir="${localGit}/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library" includes="**" destfile="${basedir}/${zip_file}"/>
<scp file="${basedir}/${zip_file}"
todir="${userName}@${machine}:${remotebuilddir}"
keyfile="${keyfile}"
@@ -240,9 +240,5 @@
<git dir="${localGit}/rt.equinox.binaries" command="commit" arguments="-a -m &quot;Recompiled binaries ${commitMsg}&quot;" />
<git dir="${localGit}/rt.equinox.binaries" command="tag" arguments="${tag}" />
- <replaceregexp match="binaryTag=(.*)" replace="binaryTag=${tag}" >
- <fileset dir="${localGit}/rt.equinox.framework" includes="**/build.properties" />
- </replaceregexp>
- <git dir="${localGit}/rt.equinox.framework" command="commit" arguments="-a -m &quot;Binaries ${tag} ${commitMsg}&quot;" />
</target>
</project>

Back to the top