You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by br...@apache.org on 2013/03/19 20:29:23 UTC
[1/10] git commit: [#5973] rename rebuild.bash to rebuild-all.bash
with more helpfulness
[#5973] rename rebuild.bash to rebuild-all.bash with more helpfulness
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/7adc92ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/7adc92ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/7adc92ff
Branch: refs/heads/db/5973
Commit: 7adc92ffa66589bbb912b9df6d355b49786df545
Parents: 810ff83
Author: Dave Brondsema <db...@geek.net>
Authored: Thu Mar 14 10:39:02 2013 -0700
Committer: Dave Brondsema <db...@geek.net>
Committed: Tue Mar 19 12:25:58 2013 -0700
----------------------------------------------------------------------
Makefile.def.buildbot | 4 ++--
rebuild-all.bash | 9 +++++++++
rebuild.bash | 8 --------
update.sh | 4 ++--
vagrant/allura_setup.sh | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7adc92ff/Makefile.def.buildbot
----------------------------------------------------------------------
diff --git a/Makefile.def.buildbot b/Makefile.def.buildbot
index 838af38..93aff55 100644
--- a/Makefile.def.buildbot
+++ b/Makefile.def.buildbot
@@ -1,7 +1,7 @@
test: buildbot_test
buildbot_test:
- ./rebuild.bash
+ ./rebuild-all.bash
-[ ! -f $(VIRTUAL_ENV)/lib/python2.7/site-packages/pysvn ] && ln -s /usr/lib64/python2.7/site-packages/pysvn $(VIRTUAL_ENV)/lib/python2.7/site-packages/
ALLURA_VALIDATION=none ./run_tests
- ./run_clonedigger
\ No newline at end of file
+ ./run_clonedigger
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7adc92ff/rebuild-all.bash
----------------------------------------------------------------------
diff --git a/rebuild-all.bash b/rebuild-all.bash
new file mode 100755
index 0000000..61b02c6
--- /dev/null
+++ b/rebuild-all.bash
@@ -0,0 +1,9 @@
+#!/bin/bash
+for APP in Allura* *Forge* NoWarnings
+do
+ echo "# setting up $APP dependencies"
+ pushd $APP > /dev/null
+ python setup.py -q develop || echo " # Error setting up $APP
+ # You may want to run 'pip uninstall $APP' to un-register it so you don't get further errors."
+ popd > /dev/null
+done
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7adc92ff/rebuild.bash
----------------------------------------------------------------------
diff --git a/rebuild.bash b/rebuild.bash
deleted file mode 100755
index f1d80a1..0000000
--- a/rebuild.bash
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-for APP in Allura* *Forge* NoWarnings
-do
- echo "# setting up $APP dependencies"
- pushd $APP > /dev/null
- python setup.py -q develop || exit
- popd > /dev/null
-done
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7adc92ff/update.sh
----------------------------------------------------------------------
diff --git a/update.sh b/update.sh
index 0aa3016..ca5efab 100755
--- a/update.sh
+++ b/update.sh
@@ -17,6 +17,6 @@ if [ "$?" -gt 0 ]; then
exit;
fi
-./rebuild.bash
+./rebuild-all.bash
-echo 'If you have taskd or the web server running, you should restart them now.'
\ No newline at end of file
+echo 'If you have taskd or the web server running, you should restart them now.'
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/7adc92ff/vagrant/allura_setup.sh
----------------------------------------------------------------------
diff --git a/vagrant/allura_setup.sh b/vagrant/allura_setup.sh
index cf93e5d..16d77ce 100755
--- a/vagrant/allura_setup.sh
+++ b/vagrant/allura_setup.sh
@@ -39,7 +39,7 @@ fi
# Setup Allura python packages
cd /home/vagrant/src/forge
-sudo -u vagrant bash -c '. /home/vagrant/anvil/bin/activate; ./rebuild.bash'
+sudo -u vagrant bash -c '. /home/vagrant/anvil/bin/activate; ./rebuild-all.bash'
echo "Purging unneeded packages..."
aptitude clean