diff --git a/.gitignore b/.gitignore index 9ec42d0..737fb7d 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,6 @@ cli/MonkeyCAM test/test util/MonkeyCAMConfig.h install_manifest.txt +CPackConfig.cmake +CPackSourceConfig.cmake +_CPack_Packages diff --git a/CMakeLists.txt b/CMakeLists.txt index 39baf82..cf65951 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -34,3 +34,13 @@ install(FILES "${PROJECT_BINARY_DIR}/README.md" DESTINATION .) install(FILES "${PROJECT_BINARY_DIR}/grid.svg" DESTINATION .) install(FILES "${PROJECT_BINARY_DIR}/board-def.json" DESTINATION example) install(FILES "${PROJECT_BINARY_DIR}/machine-tool-def.json" DESTINATION example) + +set(CPACK_GENERATOR "DragNDrop") +set(CPACK_PACKAGE_VERSION_MAJOR "${MonkeyCAM_VERSION_MAJOR}") +set(CPACK_PACKAGE_VERSION_MINOR "${MonkeyCAM_VERSION_MINOR}") +set(CPACK_PACKAGE_VERSION_PATCH "${MonkeyCAM_VERSION_PATCH}") +set(CPACK_PACKAGE_VERSION_ID "${MonkeyCAM_VERSION_ID}") +set(CPACK_DMG_FORMAT "UDZO") +set(CPACK_DMG_VOLUME_NAME "MonkeyCAM-${MonkeyCAM_VERSION}") +set(CPACK_PACKAGE_FILE_NAME "MonkeyCAM-${MonkeyCAM_VERSION}") +include(CPack) diff --git a/Dist-4.0.1-77afefe/LICENSE b/Dist-4.0.1-77afefe/LICENSE deleted file mode 100644 index 37ec93a..0000000 --- a/Dist-4.0.1-77afefe/LICENSE +++ /dev/null @@ -1,191 +0,0 @@ -Apache License -Version 2.0, January 2004 -http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - -"License" shall mean the terms and conditions for use, reproduction, and -distribution as defined by Sections 1 through 9 of this document. - -"Licensor" shall mean the copyright owner or entity authorized by the copyright -owner that is granting the License. - -"Legal Entity" shall mean the union of the acting entity and all other entities -that control, are controlled by, or are under common control with that entity. -For the purposes of this definition, "control" means (i) the power, direct or -indirect, to cause the direction or management of such entity, whether by -contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the -outstanding shares, or (iii) beneficial ownership of such entity. - -"You" (or "Your") shall mean an individual or Legal Entity exercising -permissions granted by this License. - -"Source" form shall mean the preferred form for making modifications, including -but not limited to software source code, documentation source, and configuration -files. - -"Object" form shall mean any form resulting from mechanical transformation or -translation of a Source form, including but not limited to compiled object code, -generated documentation, and conversions to other media types. - -"Work" shall mean the work of authorship, whether in Source or Object form, made -available under the License, as indicated by a copyright notice that is included -in or attached to the work (an example is provided in the Appendix below). - -"Derivative Works" shall mean any work, whether in Source or Object form, that -is based on (or derived from) the Work and for which the editorial revisions, -annotations, elaborations, or other modifications represent, as a whole, an -original work of authorship. For the purposes of this License, Derivative Works -shall not include works that remain separable from, or merely link (or bind by -name) to the interfaces of, the Work and Derivative Works thereof. - -"Contribution" shall mean any work of authorship, including the original version -of the Work and any modifications or additions to that Work or Derivative Works -thereof, that is intentionally submitted to Licensor for inclusion in the Work -by the copyright owner or by an individual or Legal Entity authorized to submit -on behalf of the copyright owner. For the purposes of this definition, -"submitted" means any form of electronic, verbal, or written communication sent -to the Licensor or its representatives, including but not limited to -communication on electronic mailing lists, source code control systems, and -issue tracking systems that are managed by, or on behalf of, the Licensor for -the purpose of discussing and improving the Work, but excluding communication -that is conspicuously marked or otherwise designated in writing by the copyright -owner as "Not a Contribution." - -"Contributor" shall mean Licensor and any individual or Legal Entity on behalf -of whom a Contribution has been received by Licensor and subsequently -incorporated within the Work. - -2. Grant of Copyright License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable copyright license to reproduce, prepare Derivative Works of, -publicly display, publicly perform, sublicense, and distribute the Work and such -Derivative Works in Source or Object form. - -3. Grant of Patent License. - -Subject to the terms and conditions of this License, each Contributor hereby -grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free, -irrevocable (except as stated in this section) patent license to make, have -made, use, offer to sell, sell, import, and otherwise transfer the Work, where -such license applies only to those patent claims licensable by such Contributor -that are necessarily infringed by their Contribution(s) alone or by combination -of their Contribution(s) with the Work to which such Contribution(s) was -submitted. If You institute patent litigation against any entity (including a -cross-claim or counterclaim in a lawsuit) alleging that the Work or a -Contribution incorporated within the Work constitutes direct or contributory -patent infringement, then any patent licenses granted to You under this License -for that Work shall terminate as of the date such litigation is filed. - -4. Redistribution. - -You may reproduce and distribute copies of the Work or Derivative Works thereof -in any medium, with or without modifications, and in Source or Object form, -provided that You meet the following conditions: - -You must give any other recipients of the Work or Derivative Works a copy of -this License; and -You must cause any modified files to carry prominent notices stating that You -changed the files; and -You must retain, in the Source form of any Derivative Works that You distribute, -all copyright, patent, trademark, and attribution notices from the Source form -of the Work, excluding those notices that do not pertain to any part of the -Derivative Works; and -If the Work includes a "NOTICE" text file as part of its distribution, then any -Derivative Works that You distribute must include a readable copy of the -attribution notices contained within such NOTICE file, excluding those notices -that do not pertain to any part of the Derivative Works, in at least one of the -following places: within a NOTICE text file distributed as part of the -Derivative Works; within the Source form or documentation, if provided along -with the Derivative Works; or, within a display generated by the Derivative -Works, if and wherever such third-party notices normally appear. The contents of -the NOTICE file are for informational purposes only and do not modify the -License. You may add Your own attribution notices within Derivative Works that -You distribute, alongside or as an addendum to the NOTICE text from the Work, -provided that such additional attribution notices cannot be construed as -modifying the License. -You may add Your own copyright statement to Your modifications and may provide -additional or different license terms and conditions for use, reproduction, or -distribution of Your modifications, or for any such Derivative Works as a whole, -provided Your use, reproduction, and distribution of the Work otherwise complies -with the conditions stated in this License. - -5. Submission of Contributions. - -Unless You explicitly state otherwise, any Contribution intentionally submitted -for inclusion in the Work by You to the Licensor shall be under the terms and -conditions of this License, without any additional terms or conditions. -Notwithstanding the above, nothing herein shall supersede or modify the terms of -any separate license agreement you may have executed with Licensor regarding -such Contributions. - -6. Trademarks. - -This License does not grant permission to use the trade names, trademarks, -service marks, or product names of the Licensor, except as required for -reasonable and customary use in describing the origin of the Work and -reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. - -Unless required by applicable law or agreed to in writing, Licensor provides the -Work (and each Contributor provides its Contributions) on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, -including, without limitation, any warranties or conditions of TITLE, -NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are -solely responsible for determining the appropriateness of using or -redistributing the Work and assume any risks associated with Your exercise of -permissions under this License. - -8. Limitation of Liability. - -In no event and under no legal theory, whether in tort (including negligence), -contract, or otherwise, unless required by applicable law (such as deliberate -and grossly negligent acts) or agreed to in writing, shall any Contributor be -liable to You for damages, including any direct, indirect, special, incidental, -or consequential damages of any character arising as a result of this License or -out of the use or inability to use the Work (including but not limited to -damages for loss of goodwill, work stoppage, computer failure or malfunction, or -any and all other commercial damages or losses), even if such Contributor has -been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. - -While redistributing the Work or Derivative Works thereof, You may choose to -offer, and charge a fee for, acceptance of support, warranty, indemnity, or -other liability obligations and/or rights consistent with this License. However, -in accepting such obligations, You may act only on Your own behalf and on Your -sole responsibility, not on behalf of any other Contributor, and only if You -agree to indemnify, defend, and hold each Contributor harmless for any liability -incurred by, or claims asserted against, such Contributor by reason of your -accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work - -To apply the Apache License to your work, attach the following boilerplate -notice, with the fields enclosed by brackets "[]" replaced with your own -identifying information. (Don't include the brackets!) The text should be -enclosed in the appropriate comment syntax for the file format. We also -recommend that a file or class name and description of purpose be included on -the same "printed page" as the copyright notice for easier identification within -third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/Dist-4.0.1-77afefe/MonkeyCAM-4.0.1-77afefe.dmg b/Dist-4.0.1-77afefe/MonkeyCAM-4.0.1-77afefe.dmg deleted file mode 100644 index f56a380..0000000 Binary files a/Dist-4.0.1-77afefe/MonkeyCAM-4.0.1-77afefe.dmg and /dev/null differ diff --git a/Dist-4.0.1-77afefe/README.md b/Dist-4.0.1-77afefe/README.md deleted file mode 100644 index 49d7711..0000000 --- a/Dist-4.0.1-77afefe/README.md +++ /dev/null @@ -1,137 +0,0 @@ -# MonkeyCAM v4.0 - -MonkeyCAM v4.0 is an open source CAD/CAM program for designing skis -and snowboards, and generating -[G-code](http://en.wikipedia.org/wiki/G-code) programs to cut board -parts with a [CNC -machine](http://en.wikipedia.org/wiki/Numerical_control). - -The [CAD](http://en.wikipedia.org/wiki/Computer-aided_design) portion -of MonkeyCAM is quite limited, and is specifically designed to aid the -design of skis and snowboards only. The -[CAM](http://en.wikipedia.org/wiki/Computer-aided_manufacturing) -portion is slightly more general, but again is specialized to ski and -snowboard manufacture. - -MonkeyCAM is published on Github at https://github.com/mikemag/MonkeyCAM - -More information about ski and snowboard construction can be found at -[Monkey Wiki](http://www.happymonkeysnowboards.com/MonkeyWiki) and -[SkiBuilders.com](http://www.skibuilders.com/). - -## License - -MonkeyCAM is licensed under the Apache License, Version 2.0 except as -otherwise noted. See -[LICENSE](https://github.com/mikemag/MonkeyCAM/blob/master/LICENSE) -for details. - -The G-code programs **generated** by MonkeyCAM are license-free. - -### Disclaimer - -I am providing code in this repository to you under an open source -license. Because this is my personal repository, the license you -receive to my code is from me and not from my employer (Facebook). - -## Features and Current Status - -MonkeyCAM is currently a command-line program distributed in -source-form only. It currently compiles on OSX 10.9 with the system -compiler (Apple LLVM 5.1). The program takes configuration files to -describe the ski or snowboard shape via a small set of parameters and -generates the following G-code programs: - -* Base cutout -* Core: - * Guide holes to allow the core to be removed and flipped between programs - * Alignment marks to transfer key design points to the bottom of the core - * Edge relief to leave room for steel edges - * Insert holes for standard snowboard inserts (T-nuts) in a variety of patterns - * Top profile to impart the taper to the core - * Cutout, allowing for sidewall overhang and nose/tail spacers -* Nose and tail spacers which match the core -* Edge trenches to enable inlay of different edge wood and/or sidewall -material along the effective edge of the core - -The G-code programs emitted at this time have been tested on my CNC -machine with a very old DeskCNC controller and work correctly. Each -program also loads in Mach 3 and simulates correctly. The programs not -involving holes load in ShopBot's controller and simulate correctly, -but the ones with holes do not work for ShopBot right now. - -There is no UI, and all configuration and results are in files. - -You can see a sample set of programs here: [MonkeyCAM Visualization -Example](http://www.happymonkeysnowboards.com/MonkeyCAM/path-viewer.html) - -## Future Work - -MonkeyCAM v4.0 is a work in-progress. It is an incomplete (~50% so -far) port of MonkeyCAM, developed by [Mike -Magruder](https://github.com/mikemag) for [Happy Monkey Snowboards, -Inc.](http://www.happymonkeysnowboards.com/) from 2003 to 2012. The -valuable parts of the MonkeyCAM v3 backend (shape and G-code -generation) will be ported to this version over the next many -months. The old UI will be discarded. The plan includes, roughly in -order: - -* Target more G-code controllers with different formats and requirements. -* Provide distribution of binaries for Mac OSX and Windows 8. -* More options for effective edge, nose, and tail. (MonkeyCAM v3, for - instance, had 6 tail options.) -* Port the code to soften the transition between edge and - nose/tail. (You can work around this with a sandblock and two min of - your time for now.) -* Port the MonkeyCAM design UI to a web-based UI built on HTML 5, and -enable local execution. - * The UI will include easy controls for inputting the shape - parameters, plus live visualization of the overall shape, profile, - insert placement, etc. It also includes specifying the machining - parameters. Right now I'm thinking about a combination of React and - three.js. -* Port the MonkeyCAM G-code validation UI, built on the same framework - as the design UI. - * This includes import of the G-code programs output from MonkeyCAM, - as well as pretty much any G-code program, visualization of the - tool path, overlay of multiple programs together for validation, - and stepping through G-code programs to better understand how the - cutter will move. -* Host MonkeyCAM on servers in something like AWS or Google Apps; - serve the UI while running the engine on the server, provide local - storage for board configurations. -* Read the overall board shape from other CAD programs (DXF at least). -* Output the overall shape, insert locations, etc. to PDF/DXF for - printing or use in other CAD programs. -* Mold design and program to cut molds. -* Rouging passes for the core profile. -* Adapt for other kinds of 'boards': kite boards, skate boards, etc. - -Why not just open source MonkeyCAM v3? Honestly, the code for my -personal version of MonkeyCAM has grown rather organically over almost -10 years and three major revisions. It is a huge mess of C#, WinForms, -and Managed DirectX, and I'd really prefer no one but me ever sees -that code again. :) - -## Dependencies - -MonkeyCAM currently depends on the following packages: - -* Currently, builds on Mac OSX 10.9.4 Mavericks with the system compiler. -* CMake 3.0.0. See http://www.cmake.org/ or install via something like Ports. -* Boost 1.55.0. See http://www.boost.org/ or install via something like Ports. -* Clipper 5.1.6. See - http://sourceforge.net/projects/polyclipping/. The CMake files - assume this is installed in a sibling directory with the top-level - MonkeyCAM directory, named clipper_ver5.1.6. -* Up thru 953fe71b, GCC 4.8.1. See http://gcc.gnu.org/ or install via - something like Ports. I'll ressurect the GCC build once I start - deploying on AWS. - -## Contributing - -If you're a software developer who is into ski and snowboard -construction or CAM and you're interested in helping out on MonkeyCAM -then let's chat. Open up an issue with what you want to work on and -we'll work out the details there, or fork the repo, make some changes -and put up a pull request! diff --git a/Dist-4.0.1-77afefe/bin/MacOS/MonkeyCAM b/Dist-4.0.1-77afefe/bin/MacOS/MonkeyCAM deleted file mode 100755 index 2a90371..0000000 Binary files a/Dist-4.0.1-77afefe/bin/MacOS/MonkeyCAM and /dev/null differ diff --git a/Dist-4.0.1-77afefe/example/board-def.json b/Dist-4.0.1-77afefe/example/board-def.json deleted file mode 100644 index 9f81c06..0000000 --- a/Dist-4.0.1-77afefe/example/board-def.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "board": - { - "name": "Sample-snowboard", - "nose length": 18, - "effective edge length": 136, - "tail length": 14, - "sidecut radius": 1100, - "waist width": 24.6, - "taper": 0.4, - "nose shape": - { - "type": "Basic Bezier", - "end handle": 0.50, - "transition handle": 0.75 - }, - "edge shape": - { - "type": "Basic Arc" - }, - "tail shape": - { - "type": "Basic Bezier", - "end handle": 0.50, - "transition handle": 0.75 - }, - "reference stance width": 52, - "stance setback": 2, - "nose insert pack": - { - "count nose": 1, - "count tail": 1, - "offset": 4, - "horizontal spacing": 4, - "vertical spacing": 4 - }, - "tail insert pack": - { - "count nose": 1, - "count tail": 1, - "offset": 4, - "horizontal spacing": 4, - "vertical spacing": 4 - }, - "nose and tail spacer width": 2 - }, - "profile": - { - "nose thickness": 0.2, - "center thickness": 0.79, - "tail thickness": 0.2, - "nose taper": - { - "taper start": 0.45, - "start handle": 0.70, - "end handle": 0.80, - "taper end": 1.00 - }, - "tail taper": - { - "taper start": 0.45, - "start handle": 0.70, - "end handle": 0.80, - "taper end": 1.00 - } - } -} diff --git a/Dist-4.0.1-77afefe/example/machine-tool-def.json b/Dist-4.0.1-77afefe/example/machine-tool-def.json deleted file mode 100644 index 4806eb0..0000000 --- a/Dist-4.0.1-77afefe/example/machine-tool-def.json +++ /dev/null @@ -1,81 +0,0 @@ -{ - // All measurements for the machine and tools are in inches. - "machine": - { - "rapid speed": 100, - "normal speed": 70, - - "bottom rapid height": 0.100, - "top rapid height": 0.600, - - "core blank thickness": 0.420, - - "base cutout tool": 2, - "base rapid height": 0.100, - "base cut thru height": -0.010, - - "guide hole tool": 1, - "guide hole depth": -0.600, - "guide hole diameter": 0.505, - "guide hole offset": 0.5, - - "alignment mark tool": 3, - "alignment mark offset": 0.5, - "alignment mark depth": -0.025, - "alignment mark deep depth": -0.150, - - "edge groove tool": 1, - "edge groove depth": -0.025, - "edge groove edge width": 0.354, - "edge groove overlap percentage": 0.75, - - "insert tool": 1, - "insert rim depth": -0.045, - "insert rim diameter": 0.750, - "insert hole diameter": 0.373, - - "top profile tool": 4, - "top profile transition speed": 20, - "top profile deep speed": 50, - "top profile overlap percentage": 0.50, - "top profile lead-in length": 4.0, - - "core cutout tool": 1, - - "spacer end overhang": 1, - "spacer side overhang": 0.5, - - "sidewall overhang": 0.118, - - "edge trench width": 1.2874, - "edge trench extension": 3, - - "tools": - [ - { - "id": 1, - "name": "Quarter Inch Upcut Spiral", - "diameter": 0.247, - "G-code #": 1 - }, - { - "id": 2, - "name": "Quarter Inch Straight", - "diameter": 0.250, - "G-code #": 1 - }, - { - "id": 3, - "name": "Quarter Inch V", - "diameter": 0.250, - "G-code #": 1 - }, - { - "id": 4, - "name": "1.5 Inch Straight", - "diameter": 1.496, - "G-code #": 1 - } - ] - } -} diff --git a/Dist-4.0.1-77afefe/grid.svg b/Dist-4.0.1-77afefe/grid.svg deleted file mode 100644 index 26e16a8..0000000 --- a/Dist-4.0.1-77afefe/grid.svg +++ /dev/null @@ -1,103 +0,0 @@ - - - diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 226ea33..3e81bb0 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -27,6 +27,7 @@ install(CODE " execute_process( COMMAND codesign --display --verbose=4 ${CMAKE_CURRENT_BINARY_DIR}/MonkeyCAM ) + message(\"Done signing.\") ") install(TARGETS MonkeyCAM DESTINATION bin/MacOS)