Add OpenSCAD/MCAD to the project to prevent double work. Including as a submodule appears to satisfy the requirement of the LGPL and allows mcopy to remain MIT licensed.

This commit is contained in:
Matt McWilliams 2023-09-25 12:25:56 -04:00
parent 082ac85c5c
commit 37d4f50ef4
9 changed files with 12 additions and 8 deletions

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "scad/sprocketed_roller"] [submodule "scad/sprocketed_roller"]
path = scad/sprocketed_roller path = scad/sprocketed_roller
url = https://git.sixteenmillimeter.com/modules/sprocketed_roller.git url = https://git.sixteenmillimeter.com/modules/sprocketed_roller.git
[submodule "scad/MCAD"]
path = scad/MCAD
url = https://github.com/openscad/MCAD.git

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.32", "version": "1.8.33",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

2
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.32", "version": "1.8.33",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {

View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy-app", "name": "mcopy-app",
"version": "1.8.32", "version": "1.8.33",
"description": "GUI for the mcopy small gauge film optical printer platform", "description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js", "main": "main.js",
"scripts": { "scripts": {

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.32", "version": "1.8.33",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.32", "version": "1.8.33",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "mcopy", "name": "mcopy",
"version": "1.8.32", "version": "1.8.33",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"arduino": "file:app/lib/arduino", "arduino": "file:app/lib/arduino",

View File

@ -1,6 +1,6 @@
{ {
"name": "mcopy", "name": "mcopy",
"version": "1.8.32", "version": "1.8.33",
"description": "Small gauge film optical printer platform", "description": "Small gauge film optical printer platform",
"main": "build.js", "main": "build.js",
"directories": { "directories": {

View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.32", "version": "1.8.33",
"ext_port": 1111, "ext_port": 1111,
"profiles": { "profiles": {
"mcopy": { "mcopy": {

1
scad/MCAD Submodule

@ -0,0 +1 @@
Subproject commit bd0a7ba3f042bfbced5ca1894b236cea08904e26