diff options
| author | ist <ist@ist.opentox.org> | 2010-10-19 15:48:32 +0200 |
|---|---|---|
| committer | ist <ist@ist.opentox.org> | 2010-10-19 15:48:32 +0200 |
| commit | cf13d2614a70af7e1b466166b12e823d58a18bbf (patch) | |
| tree | 4860d2311ce6c4b2780c2f1d4007539a7c5e903a | |
| parent | 5323cfea63f491af2bfcb87aef06b5386c90c67b (diff) | |
Added submodule last-utils
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rw-r--r-- | Rakefile | 105 | ||||
| -rw-r--r-- | application.rb | 1 | ||||
| m--------- | last-utils | 0 |
4 files changed, 66 insertions, 43 deletions
diff --git a/.gitmodules b/.gitmodules index 3330d61..75218e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "libfminer"] path = libfminer url = http://github.com/amaunz/fminer2.git +[submodule "last-utils"] + path = last-utils + url = git://github.com/amaunz/last-utils.git @@ -4,52 +4,71 @@ require 'opentox-ruby-api-wrapper' #require 'tasks/opentox' namespace "fminer" do - desc "Install required gems and fminer" - task :install do - puts `git submodule init` - puts `git submodule update` - Dir.chdir('libfminer/libbbrc') - puts `git checkout master` - puts `git pull` - puts `./configure` - if $? == 0 - puts `echo "Fminer/LibBbrc successfully configured."` - else - puts `echo "Fminer/LibBbrc configuration failed!"` - exit - end - puts `make ruby` - Dir.chdir('../liblast') - puts `git checkout master` - puts `git pull` - puts `./configure` - if $? == 0 - puts `echo "Fminer/LibLast successfully configured."` - else - puts `echo "Fminer/LibLast configuration failed!"` - exit - end - puts `make ruby` - end + desc "Install required gems and fminer" + task :install do + puts `git submodule init` + puts `git submodule update` + Dir.chdir('libfminer/libbbrc') + puts `git checkout master` + puts `git pull` + puts `./configure` + if $? == 0 + puts `echo "Fminer/LibBbrc successfully configured."` + else + puts `echo "Fminer/LibBbrc configuration failed!"` + exit + end + puts `make ruby` + Dir.chdir('../liblast') + puts `git checkout master` + puts `git pull` + puts `./configure` + if $? == 0 + puts `echo "Fminer/LibLast successfully configured."` + else + puts `echo "Fminer/LibLast configuration failed!"` + exit + end + puts `make ruby` + Dir.chdir('../../last-utils') + puts `git fetch` + puts `git checkout -b experimental origin/experimental` + puts `git pull` + end - desc "Update gems and fminer" - task :update do - puts `git submodule update` - Dir.chdir('libfminer/libbbrc') - puts `git checkout master` - puts `git pull` - puts `./configure` - if $? == 0 - puts `echo "Fminer successfully configured."` - else - puts `echo "Fminer configuration failed!"` - exit - end - puts `make ruby` - end + desc "Update gems and fminer" + task :update do + puts `git submodule update` + Dir.chdir('libfminer/libbbrc') + puts `git checkout master` + puts `git pull` + puts `./configure` + if $? == 0 + puts `echo "Fminer/LibBbrc successfully configured."` + else + puts `echo "Fminer/LibBbrc configuration failed!"` + exit + end + puts `make ruby` + Dir.chdir('../liblast') + puts `git checkout master` + puts `git pull` + puts `./configure` + if $? == 0 + puts `echo "Fminer/LibLast successfully configured."` + else + puts `echo "Fminer/LibLast configuration failed!"` + exit + end + puts `make ruby` + Dir.chdir('../../last-utils') + puts `git fetch` + puts `git checkout -b experimental origin/experimental` + puts `git pull` + end end desc "Run tests" task :test do - load 'test/test.rb' + load 'test/test.rb' end diff --git a/application.rb b/application.rb index 6eb65e5..3d511d1 100644 --- a/application.rb +++ b/application.rb @@ -1,6 +1,7 @@ require 'rubygems' require File.join(File.expand_path(File.dirname(__FILE__)), 'libfminer/libbbrc/bbrc') # has to be included before openbabel, otherwise we have strange SWIG overloading problems require File.join(File.expand_path(File.dirname(__FILE__)), 'libfminer/liblast/last') # has to be included before openbabel, otherwise we have strange SWIG overloading problems +require File.join(File.expand_path(File.dirname(__FILE__)), 'last-utils/lu.rb') # AM LAST gem "opentox-ruby-api-wrapper", "= 1.6.5" require 'opentox-ruby-api-wrapper' diff --git a/last-utils b/last-utils new file mode 160000 +Subproject a678d63a5ccc7a1b5375406a3da66f8bd325141 |