From 353a181b02e2eaa7fb148d1b956e5ad64d9c46f9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 16 Nov 2023 13:11:00 +0100 Subject: [PATCH 1/9] Add .z_offset to gcode-path. The 'just get it working' version. part of CURA-11265 --- conanfile.py | 2 +- cura/plugins/v0/gcodepath.proto | 1 + include/folder.placeholder | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 include/folder.placeholder diff --git a/conanfile.py b/conanfile.py index 0668486..83aa006 100644 --- a/conanfile.py +++ b/conanfile.py @@ -155,7 +155,7 @@ def package(self): copy(self, pattern = "*.h", - dst = os.path.join(self.package_folder, "include"), + dst = os.path.join(self.package_folder, "include"), # <- this should probably be removed? src = os.path.join(self.build_folder, "generated")) copy(self, pattern = "LICENSE*", diff --git a/cura/plugins/v0/gcodepath.proto b/cura/plugins/v0/gcodepath.proto index 6b8a026..81d3cdb 100644 --- a/cura/plugins/v0/gcodepath.proto +++ b/cura/plugins/v0/gcodepath.proto @@ -40,4 +40,5 @@ message GCodePath { int64 layer_thickness = 19; double flow_ratio = 20; bool is_bridge_path = 21; + int64 z_offset = 22; } diff --git a/include/folder.placeholder b/include/folder.placeholder new file mode 100644 index 0000000..b72dd87 --- /dev/null +++ b/include/folder.placeholder @@ -0,0 +1 @@ +probably the line copying over the 'include' folder in the package function of the conan-file should be removed instead of adding this, but I'm running out of time today From 1ff8738a5046b3230cc74ba49a10d69984ca0c18 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Mar 2024 14:45:33 +0100 Subject: [PATCH 2/9] Update version, since the API has changed. part of CURA-11485 (also reference CURA-11265 since that's what the original fix was made under). --- Cargo.toml | 2 +- conandata.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6fc5c7a..49442fe 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "curaengine_grpc_definitions" -version = "0.2.0-alpha.0" +version = "0.3.0-alpha.0" authors = ["Casper "] description = "CuraEngine gRPC definitions" repository = "https://github.com/Ultimaker/curaengine_grpc_definitions" diff --git a/conandata.yml b/conandata.yml index 42852a8..118ce4a 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1 +1 @@ -version: 0.2.0-alpha.0 \ No newline at end of file +version: 0.3.0-alpha.0 \ No newline at end of file diff --git a/setup.py b/setup.py index 15372c8..04010b4 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def generate_proto_sources(self): setup( name = "CuraEngineGRPC", - version = "0.2.0-alpha.0", + version = "0.3.0-alpha.0", description = "A gRPC package using proto files with type hints", author = "UltiMaker", author_email = "cura@ultimaker.com", From de26739b26825622240cbd119b1a507e80d0221a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Mar 2024 14:49:10 +0100 Subject: [PATCH 3/9] Nothing in the include folder, so don't copy for package. Apparently it got confused last time. Solve it in a more sensible way (hopefully). done as part of CURA-11485 (also reference CURA-11265, since the original fix that I needed this for was done under that ticket but never pushed because otherwise we'd have to update the API version nr). --- conanfile.py | 2 +- include/folder.placeholder | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) delete mode 100644 include/folder.placeholder diff --git a/conanfile.py b/conanfile.py index 25c92bb..f19d2e9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -162,7 +162,7 @@ def package(self): copy(self, pattern = "*.h", - dst = os.path.join(self.package_folder, "include"), # <- this should probably be removed? + # NOTE: Right now there's nothing in the include folder, but if there is, it should be copied to the package folder here. (Including it now will cause the build to fail.) src = os.path.join(self.build_folder, "generated")) copy(self, pattern = "LICENSE*", diff --git a/include/folder.placeholder b/include/folder.placeholder deleted file mode 100644 index b72dd87..0000000 --- a/include/folder.placeholder +++ /dev/null @@ -1 +0,0 @@ -probably the line copying over the 'include' folder in the package function of the conan-file should be removed instead of adding this, but I'm running out of time today From 45ca92c7863392e8b7c96ee6c34f346b0e39129f Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Mar 2024 15:47:44 +0100 Subject: [PATCH 4/9] Revert "Nothing in the include folder, so don't copy for package." This reverts commit de26739b26825622240cbd119b1a507e80d0221a. --- conanfile.py | 2 +- include/folder.placeholder | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 include/folder.placeholder diff --git a/conanfile.py b/conanfile.py index f19d2e9..25c92bb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -162,7 +162,7 @@ def package(self): copy(self, pattern = "*.h", - # NOTE: Right now there's nothing in the include folder, but if there is, it should be copied to the package folder here. (Including it now will cause the build to fail.) + dst = os.path.join(self.package_folder, "include"), # <- this should probably be removed? src = os.path.join(self.build_folder, "generated")) copy(self, pattern = "LICENSE*", diff --git a/include/folder.placeholder b/include/folder.placeholder new file mode 100644 index 0000000..b72dd87 --- /dev/null +++ b/include/folder.placeholder @@ -0,0 +1 @@ +probably the line copying over the 'include' folder in the package function of the conan-file should be removed instead of adding this, but I'm running out of time today From d360441746d97fe2c5a76cc5cb1a0522ee8975c2 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 6 Mar 2024 15:50:29 +0100 Subject: [PATCH 5/9] Dependant packages expect an (empty) 'include' folder. done as part of CURA-11485 (also reference CURA-11265) --- conanfile.py | 2 +- include/folder.placeholder | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 25c92bb..3edb87b 100644 --- a/conanfile.py +++ b/conanfile.py @@ -162,7 +162,7 @@ def package(self): copy(self, pattern = "*.h", - dst = os.path.join(self.package_folder, "include"), # <- this should probably be removed? + dst = os.path.join(self.package_folder, "include"), src = os.path.join(self.build_folder, "generated")) copy(self, pattern = "LICENSE*", diff --git a/include/folder.placeholder b/include/folder.placeholder index b72dd87..203d2ce 100644 --- a/include/folder.placeholder +++ b/include/folder.placeholder @@ -1 +1 @@ -probably the line copying over the 'include' folder in the package function of the conan-file should be removed instead of adding this, but I'm running out of time today +NOTE: Dependant packages expect an 'include' folder, but git doesn't include empty folders. From 1b435d4db52d5eb4f352077451af1763ee6a11d6 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 7 Mar 2024 10:14:34 +0100 Subject: [PATCH 6/9] Revert version bump --- Cargo.toml | 2 +- conandata.yml | 2 +- setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 49442fe..6fc5c7a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "curaengine_grpc_definitions" -version = "0.3.0-alpha.0" +version = "0.2.0-alpha.0" authors = ["Casper "] description = "CuraEngine gRPC definitions" repository = "https://github.com/Ultimaker/curaengine_grpc_definitions" diff --git a/conandata.yml b/conandata.yml index 118ce4a..e8c87d7 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1 +1 @@ -version: 0.3.0-alpha.0 \ No newline at end of file +version: 0.2.0-alpha.0 diff --git a/setup.py b/setup.py index 04010b4..15372c8 100644 --- a/setup.py +++ b/setup.py @@ -62,7 +62,7 @@ def generate_proto_sources(self): setup( name = "CuraEngineGRPC", - version = "0.3.0-alpha.0", + version = "0.2.0-alpha.0", description = "A gRPC package using proto files with type hints", author = "UltiMaker", author_email = "cura@ultimaker.com", From d6e1d5bcec5ec2b0e592f839b696f2e29eee6915 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 24 Jun 2024 12:59:37 +0200 Subject: [PATCH 7/9] Add handling of retract_for_nozzle_switch param of path --- cura/plugins/v0/gcodepath.proto | 1 + 1 file changed, 1 insertion(+) diff --git a/cura/plugins/v0/gcodepath.proto b/cura/plugins/v0/gcodepath.proto index 81d3cdb..fe5692f 100644 --- a/cura/plugins/v0/gcodepath.proto +++ b/cura/plugins/v0/gcodepath.proto @@ -41,4 +41,5 @@ message GCodePath { double flow_ratio = 20; bool is_bridge_path = 21; int64 z_offset = 22; + bool retract_for_nozzle_switch = 23; } From 3ec0737b16668429ddc9736ae9dcad015b9170bd Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 12:03:41 +0200 Subject: [PATCH 8/9] Increment minor version after last changes --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index e8c87d7..987f670 100644 --- a/conandata.yml +++ b/conandata.yml @@ -1 +1 @@ -version: 0.2.0-alpha.0 +version: 0.2.1 From 9d697d6161f66c49d586ae26e9e89acb846fb1f2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 12:49:58 +0200 Subject: [PATCH 9/9] Add missing conandata.yml workflow trigger --- .github/workflows/conan-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index 8953cba..fa2db39 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -5,6 +5,7 @@ on: paths: - '**/*.proto' - 'conanfile.py' + - 'conandata.yml' - 'CMakelists.txt' - '.github/workflows/conan-package.yml' - '.github/workflows/requirements*.txt'