Ship LICENSE

+ small corrections to Makefile

Author: JeroenMulkers

Makefile

@@ -13,7 +13,6 @@ CGO_CFLAGS_ALLOW='(-fno-schedule-insns|-malign-double|-ffast-math)'
 
 all: cudakernels hooks
 	go install -v $(GO_BUILDFLAGS) github.com/mumax/3/...
-	cd test && mumax3 -vet *.mx3
 
 cudakernels:
 	cd cuda && $(MAKE)
@@ -40,4 +39,4 @@ clean:
 	cd cuda && $(MAKE) clean
 
 realclean: clean
-	cd cuda && make realclean
+	cd cuda && ${MAKE} realclean

deploy/deploy_linux.bash

@@ -39,13 +39,16 @@ for CUDAVERSION in 7.0 7.5 8.0 9.0 9.1 9.2 10.0 10.1 10.2; do
     # We overwrite the CGO Flags to make sure that it is compiled against $CUDAVERSION
     export LD_LIBRARY_PATH=$CUDA_HOME/lib64:$LD_LIBRARY_PATH
     export CGO_LDFLAGS="-lcufft -lcurand -lcuda -L${CUDA_HOME}/lib64 -Wl,-rpath -Wl,\$ORIGIN/$RPATH"
-    export CGO_CFLAGS="-I${CUDA_HOME}/include -Wl,-rpath -Wl,\$ORIGIN/$RPATH"
+    export CGO_CFLAGS="-I${CUDA_HOME}/include"
 
     # (Re)build everything
     (cd .. && make realclean && make -j 4 || exit 1)
 
     # Copy the executable and the cuda libraries to the output directory
-    cp $GOPATH/bin/mumax3* $BUILDDIR 
+    cp $GOPATH/bin/mumax3 $BUILDDIR 
+    cp $GOPATH/bin/mumax3-convert $BUILDDIR 
+    cp $GOPATH/bin/mumax3-server $BUILDDIR 
+    cp ../LICENSE $BUILDDIR
     cp $( ldd ${BUILDDIR}/mumax3 | grep libcufft | awk '{print $3}' ) ${BUILDDIR}/${RPATH}
     cp $( ldd ${BUILDDIR}/mumax3 | grep libcurand | awk '{print $3}' ) ${BUILDDIR}/${RPATH}
 

deploy/deploy_windows.ps1

@@ -73,5 +73,6 @@ New-Item -ItemType "directory" $builddir
 Copy-Item ${env:GOPATH}/bin/mumax3.exe -Destination ${builddir}
 Copy-Item ${env:GOPATH}/bin/mumax3-convert.exe -Destination ${builddir}
 Copy-Item ${env:GOPATH}/bin/mumax3-server.exe -Destination ${builddir}
+Copy-Item ../LICENSE -Destination ${builddir}
 Copy-Item ${CUDA_HOME}/bin/cufft64*.dll -Destination ${builddir}
 Copy-Item ${CUDA_HOME}/bin/curand64*.dll -Destination ${builddir}