Skip to content

Commit

Permalink
Merge pull request #34 from ComparativeGenomicsToolkit/chop
Browse files Browse the repository at this point in the history
Throw in path-chopping tool
  • Loading branch information
glennhickey authored Feb 1, 2021
2 parents 75af5a2 + 06be915 commit 9a66c3b
Show file tree
Hide file tree
Showing 9 changed files with 509 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ before_install:

install:
- sudo pip3 install setuptools --upgrade
- wget https://github.com/vgteam/vg/releases/download/v1.24.0/vg && chmod u+x vg
- wget https://github.com/vgteam/vg/releases/download/v1.30.0/vg && chmod u+x vg

script:
- export PATH=$(pwd):$PATH
Expand Down
22 changes: 17 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
rootPath = ./
include ./include.mk

all : hal2vg
all : hal2vg clip-vg

# Note: hdf5 from apt doesn't seem to work for static builds. It should be installed
# from source and configured with "--enable-static --disable-shared", then have its
Expand All @@ -18,12 +18,17 @@ ifeq ($(shell ldd hal2vg | grep "not a dynamic" | wc -l), $(shell ls hal2vg | wc
else
$(error ldd found dnymaic linked dependency in hal2vg)
endif
ifeq ($(shell ldd clip-vg | grep "not a dynamic" | wc -l), $(shell ls clip-vg | wc -l))
$(info ldd verified that clip-vg static)
else
$(error ldd found dnymaic linked dependency in clip-vg)
endif

cleanFast :
rm -f hal2vg hal2vg.o
rm -f hal2vg hal2vg.o clip-vg clip-vg.o

clean :
rm -f hal2vg hal2vg.o
rm -f hal2vg hal2vg.o clip-vg clip-vg.o
cd deps/sonLib && make clean
cd deps/pinchesAndCacti && make clean
cd deps/hal && make clean
Expand All @@ -47,5 +52,12 @@ ${libbdsgPath}/lib/libbdsg.a :
hal2vg : hal2vg.o ${basicLibsDependencies}
${cpp} ${CXXFLAGS} -fopenmp -pthread hal2vg.o ${basicLibs} -o hal2vg

test : hal2vg
cd tests && prove -v small.t
clip-vg.o : clip-vg.cpp ${basicLibsDependencies}
${cpp} ${CXXFLAGS} -I . clip-vg.cpp -c

clip-vg : clip-vg.o ${basicLibsDependencies}
${cpp} ${CXXFLAGS} -fopenmp -pthread clip-vg.o ${basicLibs} -o clip-vg

test :
make
cd tests && prove -v t
3 changes: 2 additions & 1 deletion build-tools/makeBinRelease
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ else
make check-static
fi

cp hal2vg ${buildDir}/
cp hal2vg clip-vg ${buildDir}/

Loading

0 comments on commit 9a66c3b

Please sign in to comment.