From d43709715d98f02fe836a5f1c5fd6689ca4490aa Mon Sep 17 00:00:00 2001 From: Emmett Lalish Date: Mon, 4 Mar 2024 13:24:41 -0800 Subject: [PATCH] v2.4 (#757) * v2.4.0 * fix cmake version --- CMakeLists.txt | 4 ++-- RELEASE_CHECKLIST.md | 3 ++- bindings/wasm/package.json | 2 +- flake.nix | 6 +++--- pyproject.toml | 2 +- test-cmake.sh | 2 +- 6 files changed, 10 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39c1b1e97..1b2589dcb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/RELEASE_CHECKLIST.md b/RELEASE_CHECKLIST.md index 062e98cbb..3ff226845 100644 --- a/RELEASE_CHECKLIST.md +++ b/RELEASE_CHECKLIST.md @@ -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. diff --git a/bindings/wasm/package.json b/bindings/wasm/package.json index 04ddd9099..569ddb215 100644 --- a/bindings/wasm/package.json +++ b/bindings/wasm/package.json @@ -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": [ diff --git a/flake.nix b/flake.nix index f72809735..ec5fcf069 100644 --- a/flake.nix +++ b/flake.nix @@ -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 @@ -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 ]; @@ -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 diff --git a/pyproject.toml b/pyproject.toml index bf1ede64e..9ec9cb17d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "manifold3d" -version = "2.3.1" +version = "2.4.0" authors = [ { name="Emmett Lalish", email="elalish@gmail.com" }, ] diff --git a/test-cmake.sh b/test-cmake.sh index 656f08d2b..abe0778b1 100755 --- a/test-cmake.sh +++ b/test-cmake.sh @@ -5,7 +5,7 @@ cd cmake-consumer cat <> 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