Merge pull request #178 from 3MFConsortium/release/2.0.0

release/2.0.0

.gitignore

@@ -2,3 +2,4 @@ build
 build_32bit
 lib3MF.pc
 Include/Model/COM/NMR_COMVersion.h
+debug

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "googletest"]
-	path = UnitTests/googletest
+[submodule "Tests/googletest"]
+	path = Tests/googletest
 	url = https://github.com/google/googletest.git

.readthedocs.yml

@@ -0,0 +1,21 @@
+# .readthedocs.yml
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: Documentation/conf.py
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats:
+  - epub
+  - pdf
+  - htmlzip
+
+python:
+  version: 3.7
+  install:
+    - requirements: Documentation/requirements.txt

.travis.yml

@@ -4,14 +4,22 @@
 # to generate the build-status-icon in the main README.md-file.
 
 language: cpp
+sudo: required
+services:
+  - docker
 
 matrix:
   include:
     - os: linux
       compiler: gcc
+      env: BUILDMODE=cmake-make
     - os: osx
       osx_image: xcode7.2
+      env: BUILDMODE=cmake-make
     - os: linux
+      env: BUILDMODE=ppcxenial
+    - os: linux
+      dist: trusty
       compiler: x86_64-w64-mingw32-g++
       env: BUILDMODE=cmake-mingw32
       addons:
@@ -24,11 +32,16 @@ matrix:
             - g++-mingw-w64-x86-64
 
 before_script:
-    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then HOMEBREW_NO_AUTO_UPDATE=1 brew install ossp-uuid          ; fi
-    - if [[ "$BUILDMODE" = "cmake-mingw32" ]]; then sh cmake/GenerateMinGW.sh ; else sh cmake/GenerateMake.sh   ; fi
-    - cd build
+    - if [[ "$BUILDMODE" = "cmake-mingw32" ]]; then sh cmake/GenerateMinGW.sh; cd build; fi
+    - if [[ "$BUILDMODE" = "cmake-make" ]]; then sh cmake/GenerateMake.sh; cd build; fi
+    - if [[ "$BUILDMODE" = "ppcxenial" ]]; then
+      docker pull multiarch/qemu-user-static ;
+      docker pull multiarch/ubuntu-debootstrap:powerpc-xenial ;
+      docker run --rm --privileged multiarch/qemu-user-static --reset -p y ;
+      docker build -t ppc-xenial -f CI/Dockerfile . ;
+      fi
 
 script:
-    - cmake --build .
-    - if ![[ "$BUILDMODE" = "cmake-mingw32" ]]; then ctest -V    ; fi
-
+    - if [[ "$BUILDMODE" != "ppcxenial" ]]; then cmake --build . ; fi
+    - if [[ "$BUILDMODE" == "cmake-make" ]]; then ctest -V ; fi
+    - if [[ "$BUILDMODE" == "ppcxenial" ]]; then docker run ppc-xenial; fi

AutomaticComponentToolkit/.gitignore

@@ -0,0 +1 @@
+*_component*

CI/Dockerfile

@@ -0,0 +1,4 @@
+FROM martinweismann/lib3mf_ppcbuilds:latest
+ADD . lib3mf-repo
+ADD CI/script.sh script.sh
+ENTRYPOINT ["sh", "script.sh"]

CI/script.sh

@@ -0,0 +1,7 @@
+#!/bin/sh
+
+cd lib3mf-repo
+sh cmake/GenerateMake.sh
+cd build
+make -j2
+ctest -V .