Merge pull request #112 from jpoirier/development

godump978 use system lib path, copy dump978 so before it's needed, fi…

Makefile

@@ -1,7 +1,14 @@
+ifeq "$(CIRCLECI)" "true"
+	BUILDINFO=
+else
+	BUILDINFO="-ldflags -X main.stratuxVersion=`git describe --tags --abbrev=0` -X main.stratuxBuild=`git log -n 1 --pretty=%H`"
+endif
+
 all:
 	cd dump978 && make lib
+	sudo cp -f ./libdump978.so /usr/lib/libdump978.so
 	go get -t -d -v ./...
-	go build -ldflags " -X main.stratuxVersion=`git describe --abbrev=0 --tags` -X main.stratuxBuild=`git log -n 1 --pretty=%H`" main/gen_gdl90.go main/traffic.go main/ry835ai.go main/network.go main/managementinterface.go main/sdr.go main/uibroadcast.go
+	go build $(BUILDINFO) main/gen_gdl90.go main/traffic.go main/ry835ai.go main/network.go main/managementinterface.go main/sdr.go main/uibroadcast.go
 
 test:
 	sh -c true
@@ -40,7 +47,6 @@ www:
 install:
 	cp -f gen_gdl90 /usr/bin/gen_gdl90
 	chmod 755 /usr/bin/gen_gdl90
-	cp -f libdump978.so /usr/lib/
 	cp start_uat.sh /usr/bin/start_uat
 	cp init.d-stratux /etc/init.d/stratux
 	cp start_stratux.sh /usr/sbin/stratux

circle.yml

@@ -1,10 +1,14 @@
+machine:
+  environment:
+    PATH: $HOME/go/bin:$HOME/gopath/bin:$PATH
+    GOPATH: $HOME/gopath
+
 dependencies:
-  cache_directories:
-    - "~/go"
   pre:
-    - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd /tmp; git clone git://git.osmocom.org/rtl-sdr.git; cd rtl-sdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig ; cd ~; wget https://storage.googleapis.com/golang/go1.5.1.src.tar.gz; tar -zxvf go1.5.1.src.tar.gz; cd go/src ; export GOROOT_BOOTSTRAP=/usr/local/go; ./all.bash
+    - sudo apt-get update; sudo apt-get install libusb-1.0-0-dev; cd ~/; git clone https://github.com/steve-m/librtlsdr.git; cd librtlsdr; mkdir build; cd build; cmake ../; make; sudo make install; sudo ldconfig; cd ~/; mkdir gopath; cd ~/; mkdir gopath; wget https://storage.googleapis.com/golang/go1.5.1.src.tar.gz; tar -zxvf go1.5.1.src.tar.gz; cd go/src; export GOROOT_BOOTSTRAP=/usr/local/go; ./make.bash; echo $PATH; echo $GOPATH; go version; env
   override:
-    - export PATH=~/go/bin:${PATH}; make
+    - make
+
 test:
   override:
     - make test

godump978/godump978.go

@@ -19,10 +19,10 @@
 package godump978
 
 /*
-#cgo linux LDFLAGS: -L.. -ldump978 -lm
+#cgo linux LDFLAGS: -ldump978 -lm
-#cgo darwin LDFLAGS: -L.. -ldump978 -lm
+#cgo darwin LDFLAGS: -ldump978 -lm
 #cgo windows CFLAGS: -IC:/WINDOWS/system32
-#cgo windows LDFLAGS: -L. -lrtlsdr -LC:/WINDOWS/system32
+#cgo windows LDFLAGS: -L. -ldump978 -LC:/WINDOWS/system32
 
 #include <stdlib.h>
 #include <stdint.h>