mirror of
https://github.com/eclipse-cdt/cdt
synced 2025-07-04 23:55:26 +02:00
[releng] Migrate to M5_33 basebuilder. Use equinox.launcher.jar instead of startup.jar.
This commit is contained in:
Martin Oberhuber
parent
4443ee0ae2
commit
b7311b6798
7 changed files with 116 additions and 91 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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} ";
|
||||
|
|
|
|||
|
|
@ -1,79 +1,79 @@
|
|||
#!/usr/bin/ruby
|
||||
# Build script for Remote System Explorer
|
||||
# Author: Dave Dykstal, Kushal Munir
|
||||
# Prerequisites:
|
||||
# written in ruby
|
||||
# java and cvs have to be in the path
|
||||
|
||||
require "ftools"
|
||||
|
||||
def ask(question, default)
|
||||
message = "#{question} (default is #{default}): "
|
||||
STDERR.print message
|
||||
answer = readline().strip
|
||||
answer = answer.empty? ? default : answer
|
||||
return answer
|
||||
end
|
||||
|
||||
# "eclipse" is the location of the basic PDE and plugins to compile against
|
||||
# This should include the org.eclipse.pde.build project
|
||||
eclipse = "../eclipse"
|
||||
|
||||
# "basebuilder" is the location of the Eclipse Releng basebuilder
|
||||
# This can be set to #{eclipse}
|
||||
basebuilder = "../org.eclipse.releng.basebuilder"
|
||||
|
||||
# "builder" is the location of the custom build scripts customTargets.xml and build.properties
|
||||
# (i.e. the contents of org.eclipse.rse.build)
|
||||
builder = "."
|
||||
|
||||
# "working" is where the build is actually done, does not need to exist
|
||||
working = "../working"
|
||||
|
||||
# make these absolute paths
|
||||
eclipse = File.expand_path(eclipse)
|
||||
basebuilder = File.expand_path(basebuilder)
|
||||
builder = File.expand_path(builder)
|
||||
working = File.expand_path(working)
|
||||
|
||||
# Find the base build scripts: genericTargets.xml and build.xml
|
||||
candidates = Dir["#{basebuilder}/plugins/org.eclipse.pde.build*"]
|
||||
if (candidates.size == 0) then
|
||||
raise("PDE Build was not found.")
|
||||
end
|
||||
if (candidates.size > 1) then
|
||||
raise("Too many versions of PDE Build were found.")
|
||||
end
|
||||
pdeBuild = candidates[0]
|
||||
|
||||
buildDirectory = "#{working}/build"
|
||||
packageDirectory = "#{working}/package"
|
||||
publishDirectory = "#{working}/publish"
|
||||
|
||||
tag = ask("Enter tag to fetch from CVS", "HEAD")
|
||||
buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P")
|
||||
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 += "-application org.eclipse.ant.core.antRunner "
|
||||
command += "-buildfile #{pdeBuild}/scripts/build.xml "
|
||||
command += "-DbuildDirectory=#{buildDirectory} "
|
||||
command += "-DpackageDirectory=#{packageDirectory} "
|
||||
command += "-DpublishDirectory=#{publishDirectory} "
|
||||
command += "-Dbuilder=#{builder} "
|
||||
command += "-DbaseLocation=#{eclipse} "
|
||||
command += "-DbuildType=#{buildType} "
|
||||
command += "-DbuildId=#{buildId} "
|
||||
command += "-DmapVersionTag=#{tag} "
|
||||
command += "-Dmydstamp=#{mydstamp} "
|
||||
command += "-Dmytstamp=#{mytstamp} "
|
||||
if ("#{buildType}" == "N") then
|
||||
command += "-DforceContextQualifier=#{buildId} "
|
||||
command += "-DfetchTag=HEAD "
|
||||
end
|
||||
|
||||
puts(command)
|
||||
|
||||
#!/usr/bin/ruby
|
||||
# Build script for Remote System Explorer
|
||||
# Author: Dave Dykstal, Kushal Munir
|
||||
# Prerequisites:
|
||||
# written in ruby
|
||||
# java and cvs have to be in the path
|
||||
|
||||
require "ftools"
|
||||
|
||||
def ask(question, default)
|
||||
message = "#{question} (default is #{default}): "
|
||||
STDERR.print message
|
||||
answer = readline().strip
|
||||
answer = answer.empty? ? default : answer
|
||||
return answer
|
||||
end
|
||||
|
||||
# "eclipse" is the location of the basic PDE and plugins to compile against
|
||||
# This should include the org.eclipse.pde.build project
|
||||
eclipse = "../eclipse"
|
||||
|
||||
# "basebuilder" is the location of the Eclipse Releng basebuilder
|
||||
# This can be set to #{eclipse}
|
||||
basebuilder = "../org.eclipse.releng.basebuilder"
|
||||
|
||||
# "builder" is the location of the custom build scripts customTargets.xml and build.properties
|
||||
# (i.e. the contents of org.eclipse.rse.build)
|
||||
builder = "."
|
||||
|
||||
# "working" is where the build is actually done, does not need to exist
|
||||
working = "../working"
|
||||
|
||||
# make these absolute paths
|
||||
eclipse = File.expand_path(eclipse)
|
||||
basebuilder = File.expand_path(basebuilder)
|
||||
builder = File.expand_path(builder)
|
||||
working = File.expand_path(working)
|
||||
|
||||
# Find the base build scripts: genericTargets.xml and build.xml
|
||||
candidates = Dir["#{basebuilder}/plugins/org.eclipse.pde.build*"]
|
||||
if (candidates.size == 0) then
|
||||
raise("PDE Build was not found.")
|
||||
end
|
||||
if (candidates.size > 1) then
|
||||
raise("Too many versions of PDE Build were found.")
|
||||
end
|
||||
pdeBuild = candidates[0]
|
||||
|
||||
buildDirectory = "#{working}/build"
|
||||
packageDirectory = "#{working}/package"
|
||||
publishDirectory = "#{working}/publish"
|
||||
|
||||
tag = ask("Enter tag to fetch from CVS", "HEAD")
|
||||
buildType = ask("Enter build type (P=Personal, N=Nightly, I=Integration, S=Stable)", "P")
|
||||
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}/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} "
|
||||
command += "-DpackageDirectory=#{packageDirectory} "
|
||||
command += "-DpublishDirectory=#{publishDirectory} "
|
||||
command += "-Dbuilder=#{builder} "
|
||||
command += "-DbaseLocation=#{eclipse} "
|
||||
command += "-DbuildType=#{buildType} "
|
||||
command += "-DbuildId=#{buildId} "
|
||||
command += "-DmapVersionTag=#{tag} "
|
||||
command += "-Dmydstamp=#{mydstamp} "
|
||||
command += "-Dmytstamp=#{mytstamp} "
|
||||
if ("#{buildType}" == "N") then
|
||||
command += "-DforceContextQualifier=#{buildId} "
|
||||
command += "-DfetchTag=HEAD "
|
||||
end
|
||||
|
||||
puts(command)
|
||||
|
||||
system(command)
|
||||
|
|
@ -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} "
|
||||
|
|
|
|||
|
|
@ -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} "
|
||||
|
|
|
|||
|
|
@ -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}"
|
||||
ln -s plugins/${LAUNCHER} ../startup.jar
|
||||
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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue