From 50e462fe1b24dfa32c520cbf1cc27700f38c512b Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 30 May 2024 18:52:36 +0100 Subject: [PATCH 1/3] Add GPLv3 boltsparts lib (https://github.com/boltsparts/boltsparts) --- LICENSE.md | 7 +++++++ Makefile | 8 ++++++++ src/fs/zip-archives.ts | 14 ++++++++++++++ 3 files changed, 29 insertions(+) diff --git a/LICENSE.md b/LICENSE.md index 11ac007..78cb6fd 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -46,6 +46,7 @@ The WASM build was made possible by https://github.com/DSchroer/openscad-wasm. + [Stemfie_OpenSCAD](#stemfie-openscad) + [UB.scad](#ubscad) + [pathbuilder](#pathbuilder) + + [boltsparts](#boltsparts) + [openscad_attachable_text3d](#openscad_attachable_text3d) ## Manifold @@ -746,6 +747,12 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ``` +## boltsparts + +https://github.com/boltsparts/boltsparts + +Licensed under the [GPLv3](#gplv3). + ## pathbuilder https://github.com/dinther/pathbuilder diff --git a/Makefile b/Makefile index f6d18a7..bdba035 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ public: \ public/libraries/NopSCADlib.zip \ public/libraries/BOSL.zip \ public/libraries/BOSL2.zip \ + public/libraries/boltsparts.zip \ public/libraries/funcutils.zip \ public/libraries/FunctionalOpenSCAD.zip \ public/libraries/YAPP_Box.zip \ @@ -124,6 +125,13 @@ public/libraries/MCAD.zip: libs/MCAD mkdir -p public/libraries ( cd libs/MCAD ; zip -r ../../public/libraries/MCAD.zip *.scad bitmap/*.scad LICENSE ) +libs/boltsparts: + git clone --recurse https://github.com/boltsparts/boltsparts.git ${SHALLOW} ${SINGLE_BRANCH_MAIN} $@ + +public/libraries/boltsparts.zip: libs/boltsparts + mkdir -p public/libraries + ( cd libs/boltsparts/openscad ; zip -r ../../../public/libraries/boltsparts.zip `find . -name '*.scad' | grep -v tests` ../LICENSE ) + libs/Stemfie_OpenSCAD: git clone --recurse https://github.com/Cantareus/Stemfie_OpenSCAD.git ${SHALLOW} ${SINGLE_BRANCH_MAIN} $@ diff --git a/src/fs/zip-archives.ts b/src/fs/zip-archives.ts index 56fad0f..438fe08 100644 --- a/src/fs/zip-archives.ts +++ b/src/fs/zip-archives.ts @@ -68,6 +68,20 @@ export const zipArchives: ZipArchives = { }], }, }, + 'boltsparts': { + description: 'OpenSCAD library for generating bolt/nut models', + gitOrigin: { + branch: 'main', + repoUrl: 'https://github.com/boltsparts/boltsparts', + include: [{ + glob: 'openscad/**/*.scad', + ignore: 'test/**', + }], + }, + docs: { + 'Usage': 'https://boltsparts.github.io/en/docs/0.3/document/openscad/usage.html', + }, + }, 'brailleSCAD': { gitOrigin: { branch: 'main', From e3ca675dee6a973a4f08a9c6055c1b624241f026 Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 30 May 2024 18:53:17 +0100 Subject: [PATCH 2/3] Add MIT-licensed OpenSCAD-Snippet lib (https://github.com/AngeloNicoli/OpenSCAD-Snippet) --- LICENSE.md | 29 +++++++++++++++++++++++++++++ Makefile | 8 ++++++++ src/fs/zip-archives.ts | 12 ++++++++++++ 3 files changed, 49 insertions(+) diff --git a/LICENSE.md b/LICENSE.md index 78cb6fd..8089a3e 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -48,6 +48,7 @@ The WASM build was made possible by https://github.com/DSchroer/openscad-wasm. + [pathbuilder](#pathbuilder) + [boltsparts](#boltsparts) + [openscad_attachable_text3d](#openscad_attachable_text3d) + + [OpenSCAD-Snippet](#openscad-snippet) ## Manifold @@ -753,6 +754,34 @@ https://github.com/boltsparts/boltsparts Licensed under the [GPLv3](#gplv3). +## OpenSCAD-Snippet + +https://github.com/AngeloNicoli/OpenSCAD-Snippet + +``` +MIT License + +Copyright (c) 2024 Angelo_Nicoli (Gengio) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. +``` + ## pathbuilder https://github.com/dinther/pathbuilder diff --git a/Makefile b/Makefile index bdba035..fd728ed 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ public: \ public/libraries/BOSL.zip \ public/libraries/BOSL2.zip \ public/libraries/boltsparts.zip \ + public/libraries/OpenSCAD-Snippet.zip \ public/libraries/funcutils.zip \ public/libraries/FunctionalOpenSCAD.zip \ public/libraries/YAPP_Box.zip \ @@ -132,6 +133,13 @@ public/libraries/boltsparts.zip: libs/boltsparts mkdir -p public/libraries ( cd libs/boltsparts/openscad ; zip -r ../../../public/libraries/boltsparts.zip `find . -name '*.scad' | grep -v tests` ../LICENSE ) +libs/OpenSCAD-Snippet: + git clone --recurse https://github.com/AngeloNicoli/OpenSCAD-Snippet.git ${SHALLOW} ${SINGLE_BRANCH_MAIN} $@ + +public/libraries/OpenSCAD-Snippet.zip: libs/OpenSCAD-Snippet + mkdir -p public/libraries + ( cd libs/OpenSCAD-Snippet ; zip -r ../../public/libraries/OpenSCAD-Snippet.zip `find . -name '*.scad'` LICENSE ) + libs/Stemfie_OpenSCAD: git clone --recurse https://github.com/Cantareus/Stemfie_OpenSCAD.git ${SHALLOW} ${SINGLE_BRANCH_MAIN} $@ diff --git a/src/fs/zip-archives.ts b/src/fs/zip-archives.ts index 438fe08..1a8335e 100644 --- a/src/fs/zip-archives.ts +++ b/src/fs/zip-archives.ts @@ -100,6 +100,18 @@ export const zipArchives: ZipArchives = { include: [{glob: ['**/*.scad', 'LICENSE']}], }, }, + 'OpenSCAD-Snippet': { + description: 'OpenSCAD Snippet Library', + gitOrigin: { + branch: 'main', + repoUrl: 'https://github.com/AngeloNicoli/OpenSCAD-Snippet', + include: [{glob: ['**/*.scad', 'LICENSE']}], + }, + symlinks: { + 'Asset_SCAD': 'Asset_SCAD', + 'Import_Library.scad': 'Import_Library.scad', + }, + }, 'funcutils': { description: 'OpenSCAD collection of functional programming utilities, making use of function-literals.', gitOrigin: { From 3be50a21a36a1ed97d36d58bfb221b0e8f2740dd Mon Sep 17 00:00:00 2001 From: Olivier Chafik Date: Thu, 30 May 2024 18:53:44 +0100 Subject: [PATCH 3/3] Add missing doc links for openscad and brailleSCAD --- src/fs/zip-archives.ts | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/fs/zip-archives.ts b/src/fs/zip-archives.ts index 1a8335e..fc2fd2b 100644 --- a/src/fs/zip-archives.ts +++ b/src/fs/zip-archives.ts @@ -29,6 +29,10 @@ export const zipArchives: ZipArchives = { repoUrl: 'https://github.com/openscad/openscad', include: [{glob: ['examples/*.scad', 'LICENSE']}], }, + docs: { + 'CheatSheet': 'https://openscad.org/cheatsheet/index.html', + 'Documentation': 'https://openscad.org/documentation.html', + }, }, 'MCAD': { description: 'OpenSCAD Parametric CAD Library', @@ -91,6 +95,9 @@ export const zipArchives: ZipArchives = { ignore: 'test/**', }], }, + docs: { + 'Documentation': 'https://github.com/BelfrySCAD/brailleSCAD/wiki/TOC', + }, }, 'FunctionalOpenSCAD': { description: 'Implementing OpenSCAD in OpenSCAD',