Skip to content

Commit

Permalink
Removes salmon submodule. Use pre-compiled binary instead
Browse files Browse the repository at this point in the history
  • Loading branch information
ldenti committed Apr 10, 2020
1 parent 8c0e982 commit 9484032
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 16 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -2,6 +2,7 @@ bin/
obj/
*~
lemon/
salmon/

docs/Gemfile
docs/Gemfile.lock
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Expand Up @@ -2,7 +2,3 @@
path = sdsl-lite
url = https://github.com/simongog/sdsl-lite
ignore = untracked
[submodule "salmon"]
path = salmon
url = https://github.com/COMBINE-lab/salmon
ignore = untracked
17 changes: 6 additions & 11 deletions Makefile
Expand Up @@ -124,21 +124,16 @@ salmon: $(BASE_DIR)/salmon/bin/salmon
SALMON_NAME:=salmon
$(BASE_DIR)/salmon/bin/salmon:
@echo "* Salmon" ; \
cd $(BASE_DIR)/salmon ; \
mkdir -p build ; \
cd build ; \
cmake .. ; \
make ; \
make install
cd $(BASE_DIR) ; \
wget https://github.com/COMBINE-lab/salmon/releases/download/v0.12.0/salmon-0.12.0_linux_x86_64.tar.gz ; \
tar xvfz salmon-0.12.0_linux_x86_64.tar.gz ; \
mv salmon-0.12.0_linux_x86_64 salmon ; \
rm salmon-0.12.0_linux_x86_64.tar.gz

.PHONY: clean-salmon
clean-salmon:
@echo "* Cleaning salmon binary..." ; \
rm -f $(BASE_DIR)/salmon/bin/salmon ; \
rm -rf $(BASE_DIR)/salmon/build ; \
rm -rf $(BASE_DIR)/salmon/external ; \
rm -rf $(BASE_DIR)/salmon/lib ; \
rm -rf $(BASE_DIR)/salmon/tests/unitTests
rm -rf $(BASE_DIR)/salmon

########################################################################

Expand Down
1 change: 0 additions & 1 deletion salmon
Submodule salmon deleted from b18962

0 comments on commit 9484032

Please sign in to comment.