From 984fd5bc17a0300900a722d752856e8a67963ea1 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 1 Jul 2010 15:29:34 +0200 Subject: [PATCH] tweak for princeton -- drop 4.3 --- scripts/all-modules-push.sh | 2 +- scripts/all-modules.sh | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/all-modules-push.sh b/scripts/all-modules-push.sh index 1345375..6d21c40 100755 --- a/scripts/all-modules-push.sh +++ b/scripts/all-modules-push.sh @@ -2,4 +2,4 @@ # # retrieve the diff/version stuff from Princeton, as the computation over there is *much* faster # -rsync --archive --delete "$@" ~/all-modules/[45]* --exclude .diff\* --exclude .version\* --delete-excluded root@build.onelab.eu:/build/modules/ +rsync --archive --delete "$@" ~/all-modules/* --exclude .diff\* --exclude .version\* --delete-excluded root@build.onelab.eu:/build/modules/ diff --git a/scripts/all-modules.sh b/scripts/all-modules.sh index b0f5abf..a89881e 100755 --- a/scripts/all-modules.sh +++ b/scripts/all-modules.sh @@ -20,7 +20,7 @@ COMMAND=$(basename $0) # make sure the cyclic tasks do not interfere with manual usage -WORKDIR_SVN=${HOME}/all-modules-svn +#WORKDIR_SVN=${HOME}/all-modules-svn WORKDIR_GIT=${HOME}/all-modules-git # make the command usable as non-root user at Princeton for more efficiency @@ -96,12 +96,13 @@ function main () { # the 5.0 flavour now comes with a non-compatible flavour of the module-tools # and we need 2 distinc workdirs - do_update ~/svn-build - do_version ~/svn-build $WORKDIR_GIT 5.0 - do_diff ~/svn-build $WORKDIR_GIT 5.0 - do_update ~/svn-build-4.3 - do_version ~/svn-build-4.3 $WORKDIR_SVN 4.3 - do_diff ~/svn-build-4.3 $WORKDIR_SVN 4.3 + do_update ~/git-build + do_version ~/git-build $WORKDIR_GIT 5.0 + do_diff ~/git-build $WORKDIR_GIT 5.0 +### dropped the 4.3 branxh while moving to git... +# do_update ~/svn-build-4.3 +# do_version ~/svn-build-4.3 $WORKDIR_SVN 4.3 +# do_diff ~/svn-build-4.3 $WORKDIR_SVN 4.3 rm $LOCK -- 2.45.2