Skip to content

Commit

Permalink
v2.4 (#757)
Browse files Browse the repository at this point in the history
* v2.4.0

* fix cmake version
  • Loading branch information
elalish authored Mar 4, 2024
1 parent 2ddbd0a commit d437097
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 9 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ endif()
# installation related

set(MANIFOLD_VERSION_MAJOR 2)
set(MANIFOLD_VERSION_MINOR 3)
set(MANIFOLD_VERSION_PATCH 1)
set(MANIFOLD_VERSION_MINOR 4)
set(MANIFOLD_VERSION_PATCH 0)
set(MANIFOLD_VERSION "${MANIFOLD_VERSION_MAJOR}.${MANIFOLD_VERSION_MINOR}.${MANIFOLD_VERSION_PATCH}")
set_property(TARGET manifold PROPERTY VERSION "${MANIFOLD_VERSION}")
set_property(TARGET manifold PROPERTY SOVERSION 2)
Expand Down
3 changes: 2 additions & 1 deletion RELEASE_CHECKLIST.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
1. Verify our model-viewer [example](https://manifoldcad.org/model-viewer) is functional - select Union and Intersection.
1. Verify [make-manifold](https://manifoldcad.org/make-manifold) is functional. Try dropping [DragonAttenuation.glb](https://github.com/KhronosGroup/glTF-Sample-Assets/blob/main/Models/DragonAttenuation/glTF-Binary/DragonAttenuation.glb) in and verify you can select "View Manifold GLB" and that the dragon is still present while the backdrop is removed. Download the GLB.
1. Make a new branch called the version, e.g. v2.3.0.
1. Use VSCode to search and replace the old version with the new - so far in CMakeLists.txt, flake.nix, pyproject.toml, and package.json.
1. Use VSCode to search and replace the old version with the new - so far in test-cmake.sh, flake.nix, pyproject.toml, and package.json.
1. Also update CMakeLists.txt version by searching for "set(MANIFOLD_VERSION_".
1. Commit, push, open a PR, verify tests pass, merge.
1. On Github, draft a new release, make a new tag with the version number, add release notes, and publish.
1. Check the Actions and verify that both PyPI and npm publishing actions ran successfully.
Expand Down
2 changes: 1 addition & 1 deletion bindings/wasm/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "manifold-3d",
"version": "2.3.1",
"version": "2.4.0",
"description": "Geometry library for topological robustness",
"main": "manifold.js",
"files": [
Expand Down
6 changes: 3 additions & 3 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}: pkgs.stdenv.mkDerivation {
inherit doCheck;
pname = "manifold-${parallel-backend}";
version = "2.3.1";
version = "2.4.0";
src = self;
nativeBuildInputs = (with pkgs; [
cmake
Expand Down Expand Up @@ -86,7 +86,7 @@
parallelBackends)) // {
manifold-js = pkgs.buildEmscriptenPackage {
name = "manifold-js";
version = "2.3.1";
version = "2.4.0";
src = self;
nativeBuildInputs = (with pkgs; [ cmake python39 ]);
buildInputs = [ pkgs.nodejs ];
Expand Down Expand Up @@ -120,7 +120,7 @@
# but how should we make it work with other python versions?
manifold3d = with pkgs.python3Packages; buildPythonPackage {
pname = "manifold3d";
version = "2.3.1";
version = "2.4.0";
src = self;
propagatedBuildInputs = [
numpy
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[project]
name = "manifold3d"
version = "2.3.1"
version = "2.4.0"
authors = [
{ name="Emmett Lalish", email="elalish@gmail.com" },
]
Expand Down
2 changes: 1 addition & 1 deletion test-cmake.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cd cmake-consumer
cat <<EOT >> CMakeLists.txt
cmake_minimum_required(VERSION 3.18)
project(testing LANGUAGES CXX)
find_package(manifold "2.3.1" REQUIRED)
find_package(manifold "2.4.0" REQUIRED)
add_executable(testing test.cpp)
target_link_libraries(testing PRIVATE manifold)
EOT
Expand Down

0 comments on commit d437097

Please # to comment.