Update to multibuild & new copyright license

zefiros-software · Jan 15, 2017 · f82cb8f · f82cb8f
1 parent 20d5f71
commit f82cb8f
Show file tree

Hide file tree

Showing 42 changed files with 186 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,22 +2,56 @@ sudo: required
 language: generic
 matrix:
     include:
-        # Use the built in venv for linux builds
-        - os: linux
-          dist: trusty
         # Use generic language for osx
         # disabled due to premake bug
         - os: osx
           osx_image: xcode8
-          language: generic
+          language: generic    
+          env: TYPE=release ARCH=x86   
+        - os: osx
+          osx_image: xcode8
+          language: generic   
+          env: TYPE=debug ARCH=x86
+        - os: osx
+          osx_image: xcode8
+          language: generic   
+          env: TYPE=release ARCH=x86_64
+        - os: osx
+          osx_image: xcode8
+          language: generic   
+          env: TYPE=debug ARCH=x86_64
+        # Use the built in venv for linux builds
+        - os: linux
+          dist: trusty
+          env: TYPE=release ARCH=x86 VERSION=6
+        - os: linux
+          dist: trusty
+          env: TYPE=debug ARCH=x86 VERSION=6
+        - os: linux
+          dist: trusty
+          env: TYPE=release ARCH=x86_64 VERSION=6
+        - os: linux
+          dist: trusty
+          env: TYPE=coverage ARCH=x86_64 VERSION=6
+        - os: linux
+          dist: trusty
+          env: TYPE=debug ARCH=x86_64 VERSION=6
+        - os: linux
+          dist: trusty
+          env: TYPE=release VERSION=5 ARCH=x86_64
+        - os: linux
+          dist: trusty
+          env: TYPE=release VERSION=6 ARCH=x86_64
+        - os: linux
+          dist: trusty
+          env: TYPE=zpm VERSION=6
 install:
-    - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo pip install codecov; fi
-    - rm -rf ~/.matplotlib/fontList.cache
+    - bash script/install-unix.sh
     - wget -O - https://raw.githubusercontent.com/Zefiros-Software/ZPM/master/script/install-zpm-travis.sh | bash
     # annoying pip fix
     - export BOTO_CONFIG=/tmp/bogusvalue
 script:
     - bash script/travis-build.sh
 after_success:
