diff options
| author | ist <ist@ist.opentox.org> | 2010-10-28 15:42:54 +0200 |
|---|---|---|
| committer | ist <ist@ist.opentox.org> | 2010-10-28 15:42:54 +0200 |
| commit | ef97aadda700a51384b7a72a63e28fbce116e50c (patch) | |
| tree | b42c0de3a78233279f1a11191bf5d0e02dde62a0 /Rakefile | |
| parent | 79e426f4f3723a28a820b85a42924fe4322ab49a (diff) | |
Completed integration of LAST-PM
Diffstat (limited to 'Rakefile')
| -rw-r--r-- | Rakefile | 28 |
1 files changed, 22 insertions, 6 deletions
@@ -9,7 +9,11 @@ namespace "fminer" do puts `git submodule init` puts `git submodule update` Dir.chdir('libfminer/libbbrc') - puts `git checkout master` + puts `git checkout Makefile` + #puts `git checkout master` + puts `git fetch` + puts `git checkout -f -b refactor origin/refactor` + puts `git checkout refactor` puts `git pull` puts `./configure` if $? == 0 @@ -20,7 +24,11 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../liblast') - puts `git checkout master` + puts `git checkout Makefile` + #puts `git checkout master` + puts `git fetch` + puts `git checkout -f -b refactor origin/refactor` + puts `git checkout refactor` puts `git pull` puts `./configure` if $? == 0 @@ -32,7 +40,7 @@ namespace "fminer" do puts `make ruby` Dir.chdir('../../last-utils') puts `git fetch` - puts `git checkout -b experimental origin/experimental` + puts `git checkout -f -b experimental origin/experimental` puts `git pull` end @@ -40,7 +48,11 @@ namespace "fminer" do task :update do puts `git submodule update` Dir.chdir('libfminer/libbbrc') - puts `git checkout master` + puts `git checkout Makefile` + #puts `git checkout master` + puts `git fetch` + puts `git checkout -f -b refactor origin/refactor` + puts `git checkout refactor` puts `git pull` puts `./configure` if $? == 0 @@ -51,7 +63,11 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../liblast') - puts `git checkout master` + puts `git checkout Makefile` + #puts `git checkout master` + puts `git fetch` + puts `git checkout -f -b refactor origin/refactor` + puts `git checkout refactor` puts `git pull` puts `./configure` if $? == 0 @@ -63,7 +79,7 @@ namespace "fminer" do puts `make ruby` Dir.chdir('../../last-utils') puts `git fetch` - puts `git checkout -b experimental origin/experimental` + puts `git checkout -f -b experimental origin/experimental` puts `git pull` end end |