Skip to content

Commit

Permalink
Merge pull request #4 from pdimens/dev
Browse files Browse the repository at this point in the history
Merge dev into main, pending release v0.2
  • Loading branch information
pdimens authored Jun 19, 2023
2 parents 2d29c94 + 400324e commit 4529a4e
Show file tree
Hide file tree
Showing 36 changed files with 3,149 additions and 1,044 deletions.
162 changes: 100 additions & 62 deletions harpy

Large diffs are not rendered by default.

30 changes: 7 additions & 23 deletions misc/buildlocal.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#! /usr/bin/env bash

if [ -z "$CONDA_PREFIX" ]; then
echo "Error: active conda environment not detected."
echo "To use this installation script, you need to already be in an active conda environment."
exit 1
fi

mkdir -p ${CONDA_PREFIX}/bin
cp misc/ema-h ${CONDA_PREFIX}/bin
cp -n misc/ema-h ${CONDA_PREFIX}/bin

# Harpy executable
cp harpy ${CONDA_PREFIX}/bin/
Expand All @@ -14,25 +20,3 @@ cp utilities/*.{py,R,pl} ${CONDA_PREFIX}/bin/

# reports
cp reports/*.Rmd ${CONDA_PREFIX}/bin/


### deprecated? ###
#export C_INCLUDE_PATH=${PREFIX}/include
#export CPLUS_INCLUDE_PATH=${PREFIX}/include
#export CPP_INCLUDE_PATH=${PREFIX}/include
#export CXX_INCLUDE_PATH=${PREFIX}/include
#export LIBRARY_PATH=${PREFIX}/lib

# create conda PATH, if not already existing

# build and install ema
#rm -rf ema || true
#git clone --recursive https://github.com/EdHarry/ema.git
#cd ema && git checkout haplotag
#git submodule update --remote
#git apply ../harpy/misc/makefile.patch
#git apply ../harpy/misc/remove_native.patch
#make CC="$CC -fcommon" CXX="$CXX -fcommon" LDFLAGS="$LDFLAGS"
#chmod +x ema
#cp ema $CONDA_PREFIX/bin/ema-h
#cd ..
Empty file modified misc/ema-h
100755 → 100644
Empty file.
Loading

0 comments on commit 4529a4e

Please sign in to comment.