-  - if [[ "$TRAVIS_BRANCH" == "master" ]] && [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash script/deploy-docs.sh; fi
-  - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then bash ./script/coverage.sh; fi    
+  - if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_OS_NAME" == "linux" ]]; then bash script/deploy-docs.sh; fi
+  - if [[ "$TRAVIS_OS_NAME" == "linux" && "$TYPE" = "coverage" ]]; then codecov; fi    
diff --git a/LICENSE.md b/LICENSE.md
@@ -1,4 +1,4 @@
-Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+Copyright (c) 2017 Zefiros Software
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ When a bug is found, please insert it in the issue tracker, so we can resolve it
 This project is licensed under the MIT license by [Zefiros Software](https://zefiros.eu).
 
 ```
-Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+Copyright (c) 2017 Zefiros Software
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/appveyor.yml b/appveyor.yml
@@ -1,8 +1,34 @@
 platform:
   - Win32
+build: off
 environment:
     PYTHON: "C:\\Python35"
-build: off
+    matrix:  
+        - TYPE: zpm
+        - TYPE: release
+          ARCH: x86
+          PLAT: Win32
+          VSTUD: vs2015
+        - TYPE: debug
+          ARCH: x86
+          PLAT: Win32
+          VSTUD: vs2015
+        - TYPE: release
+          ARCH: x86_64
+          PLAT: x64
+          VSTUD: vs2015
+        - TYPE: debug
+          ARCH: x86_64
+          PLAT: x64
+          VSTUD: vs2015
+        - TYPE: release
+          ARCH: x86_64
+          PLAT: x64
+          VSTUD: vs2015
+        - TYPE: release 
+          ARCH: x86_64
+          PLAT: x64
+          VSTUD: vs2015
 install:
     - powershell -command "Invoke-WebRequest -Uri https://goo.gl/1Zcf72 -OutFile %TEMP%/install-zpm.bat" && %TEMP%/install-zpm.bat 
     - "SET PATH=%PATH%;%ALLUSERSPROFILE%/zpm"

diff --git a/bsp/include/bsp/barrier.h b/bsp/include/bsp/barrier.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/barrierType.h b/bsp/include/bsp/barrierType.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/bsp.h b/bsp/include/bsp/bsp.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/bspAbort.h b/bsp/include/bsp/bspAbort.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/bspClass.h b/bsp/include/bsp/bspClass.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/bspExt.h b/bsp/include/bsp/bspExt.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/bspProf.h b/bsp/include/bsp/bspProf.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/communicationQueues.h b/bsp/include/bsp/communicationQueues.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/condVarBarrier.h b/bsp/include/bsp/condVarBarrier.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/historyRecorder.h b/bsp/include/bsp/historyRecorder.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/historyRecorderType.h b/bsp/include/bsp/historyRecorderType.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/mixedBarrier.h b/bsp/include/bsp/mixedBarrier.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/processorData.h b/bsp/include/bsp/processorData.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/registerMapType.h b/bsp/include/bsp/registerMapType.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/requestVector.h b/bsp/include/bsp/requestVector.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/requests.h b/bsp/include/bsp/requests.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/spinLock.h b/bsp/include/bsp/spinLock.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/stackAllocator.h b/bsp/include/bsp/stackAllocator.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/threadRegisterMap.h b/bsp/include/bsp/threadRegisterMap.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/threadRegisterVector.h b/bsp/include/bsp/threadRegisterVector.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/util.h b/bsp/include/bsp/util.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/bsp/include/bsp/voidRecorder.h b/bsp/include/bsp/voidRecorder.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+ * Copyright (c) 2017 Zefiros Software.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/docs/index.md b/docs/index.md
@@ -166,7 +166,7 @@ When you use BSPLib as part of a scientific publication, we would love you to ci
 This project is licensed under the MIT license by [Zefiros Software](https://zefiros.eu).
 
 ```
-Copyright (c) 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+Copyright (c) 2017 Zefiros Software
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/mkdocs.yml b/mkdocs.yml
@@ -3,7 +3,7 @@ site_url: http://www.bsplib.eu
 repo_url: https://github.com/Zefiros-Software/BSPLib
 site_description: BSPLib a fast and easy to use parallel computation libary.
 theme: united
-copyright: Copyright © 2016 Mick van Duijn, Koen Visscher and Paul Visscher
+copyright: Copyright © 2017 Zefiros Software
 google_analytics: ['UA-29999374-2', 'www.bsplib.eu']
 theme_dir: docs/style
 

diff --git a/script/appveyor-build.bat b/script/appveyor-build.bat
@@ -1,20 +1,22 @@
-premake5 install-package --allow-install --allow-module  || exit /b 1
-premake5 vs2015 --ignore-updates || exit /b 1
-msbuild bsp/BSPLib.sln /property:Configuration=Release /property:Platform=Win32 || exit /b 1
-::msbuild bsp/BSPLib.sln /property:Configuration=Debug /property:Platform=Win32 || exit /b 1
-msbuild bsp/BSPLib.sln /property:Configuration=Release /property:Platform=x64 || exit /b 1
-::msbuild bsp/BSPLib.sln /property:Configuration=Debug /property:Platform=x64 || exit /b 1
 
-cd test/
-premake5 vs2015 || exit /b 1
-msbuild zpm/BSPLib-ZPM.sln || exit /b 1
+if "%TYPE%" == "zpm" (    
+    cd test
+
+    zpm install-package --allow-install --allow-module || exit /b 1
+    zpm vs2015 --allow-install || exit /b 1
 
-cd ../
+    msbuild zpm/BSPLib-ZPM.sln || exit /b 1
 
-bin\x86\bsp-test.exe || exit /b 1
-::bin\x86\bsp-testd.exe || exit /b 1
+    test\bin\x86\bsp-zpm-test.exe || exit /b 1
+) else (
+    zpm install-package --allow-install --allow-module || exit /b 1
+    zpm %VSTUD% --allow-install || exit /b 1
 
-bin\x86_64\bsp-test.exe || exit /b 1
-::bin\x86_64\bsp-testd.exe || exit /b 1
+    msbuild bsp/BSPLib.sln /property:Configuration=Release /property:Platform=%PLAT% || exit /b 1
 
-test\bin\x86\bsp-zpm-test.exe || exit /b 1
+    if %TYPE% == "debug" (
+        bin\%ARCH%\bsp-testd
+    ) else (
+        bin\%ARCH%\bsp-test
+    )
+)
diff --git a/script/coverage.sh b/script/coverage.sh
diff --git a/script/install-unix.sh b/script/install-unix.sh
@@ -0,0 +1,15 @@
+if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then 
+
+    sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
+    sudo apt-get update -y
+
+    sudo apt-get install gcc-${VERSION} g++-${VERSION} -y
+    sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${VERSION} 60
+    sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${VERSION} 60
+    sudo update-alternatives --config gcc
+    sudo update-alternatives --config g++
+    sudo apt-get install gcc-${VERSION}-multilib g++-${VERSION}-multilib
+
+    # for coverage
+    sudo pip install codecov
+fi