diff options
| author | Andreas Maunz <andreas@maunz.de> | 2010-11-03 15:56:33 +0100 |
|---|---|---|
| committer | Andreas Maunz <andreas@maunz.de> | 2010-11-03 15:56:33 +0100 |
| commit | e6d45f897d23987d03cff75fe958be342b0311a2 (patch) | |
| tree | bc1de556095c0cb5266b1603d50811018354674a /Rakefile | |
| parent | 5a71ee53f9b2ab55eded49894269a60030645061 (diff) | |
Using master of fminer2
Diffstat (limited to 'Rakefile')
| -rw-r--r-- | Rakefile | 20 |
1 files changed, 2 insertions, 18 deletions
@@ -9,11 +9,7 @@ namespace "fminer" do puts `git submodule init` puts `git submodule update` Dir.chdir('libfminer/libbbrc') - puts `git checkout Makefile` - #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` + puts `git checkout master` puts `git pull` puts `./configure` if $? == 0 @@ -24,11 +20,7 @@ namespace "fminer" do end puts `make ruby` Dir.chdir('../liblast') - puts `git checkout Makefile` - #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` + puts `git checkout master` puts `git pull` puts `./configure` if $? == 0 @@ -51,10 +43,6 @@ namespace "fminer" do puts `git submodule update` Dir.chdir('libfminer/libbbrc') puts `git checkout Makefile` - #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` puts `git pull` puts `./configure` if $? == 0 @@ -66,10 +54,6 @@ namespace "fminer" do puts `make ruby` Dir.chdir('../liblast') puts `git checkout Makefile` - #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` puts `git pull` puts `./configure` if $? == 0 |