From c1981bcbc94c966bdfaf5730a000a94ebba95402 Mon Sep 17 00:00:00 2001 From: Martin Oberhuber < martin.oberhuber@windriver.com> Date: Tue, 14 Dec 2010 12:09:28 +0000 Subject: [PATCH] Bug 332513 - [releng] Legacy Builder should use Mapfiles from org.eclipse.tm.releng --- releng/org.eclipse.rse.build/go.sh | 4 +++- releng/org.eclipse.rse.build/nightly.sh | 2 +- releng/org.eclipse.rse.build/setup.sh | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/releng/org.eclipse.rse.build/go.sh b/releng/org.eclipse.rse.build/go.sh index d5a69faee9a..667e6793e00 100755 --- a/releng/org.eclipse.rse.build/go.sh +++ b/releng/org.eclipse.rse.build/go.sh @@ -22,11 +22,12 @@ curdir=`pwd` cd `dirname $0` mydir=`pwd` -# pathes: see build.rb for reference +# make pathes absolute cd "$mydir/../eclipse" ; eclipse=`pwd` cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd` cd "$mydir/../working" ; working=`pwd` cd "$mydir/../publish" ; publishDirectory=`pwd` +cd "$mydir/../org.eclipse.tm.releng" ; mapRoot=`pwd` cd "$mydir" ; builder=`pwd` # Find the base build scripts: genericTargets.xml and build.xml @@ -57,6 +58,7 @@ command="$command -DbuildDirectory=${buildDirectory} " command="$command -DpackageDirectory=${packageDirectory} " command="$command -DpublishDirectory=${publishDirectory} " command="$command -Dbuilder=${builder} " +command="$command -DmapRoot=${mapRoot} " command="$command -DbaseLocation=${eclipse} " command="$command -DbuildType=${buildType} " command="$command -DbuildId=${buildId} " diff --git a/releng/org.eclipse.rse.build/nightly.sh b/releng/org.eclipse.rse.build/nightly.sh index 698b818032c..1c7495afb34 100755 --- a/releng/org.eclipse.rse.build/nightly.sh +++ b/releng/org.eclipse.rse.build/nightly.sh @@ -27,7 +27,7 @@ curdir=`pwd` cd `dirname $0` mydir=`pwd` -# pathes: see build.rb for reference +# make pathes absolute cd "$mydir/../eclipse" ; eclipse=`pwd` cd "$mydir/../org.eclipse.releng.basebuilder" ; basebuilder=`pwd` cd "$mydir/../working" ; working=`pwd` diff --git a/releng/org.eclipse.rse.build/setup.sh b/releng/org.eclipse.rse.build/setup.sh index 9d3615c0620..1bb3739bde7 100755 --- a/releng/org.eclipse.rse.build/setup.sh +++ b/releng/org.eclipse.rse.build/setup.sh @@ -266,7 +266,7 @@ if [ ! -h setup.sh ]; then fi chmod a+x doit_irsbuild.sh doit_nightly.sh cd org.eclipse.rse.build -chmod a+x build.pl build.rb go.sh nightly.sh setup.sh +chmod a+x go.sh nightly.sh setup.sh cd .. echo "Your build environment is now created."