Skip to content

Commit

Permalink
organizing the binary versions
Browse files Browse the repository at this point in the history
  • Loading branch information
pierrepeterlongo committed Jun 7, 2016
1 parent 012b85e commit 205e477
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 5 deletions.
5 changes: 4 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,10 @@ SET (CPACK_SOURCE_IGNORE_FILES

# For creating the BINARY package we include the files we want

INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty DESTINATION .)
INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/dsk/bin/macosx/dsk DESTINATION ./thirdparty/dsk/bin/macosx/)
INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/dsk/bin/linux/dsk DESTINATION ./thirdparty/dsk/bin/linux/)
INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/c1.fasta.gz DESTINATION ./data/)
INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/c2.fasta.gz DESTINATION ./data/)
INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doc DESTINATION .)
INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/test DESTINATION .)
INSTALL (DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/scripts DESTINATION .)
Expand Down
18 changes: 14 additions & 4 deletions short_read_connector.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/bin/bash

version="1.1.1"
version="1.0.0"



EDIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
Expand All @@ -14,6 +15,15 @@ dsk_bin=$EDIR/thirdparty/dsk/bin/macosx/dsk
if [[ $platform == 'linux' ]]; then
dsk_bin=$EDIR/thirdparty/dsk/bin/linux/dsk
fi
chmod a+x ${dsk_bin}


#BIN DIR:
if [ -d "$EDIR/build/" ] ; then # VERSION SOURCE COMPILED
BIN_DIR=$EDIR/build/bin
else # VERSION BINARY
BIN_DIR=$EDIR/bin
fi


function help {
Expand Down Expand Up @@ -186,14 +196,14 @@ fi
# SRC_LINKER_RAM
if [ $diskMode -eq 0 ]; then
if [ $countMode -eq 0 ]; then
cmd="$EDIR/build/bin/SRC_linker_ram"
cmd="${BIN_DIR}/SRC_linker_ram"
else
# SRC_COUNTER
cmd="$EDIR/build/bin/SRC_counter"
cmd="${BIN_DIR}/SRC_counter"
fi
else
# SRC_LINKER_DISK
cmd="$EDIR/build/bin/SRC_linker_disk"
cmd="${BIN_DIR}/SRC_linker_disk"
fi

# adding options
Expand Down

0 comments on commit 205e477

Please sign in to comment.