tweak parms order

3 files changed, 16 insertions, 12 deletions

diff --git a/tb3/build-scripts/dev-bibisect-build b/tb3/build-scripts/dev-bibisect-build
index 21ce9b4..ecb2330 100755
--- a/tb3/build-scripts/dev-bibisect-build
+++ b/tb3/build-scripts/dev-bibisect-build
@@ -12,41 +12,45 @@ CCACHE_SIZE=10G
 
 
 echo "==== Setting up environment ===="
-echo "building commit $1 from repo $3 in workdir $2 on platform $4 as builder $5 with script $0."
 set -e
-export BUILDER_HOME=`readlink -f $2`
+COMMIT=$1
+REPO=$2
+PLATFORM=$3
+BUILDER=$4
+export BUILDER_HOME=`readlink -f $5`
+echo "building commit $COMMIT from repo $REPO in workdir $BUILDER_HOME on platform $PLATFORM as builder $BUILDER with script $0."
 cd $BUILDER_HOME
 rm -rf builddir artifactdir
 mkdir -p builddir tarballs ccache
 export CCACHE_DIR=$BUILDER_HOME/ccache
-export BINREPO_BRANCH=builder-$5
-export BINREPO_TAG=source-hash-$1
+export BINREPO_BRANCH=builder-$BUILDER
+export BINREPO_TAG=source-hash-$COMMIT
 (cd $BINREPO && git branch $BINREPO_BRANCH initial) || true
 git clone $BINREPO $BUILDER_HOME/artifactdir --branch $BINREPO_BRANCH
-git --git-dir=$3 log -1 --pretty=format:"source-hash-%H%n%n" $1 > $BUILDER_HOME/commitmsg
-git --git-dir=$3 log -1 --pretty=fuller $1 >> $BUILDER_HOME/commitmsg
+git --git-dir=$REPO log -1 --pretty=format:"source-hash-%H%n%n" $COMMIT > $BUILDER_HOME/commitmsg
+git --git-dir=$REPO log -1 --pretty=fuller $COMMIT >> $BUILDER_HOME/commitmsg
 ccache -M$CCACHE_SIZE
 echo
 echo
 
 echo "==== Unpacking source ===="
 echo Unpacking source ...
-(cd $3 && git archive --format tar $1)| tar --extract --directory $BUILDER_HOME/builddir
+(cd $REPO && git archive --format tar $COMMIT)| tar --extract --directory $BUILDER_HOME/builddir
 echo done.
 mkdir -p $BUILDER_HOME/builddir/.git
 echo
 echo
 
 echo "==== Configuring build ===="
-echo "configuring commit $1 from repo $3 in workdir $2 on platform $4 as builder $5 with script $0." > $BUILDER_HOME/artifactdir/autogen.log
+echo "configuring commit $COMMIT from repo $REPO in workdir $BUILDER_HOME on platform $PLATFORM as builder $BUILDER with script $0." > $BUILDER_HOME/artifactdir/autogen.log
 (cd $BUILDER_HOME/builddir && ./autogen.sh --with-external-tar=$BUILDER_HOME/tarballs --disable-linkoo --disable-option-checking) 2>&1 | tee --append $BUILDER_HOME/artifactdir/autogen.log
 echo
 echo
 
 echo "==== Building ===="
 ccache -s
-echo "building commit $1 from repo $3 in workdir $2 on platform $4 as builder $5 with script $0." > $BUILDER_HOME/artifactdir/make.log
-echo "dev-installing commit $1 from repo $3 in workdir $2 on platform $4 as builder $5 with script $0." > $BUILDER_HOME/artifactdir/dev-install.log
+echo "building commit $COMMIT from repo $REPO in workdir $BUILDER_HOME on platform $PLATFORM as builder $BUILDER with script $0." > $BUILDER_HOME/artifactdir/make.log
+echo "dev-installing commit $COMMIT from repo $REPO in workdir $BUILDER_HOME on platform $PLATFORM as builder $BUILDER with script $0." > $BUILDER_HOME/artifactdir/dev-install.log
 (cd $BUILDER_HOME/builddir; make || make) 2>&1 | tee --append $BUILDER_HOME/artifactdir/make.log
 (cd $BUILDER_HOME/builddir; make dev-install) 2>&1 | tee --append $BUILDER_HOME/artifactdir/dev-install.log
 ccache -s
diff --git a/tb3/tb3-local-client b/tb3/tb3-local-client
index 32548cb..9babafe 100755
--- a/tb3/tb3-local-client
+++ b/tb3/tb3-local-client
@@ -48,10 +48,10 @@ class LocalClient:
         command = sh.Command(self.args['script'])
         rc = command(
             proposal['commit'],
-            self.workdir,
             self.args['repo'],
             self.args['platform'],
             self.args['builder'],
+            self.workdir,
             _err=outfile,
             _out=outfile,
             _ok_code=range(256)).exit_code
diff --git a/tb3/tests/build-script.sh b/tb3/tests/build-script.sh
index 9ac89e4..32827c8 100755
--- a/tb3/tests/build-script.sh
+++ b/tb3/tests/build-script.sh
@@ -6,6 +6,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
-echo "building commit $1 from repo $3 in workdir $2 on platform $4 as builder $5."
+echo "building commit $1 from repo $2 on platform $3 as builder $4 in workdir $5."
 true
 # vim: set et sw=4 ts=4: