Merge branch 'release/0.3.0'

CHANGES.md

@@ -1,8 +1,11 @@
-###0.2.1
+### 0.3.0
+* Changes to setup.sh to permit OSX installation
+
+### 0.2.1
 * Corrections to logic
 
-###0.2.0
+### 0.2.0
 * Added bedgraph to bw functionality via bg2bw
 
-###0.1.0
+### 0.1.0
 * First release

INSTALL.md

@@ -12,8 +12,6 @@ setup.sh will install
 #Other Software
   For installation to proceed you require the following packages:
 
-
-
 ##For Ubuntu (tested with 14.04)
 ```
 apt-get update && \
@@ -46,3 +44,20 @@ sudo make install && \
 cd .. && \
 rm -rf nettle nettle.tar.gz
 ```
+
+##OSX
+  In order for cgpBigWig to install you may need the following packages installed
+```
+brew install gnutls
+# fixes gnutls include
+export LIBRARY_PATH="$HOME/homebrew/lib"
+export LDFLAGS="-L$HOME/homebrew/opt/libffi/lib"
+export PKG_CONFIG_PATH="$HOME/homebrew/opt/libffi/lib/pkgconfig"
+brew install libffi
+# from https://p11-glue.freedesktop.org/doc/p11-kit/devel-building.html
+wget https://p11-glue.freedesktop.org/releases/p11-kit-0.23.2.tar.gz
+tar zxf p11-kit-0.23.2.tar.gz
+cd p11-kit-0.23.2
+./configure --prefix=$HOME/local --without-trust-paths
+make
+```

VERSION.txt

@@ -1 +1 @@
-0.2.1
+0.3.0

setup.sh

@@ -65,23 +65,29 @@ get_file () {
   fi
 }
 
-set -e
-
 if [ "$#" -ne "1" ] ; then
   echo "Please provide an installation path  such as /opt/ICGC"
   exit 0
 fi
 
-CPU=`grep -c ^processor /proc/cpuinfo`
+CPU=1
+ls /proc/cpuinfo >& /dev/null # very noddy attempt to figure out thread count
 if [ $? -eq 0 ]; then
-  if [ "$CPU" -gt "6" ]; then
-    CPU=6
-  fi
+  CPU=`grep -c ^processor /proc/cpuinfo`
 else
-  CPU=1
+  CPU=`sysctl -a | grep machdep.cpu | grep thread_count | awk '{print $2}'`
+  if [ $? -ne 0 ]; then
+    # fall back to unthreaded core test
+    CPU=`sysctl -a | grep machdep.cpu | grep core_count | awk '{print $2}'`
+  fi
+fi
+if [ "$CPU" -gt "6" ]; then
+  CPU=6
 fi
 echo "Max compilation CPUs set to $CPU"
 
+set -e
+
 INST_PATH=$1
 
 # get current directory