Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorAndrew Niefer2011-06-24 10:40:35 -0400
committerAndrew Niefer2011-06-24 10:40:35 -0400
commit2e72df39a6e2fa12340d2acde54c6f00b3cff400 (patch)
tree69dcbdca0d22b6d584bf1565c0095aa6d1457fcf /releng
parent3f021f7cf9ea0aa3fcdc2c7055b657bf72523762 (diff)
downloadrt.equinox.framework-2e72df39a6e2fa12340d2acde54c6f00b3cff400.tar.gz
rt.equinox.framework-2e72df39a6e2fa12340d2acde54c6f00b3cff400.tar.xz
rt.equinox.framework-2e72df39a6e2fa12340d2acde54c6f00b3cff400.zip
Bug 350102 - Update launcher releng scripts to support moving to git
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/build.xml47
-rw-r--r--releng/org.eclipse.equinox.launcher.releng/remote.sh9
2 files changed, 53 insertions, 3 deletions
diff --git a/releng/org.eclipse.equinox.launcher.releng/build.xml b/releng/org.eclipse.equinox.launcher.releng/build.xml
index 433d24fc6..87f499f63 100644
--- a/releng/org.eclipse.equinox.launcher.releng/build.xml
+++ b/releng/org.eclipse.equinox.launcher.releng/build.xml
@@ -13,6 +13,8 @@
<property name="cvsRoot" value="${cvsLogin}@dev.eclipse.org:/cvsroot/rt" />
<property name="cvsrsh" value="ssh" />
<property name="cvsExecutablePath" value="org.eclipse.equinox/framework/bundles/org.eclipse.equinox.executable" />
+ <property name="cvsExecutableBinaries" value="org.eclipse.equinox/framework/releng/org.eclipse.equinox.executable.binaries" />
+ <property name="cvsLauncherBinaries" value="org.eclipse.equinox/framework/releng/org.eclipse.equinox.launcher.binaries" />
<property name="cvsTag" value="HEAD" />
<!-- Macro for execing scp -->
@@ -20,11 +22,12 @@
<attribute name="dir" />
<attribute name="source"/>
<attribute name="destination" />
+ <attribute name="flag" default="" />
<attribute name="failonerror" default="true" />
<sequential>
<echo message="Copying @{source} to @{destination}."/>
<exec dir="@{dir}" executable="scp" failonerror="@{failonerror}">
- <arg value="-q"/>
+ <arg value="-q${flag}"/>
<arg line="@{source}" />
<arg value="@{destination}" />
</exec>
@@ -213,6 +216,48 @@
<antcall target="buildRemote" />
</target>
+ <target name="stageBinaries" >
+ <property name="staging" value="${basedir}/staging" />
+
+ <cvs command="export -d org.eclipse.equinox.executable.binaries" tag="${cvsTag}" cvsrsh="${cvsrsh}" package="${cvsExecutableBinariesPath}" cvsRoot="${cvsRoot}" dest="${staging}" quiet="true" failonerror="true"/>
+ <cvs command="export -d org.eclipse.equinox.launcher.binaries" tag="${cvsTag}" cvsrsh="${cvsrsh}" package="${cvsLauncherBinariesPath}" cvsRoot="${cvsRoot}" dest="${staging}" quiet="true" failonerror="true"/>
+
+ <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.executable/bin/*" destination="org.eclipse.equinox.executable.binaries" />
+ <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.executable/contributed/*" destination="org.eclipse.equinox.executable.binaries" />
+ <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.launcher/fragments/*" destination="org.eclipse.equinox.launcher.binaries" />
+ <SCP dir="${staging}" flag="r" source="${resultsBaseFolder}/org.eclipse.equinox.launcher/contributed/*" destination="org.eclipse.equinox.launcher.binaries" />
+
+ <pathconvert property="launcherJar" >
+ <last><sort><fileset dir="${eclipseHome}/plugins" includes="org.eclipse.equinox.launcher_*.jar" /></sort></last>
+ </pathconvert>
+
+ <java jar="launcherJar" fork="true" >
+ <arg line="-application org.eclipse.ant.core.antRunner" />
+ <arg line="-f ${basedir}/build.xml" />
+ <arg line="publishBinaries" />
+ <arg line="-Dp2.repository=${staging}/p2" />
+ <arg line="-Dstaging=${staging}" />
+ </java>
+ </target>
+
+ <target name="publishBinaries" >
+ <eclipse.idReplacer featureFilePath="${staging}/org.eclipse.equinox.executable.binaries/feature.xml" selfVersion="1.0.0.${build_version}" featureIds="" pluginIds=""/>
+ <eclipse.gatherFeature
+ metadataRepository="${p2.repository}"
+ artifactRepository="${p2.repository}"
+ baseDirectory="${staging}/org.eclipse.equinox.launcher.binaries"
+ buildResultFolder="${staging}/org.eclipse.equinox.launcher.binaries"
+ />
+
+ <eclipse.idReplacer featureFilePath="${staging}/org.eclipse.equinox.executable.binaries/feature.xml" selfVersion="1.0.0.${build_version}" featureIds="" pluginIds=""/>
+ <eclipse.gatherFeature
+ metadataRepository="${p2.repository}"
+ artifactRepository="${p2.repository}"
+ baseDirectory="${staging}/org.eclipse.equinox.executable.binaries"
+ buildResultFolder="${staging}/org.eclipse.equinox.executable.binaries"
+ />
+ </target>
+
<target name="buildLocal" if="local" >
<condition property="javaHome" value="${j_win32}" else="${java.home}" >
<isset property="j_win32"/>
diff --git a/releng/org.eclipse.equinox.launcher.releng/remote.sh b/releng/org.eclipse.equinox.launcher.releng/remote.sh
index 9c50a6380..e7e05272c 100644
--- a/releng/org.eclipse.equinox.launcher.releng/remote.sh
+++ b/releng/org.eclipse.equinox.launcher.releng/remote.sh
@@ -6,6 +6,8 @@ scriptDir=`dirname "$0"`
ANT_HOME=/bluebird/teamswt/swt-builddir/build/apache-ant-1.7.1
extraArgs=""
+target=buildConfig
+
while [ "$1" != "" ]; do
if [ "$1" = "-java" ] && [ "$2" != "" ]; then
JAVA_HOME=/bluebird/teamswt/swt-builddir/build/JRE/$2
@@ -16,6 +18,9 @@ while [ "$1" != "" ]; do
elif [ "$1" = "-antHome" ] && [ "$2" != "" ]; then
ANT_HOME="$2"
shift
+ elif [ "$1" = "-target" ] && [ "$2" != "" ]; then
+ target="$2"
+ shift
else
extraArgs="$extraArgs $1"
fi
@@ -47,5 +52,5 @@ PATH=$JAVA_HOME/jre/bin:$ANT_HOME/bin:$PATH
export JAVA_HOME ANT_HOME PATH
echo JAVA_HOME = $JAVA_HOME
echo ANT_HOME = $ANT_HOME
-echo ant -f ${scriptDir}/build.xml buildConfig $extraArgs
-ant -f ${scriptDir}/build.xml buildConfig $extraArgs
+echo ant -f ${scriptDir}/build.xml $target $extraArgs
+ant -f ${scriptDir}/build.xml $target $extraArgs

Back to the top