summaryrefslogtreecommitdiff
path: root/Rakefile
diff options
context:
space:
mode:
authorist <ist@ist.opentox.org>2010-10-28 15:51:20 +0200
committerist <ist@ist.opentox.org>2010-10-28 15:51:20 +0200
commit5a71ee53f9b2ab55eded49894269a60030645061 (patch)
tree8dd8def29d01fa111eb48d4fa323b80b55aa8aa2 /Rakefile
parentef97aadda700a51384b7a72a63e28fbce116e50c (diff)
Comments in code
Diffstat (limited to 'Rakefile')
-rw-r--r--Rakefile14
1 files changed, 9 insertions, 5 deletions
diff --git a/Rakefile b/Rakefile
index 0c72015..9610315 100644
--- a/Rakefile
+++ b/Rakefile
@@ -10,7 +10,7 @@ namespace "fminer" do
puts `git submodule update`
Dir.chdir('libfminer/libbbrc')
puts `git checkout Makefile`
- #puts `git checkout master`
+ #puts `git checkout master` AM LAST: need branch 'refactor' until merged to master in fminer2
puts `git fetch`
puts `git checkout -f -b refactor origin/refactor`
puts `git checkout refactor`
@@ -25,7 +25,7 @@ namespace "fminer" do
puts `make ruby`
Dir.chdir('../liblast')
puts `git checkout Makefile`
- #puts `git checkout master`
+ #puts `git checkout master` AM LAST: need branch 'refactor' until merged to master in fminer2
puts `git fetch`
puts `git checkout -f -b refactor origin/refactor`
puts `git checkout refactor`
@@ -40,7 +40,9 @@ namespace "fminer" do
puts `make ruby`
Dir.chdir('../../last-utils')
puts `git fetch`
- puts `git checkout -f -b experimental origin/experimental`
+ # AM LAST: need branch 'experimental' until merged to master in last-utils
+ puts `git checkout -f -b experimental origin/experimental`
+ puts `git checkout experimental`
puts `git pull`
end
@@ -49,7 +51,7 @@ namespace "fminer" do
puts `git submodule update`
Dir.chdir('libfminer/libbbrc')
puts `git checkout Makefile`
- #puts `git checkout master`
+ #puts `git checkout master` AM LAST: need branch 'refactor' until merged to master in fminer2
puts `git fetch`
puts `git checkout -f -b refactor origin/refactor`
puts `git checkout refactor`
@@ -64,7 +66,7 @@ namespace "fminer" do
puts `make ruby`
Dir.chdir('../liblast')
puts `git checkout Makefile`
- #puts `git checkout master`
+ #puts `git checkout master` AM LAST: need branch 'refactor' until merged to master in fminer2
puts `git fetch`
puts `git checkout -f -b refactor origin/refactor`
puts `git checkout refactor`
@@ -79,7 +81,9 @@ namespace "fminer" do
puts `make ruby`
Dir.chdir('../../last-utils')
puts `git fetch`
+ # AM LAST: need branch 'experimental' until merged to master in last-utils
puts `git checkout -f -b experimental origin/experimental`
+ puts `git checkout experimental`
puts `git pull`
end
end