Skip to content

Commit

Permalink
Merge pull request #353 from 3MFConsortium/release/2.3.1
Browse files Browse the repository at this point in the history
Release/2.3.1 into master
  • Loading branch information
martinweismann authored Apr 2, 2024
2 parents 08feef2 + 23a0a89 commit 0dc7c6b
Show file tree
Hide file tree
Showing 48 changed files with 3,038 additions and 2,956 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,24 @@ jobs:
with:
name: lib3mf.dylib
path: build/lib3mf.dylib

build-macos-debug:
runs-on: macos-latest
steps:
- uses: actions/checkout@v2
with:
submodules: true
- run: sh cmake/GenerateMake.sh "-DCMAKE_OSX_ARCHITECTURES=arm64;x86_64 -DCMAKE_BUILD_TYPE=Debug"
- run: cmake --build .
working-directory: ./build
- run: ctest -V
working-directory: ./build
- name: Archive Mac binary
uses: actions/upload-artifact@v2
with:
name: lib3mf.debug.dylib
path: build/lib3mf.dylib

codecoverage-macos:
runs-on: macos-latest
steps:
Expand Down Expand Up @@ -139,6 +157,14 @@ jobs:
with:
name: lib3mf.debug.dll
path: build/Debug/lib3mf.dll
- uses: actions/upload-artifact@v2
with:
name: lib3mf.pdb
path: build/Debug/lib3mf.pdb
- uses: actions/upload-artifact@v2
with:
name: lib3mf.debug.lib
path: build/Debug/lib3mf.lib
build-windows-32bit:
runs-on: windows-2019
steps:
Expand Down
7 changes: 6 additions & 1 deletion .readthedocs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
# Required
version: 2


build:
os: ubuntu-22.04
tools:
python: "3.7"

# Build documentation in the docs/ directory with Sphinx
sphinx:
configuration: Documentation/conf.py
Expand All @@ -16,6 +22,5 @@ formats:
- htmlzip

python:
version: 3.7
install:
- requirements: Documentation/requirements.txt
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/C/lib3mf.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/C/lib3mf_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down Expand Up @@ -85,7 +85,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CDynamic/lib3mf_dynamic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CDynamic/lib3mf_dynamic.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/CDynamic/lib3mf_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down Expand Up @@ -85,7 +85,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CSharp/Lib3MF.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated CSharp file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Cpp/lib3mf_abi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Cpp/lib3mf_implicit.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/Cpp/lib3mf_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down Expand Up @@ -84,7 +84,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_abi.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/CppDynamic/lib3mf_dynamic.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file in order to allow an easy
use of the 3MF Library

Interface version: 2.3.0
Interface version: 2.3.1

*/

Expand Down
4 changes: 2 additions & 2 deletions Autogenerated/Bindings/CppDynamic/lib3mf_types.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated C++-Header file with basic types in
order to allow an easy use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down Expand Up @@ -84,7 +84,7 @@ typedef void * Lib3MF_pvoid;

#define LIB3MF_VERSION_MAJOR 2
#define LIB3MF_VERSION_MINOR 3
#define LIB3MF_VERSION_MICRO 0
#define LIB3MF_VERSION_MICRO 1
#define LIB3MF_VERSION_PRERELEASEINFO ""
#define LIB3MF_VERSION_BUILDINFO ""

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/cfunc.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf_dynamic.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
2 changes: 1 addition & 1 deletion Autogenerated/Bindings/Go/lib3mf_dynamic.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ This file has been generated by the Automatic Component Toolkit (ACT) version 1.
Abstract: This is an autogenerated plain C Header file in order to allow an easy
use of the 3MF Library
Interface version: 2.3.0
Interface version: 2.3.1
*/

Expand Down
Loading

0 comments on commit 0dc7c6b

Please sign in to comment.