onefang pushed a commit to branch master.
http://git.enlightenment.org/admin/devs.git/commit/?id=f0adc72b29c563281d790aa5eaa5b9630b0c2de6
commit f0adc72b29c563281d790aa5eaa5b9630b0c2de6
Author: David Walter Seikel <won_f...@yahoo.com.au>
Date: Sat Nov 9 15:40:36 2013 +1000
build_efl: Tweak the git update.
Do a clean and reset to work around things that don't cleanly build, and
hence stuff up the rebase.
Warning, this now overwrites any existing changes, so be careful when
doing work.
Structure the output so it's a single line for each repo in most cases.
Makes it easy to see where things go wrong.
Move the sudo tickling to inside the loop, just in case the overall git
update takes to long.
---
developers/onefang/build_efl.lua | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/developers/onefang/build_efl.lua b/developers/onefang/build_efl.lua
index ac27362..dab210e 100755
--- a/developers/onefang/build_efl.lua
+++ b/developers/onefang/build_efl.lua
@@ -248,13 +248,12 @@ else
if not fileExists('GIT/' .. path .. '/.git/HEAD') then
os.execute(saEnvVars .. 'mkdir -p GIT/`dirname ' .. path .. '` &&
cd GIT/`dirname ' .. path .. '` && git clone ssh://g...@git.enlightenment.org/'
.. line .. ' 2>&1 | tee /tmp/eflBuild/git.log')
else
- printf('Updating %s\n', path);
- -- TODO - Should throw in a stash, check which branch we are on,
etc.
- os.execute(saEnvVars .. 'cd GIT/' .. path .. ' && git checkout
master && git pull --rebase 2>&1 | tee /tmp/eflBuild/git.log')
+ printf('Updating %-42s ', path); io.flush()
+ os.execute(saEnvVars .. 'cd GIT/' .. path .. ' && git checkout
master -q && git clean -dfqx && git reset --hard -q && git pull --rebase -q
2>&1 | tee /tmp/eflBuild/git.log')
end
+ os.execute('sudo echo -n ""') -- Just tickle the sudo so it
remembers, in case the git takes too long.
end
- os.execute('sudo echo " "') -- Just tickle the sudo so it
remembers, in case the git took too long.
printf('Building %d core EFL libraries.\n', #eflCore)
for i, package in ipairs(eflCore) do build(i, package); os.execute('sudo
ldconfig') end
--
