mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-10 10:35:23 +02:00
Code Issues Wiki Activity

[releng] Migrate to M5_33 basebuilder. Use equinox.launcher.jar instead of startup.jar.

Browse source
This commit is contained in:
Martin Oberhuber 2007-02-28 10:06:37 +00:00
parent 4443ee0ae2
commit b7311b6798
7 changed files with 116 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
releng/org.eclipse.rse.build/bootstrap.sh
View file

@ -208,7 +208,7 @@ echo recipients=$recipients >> monitor.properties
echo log=$postingDirectory/$buildLabel/index.php >> monitor.properties
#the base command used to run AntRunner headless
antRunner="`which java` -Xmx500m -jar ../org.eclipse.releng.basebuilder/startup.jar -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc -application org.eclipse.ant.core.antRunner"
antRunner="`which java` -Xmx500m -jar ../org.eclipse.releng.basebuilder/plugins/org.eclipse.equinox.launcher.jar -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=ppc -application org.eclipse.ant.core.antRunner"
#clean drop directories
# $antRunner -buildfile eclipse/helper.xml cleanSites

2
releng/org.eclipse.rse.build/build.pl
View file

@ -76,7 +76,7 @@ $timeStamp = "${mydstamp}-${mytstamp}";
$buildId = $buildType . $timeStamp;
$buildId = ask("Enter the build id", $buildType . $timeStamp);
$incantation = "java -cp ${basebuilder}/startup.jar org.eclipse.core.launcher.Main ";
$incantation = "java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main ";
$incantation .= "-application org.eclipse.ant.core.antRunner ";
$incantation .= "-buildfile ${pdeBuild}/scripts/build.xml ";
$incantation .= "-DbuildDirectory=${buildDirectory} ";

2
releng/org.eclipse.rse.build/build.rb
View file

@ -56,7 +56,7 @@ mydstamp = Time.now.strftime("%Y%m%d")
mytstamp = Time.now.strftime("%H%M")
buildId = ask("Enter the build id", buildType + mydstamp + "-" + mydstamp)
command = "java -cp #{basebuilder}/startup.jar org.eclipse.core.launcher.Main "
command = "java -cp #{basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
command += "-application org.eclipse.ant.core.antRunner "
command += "-buildfile #{pdeBuild}/scripts/build.xml "
command += "-DbuildDirectory=#{buildDirectory} "

2
releng/org.eclipse.rse.build/go.sh
View file

@ -42,7 +42,7 @@ timestamp="${mydstamp}-${mytstamp}"
buildId="${buildType}${timestamp}"
rm -rf "${buildDirectory}"
command="java -cp ${basebuilder}/startup.jar org.eclipse.core.launcher.Main "
command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
command="$command -application org.eclipse.ant.core.antRunner "
command="$command -buildfile ${pdeBuild}/scripts/build.xml "
command="$command -DbuildDirectory=${buildDirectory} "

2
releng/org.eclipse.rse.build/nightly.sh
View file

@ -56,7 +56,7 @@ if [ "$3" != "" ]; then
fi
rm -rf "${buildDirectory}"
command="java -cp ${basebuilder}/startup.jar org.eclipse.core.launcher.Main "
command="java -cp ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar org.eclipse.core.launcher.Main "
command="$command -application org.eclipse.ant.core.antRunner "
command="$command -buildfile ${pdeBuild}/scripts/build.xml "
command="$command -DbuildDirectory=${buildDirectory} "

30
releng/org.eclipse.rse.build/setup.sh
View file

@ -38,12 +38,19 @@ if [ ! -f eclipse/plugins/org.eclipse.core.resources_3.3.0.v20070202.jar ]; then
tar xfvz eclipse-SDK-3.3M5-linux-gtk-ppc.tar.gz
rm eclipse-SDK-3.3M5-linux-gtk-ppc.tar.gz
fi
if [ ! -h eclipse/startup.jar ]; then
if [ ! -f eclipse/startup.jar ]; then
curdir2=`pwd`
cd eclipse/plugins
LAUNCHER=`ls org.eclipse.equinox.launcher_*.jar | sort | tail -1`
echo "LAUNCHER=${LAUNCHER}"
if [ -h ../startup.jar ]; then
rm ../startup.jar
fi
LAUNCHER=`ls org.eclipse.equinox.launcher*.jar | sort | tail -1`
if [ "${LAUNCHER}" != "" ]; then
echo "eclipse LAUNCHER=${LAUNCHER}"
ln -s plugins/${LAUNCHER} ../startup.jar
else
echo "Eclipse: NO startup.jar LAUNCHER FOUND!"
fi
cd ${curdir2}
fi
if [ ! -f eclipse/plugins/org.eclipse.cdt.core_4.0.0.200702161600.jar ]; then
@ -77,7 +84,22 @@ if [ ! -f org.eclipse.releng.basebuilder/plugins/org.eclipse.update.core_3.2.100
else
echo "Getting basebuilder from CVS..."
fi
cvs -q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r M5_33 org.eclipse.releng.basebuilder
cvs -Q -d :pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse co -r M5_33 org.eclipse.releng.basebuilder
fi
if [ ! -f org.eclipse.releng.basebuilder/startup.jar ]; then
curdir2=`pwd`
cd org.eclipse.releng.basebuilder/plugins
if [ -h ../startup.jar ]; then
rm ../startup.jar
fi
LAUNCHER=`ls org.eclipse.equinox.launcher*.jar | sort | tail -1`
if [ "${LAUNCHER}" != "" ]; then
echo "basebuilder: LAUNCHER=${LAUNCHER}"
ln -s plugins/${LAUNCHER} ../startup.jar
else
echo "basebuilder: NO LAUNCHER FOUND"
fi
cd ${curdir2}
fi
# checkout the RSE builder

11
releng/org.eclipse.rse.updatesite/bin/mkTestUpdates.sh
View file

@ -23,6 +23,7 @@ umask 022
#Use Java5 on build.eclipse.org - need JRE for pack200
export PATH=/shared/common/ibm-java2-ppc64-50/jre/bin:/shared/common/ibm-java2-ppc64-50/bin:$PATH
basebuilder=${HOME}/ws2/org.eclipse.releng.basebuilder
# patch site.xml
cd ..
@ -67,8 +68,9 @@ if [ `basename $SITE` = testUpdates ]; then
mv -f web/site.xsl.new web/site.xsl
echo "Conditioning the site... $SITE"
#java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
#java -jar $HOME/ws2/eclipse/startup.jar \
java \
-jar $HOME/ws2/eclipse/startup.jar \
-jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-application org.eclipse.update.core.siteOptimizer \
-jarProcessor -outputDir $SITE \
-processAll -repack $SITE
@ -253,8 +255,8 @@ sed -e '/!EUROPA_ONLY!/d' site.xml > site-europa.xml
# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=154069
echo "Packing the site... $SITE"
#java -Dorg.eclipse.update.jarprocessor.pack200=$mydir \
java \
-jar $HOME/ws2/eclipse/startup.jar \
#java -jar $HOME/ws2/eclipse/startup.jar \
-jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-application org.eclipse.update.core.siteOptimizer \
-jarProcessor -outputDir $SITE \
-processAll -pack $SITE
@ -264,7 +266,8 @@ java \
#Create the digest
echo "Creating digest..."
java -jar $HOME/ws2/eclipse/startup.jar \
#java -jar $HOME/ws2/eclipse/startup.jar \
java -jar ${basebuilder}/plugins/org.eclipse.equinox.launcher.jar \
-application org.eclipse.update.core.siteOptimizer \
-digestBuilder -digestOutputDir=$SITE \
-siteXML=$SITE/site.xml