16mm
/
mcopy
1
0
Fork 0
Code Issues 14 Pull Requests Projects 2 Releases 13 Wiki Activity

Build and version the package json files on each npm run build

This commit is contained in:
mmcwilliams 2019-03-22 19:52:21 -04:00
parent 283085cb8d
commit f09ada2cd2
6 changed files with 1393 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

263
app/data/cfg.json
View File

@ -1,165 +1,152 @@
{
"version" : "2.0.0",
"ext_port" : 1111,
"profiles" : {
"mcopy" : {
"label" : "Default mcopy profile",
"cam" : {
"time" : 850,
"delay" : 50,
"momentary" : 0
"version": "1.3.2",
"ext_port": 1111,
"profiles": {
"mcopy": {
"label": "Default mcopy profile",
"cam": {
"time": 850,
"delay": 50,
"momentary": 0
},
"proj" : {
"time" : 1400,
"delay" : 50,
"momentary" : 0
"proj": {
"time": 1400,
"delay": 50,
"momentary": 0
},
"black" : {
"before" : 0,
"after" : 0
"black": {
"before": 0,
"after": 0
}
},
"jk103" : {
"label" : "JK103",
"cam" : {
"time" : 600,
"delay" : 50,
"momentary" : 240
"jk103": {
"label": "JK103",
"cam": {
"time": 600,
"delay": 50,
"momentary": 240
},
"proj" : {
"time" : 950,
"delay" : 50,
"momentary" : 240
"proj": {
"time": 950,
"delay": 50,
"momentary": 240
},
"black" : {
"before" : 0,
"after" : 0
"black": {
"before": 0,
"after": 0
},
"light" : false
"light": false
},
"jk_original" : {
"label" : "JK45 profile",
"cam" : {
"time" : 750,
"delay" : 50,
"momentary" : 300
"jk_original": {
"label": "JK45 profile",
"cam": {
"time": 750,
"delay": 50,
"momentary": 300
},
"proj" : {
"time" : 1300,
"delay" : 50,
"momentary" : 300
"proj": {
"time": 1300,
"delay": 50,
"momentary": 300
},
"black" : {
"before" : 250,
"after" : 250
"black": {
"before": 250,
"after": 250
}
},
"intval3" : {
"label" : "INTVAL3",
"cam" : {
"time" : 630,
"delay" : 50,
"momentary" : 0
"intval3": {
"label": "INTVAL3",
"cam": {
"time": 630,
"delay": 50,
"momentary": 0
}
},
"jk_mono" : {
"label" : "MONO's JK",
"cam" : {
"time" : 750,
"delay" : 50,
"momentary" : 300
"jk_mono": {
"label": "MONO's JK",
"cam": {
"time": 750,
"delay": 50,
"momentary": 300
},
"proj" : {
"time" : 1300,
"delay" : 50,
"momentary" : 300
"proj": {
"time": 1300,
"delay": 50,
"momentary": 300
},
"light" : false,
"projector_second" : true
"light": false,
"projector_second": true
}
},
"cmd" : {
"camera_forward" : "CF",
"camera_backward" : "CB",
"projector_forward" : "PF",
"projector_backward" : "PB",
"black_forward" : "BF",
"black_backward" : "BB",
"camera_second_forward" : "C2F",
"camera_second_backward" : "C2B",
"cameras_forward" : "CCF",
"cameras_forward" : "CCB",
"camera_forward_camera_second_backward" : "CFCB",
"camera_backward_camera_second_forward" : "CBCF",
"projector_second_forward" : "P2F",
"projector_second_backward" : "P2B",
"projectors_forward" : "PPF",
"projectors_backward" : "PPB",
"projector_forward_projector_second_backward" : "PFPB",
"projector_backward_projector_second_forward" : "PBPF"
"cmd": {
"camera_forward": "CF",
"camera_backward": "CB",
"projector_forward": "PF",
"projector_backward": "PB",
"black_forward": "BF",
"black_backward": "BB",
"camera_second_forward": "C2F",
"camera_second_backward": "C2B",
"cameras_forward": "CCB",
"camera_forward_camera_second_backward": "CFCB",
"camera_backward_camera_second_forward": "CBCF",
"projector_second_forward": "P2F",
"projector_second_backward": "P2B",
"projectors_forward": "PPF",
"projectors_backward": "PPB",
"projector_forward_projector_second_backward": "PFPB",
"projector_backward_projector_second_forward": "PBPF"
},
"arduino" : {
"baud" : 57600,
"board" : "uno",
"serialDelay" : 20,
"sequenceDelay" : 100,
"cam" : {
"time" : 850,
"delay" : 50,
"momentary" : 300
"arduino": {
"baud": 57600,
"board": "uno",
"serialDelay": 20,
"sequenceDelay": 100,
"cam": {
"time": 850,
"delay": 50,
"momentary": 300
},
"proj" : {
"time" : 1300,
"delay" : 50,
"momentary" : 300
"proj": {
"time": 1300,
"delay": 50,
"momentary": 300
},
"black" : {
"before" : 250,
"after" : 250
"black": {
"before": 250,
"after": 250
},
"cmd" : {
"debug" : "d",
"cmd": {
"debug": "d",
"connect": "i",
"light" : "l",
"camera" : "c",
"projector" : "p",
"black" : "b",
"camera_forward" : "e",
"camera_backward" : "f",
"projector_forward" : "g",
"projector_backward" : "h",
"projector_identifier" : "j",
"camera_identifier" : "k",
"mcopy_identifier" : "m",
"camera_timed" : "n",
"projector_identifier" : "j",
"camera_identifier" : "k",
"light_identifier" : "o",
"projector_light_identifier" : "q",
"projector_camera_light_identifier" : "r",
"projector_camera_identifier" : "s",
"projector_second_identifier" : "t",
"projectors_identifier" : "d",
"projector_second_forward" : "u",
"projector_second_backward" : "v",
"projector_second" : "w",
"projectors" : "x",
"camera_second_identifier" : "y",
"cameras_identifier" : "a",
"camera_second_forward" : "1",
"camera_second_backward" : "2",
"camera_second" : "3",
"cameras" : "4"
"light": "l",
"camera": "c",
"projector": "p",
"black": "b",
"camera_forward": "e",
"camera_backward": "f",
"projector_forward": "g",
"projector_backward": "h",
"projector_identifier": "j",
"camera_identifier": "k",
"mcopy_identifier": "m",
"camera_timed": "n",
"light_identifier": "o",
"projector_light_identifier": "q",
"projector_camera_light_identifier": "r",
"projector_camera_identifier": "s",
"projector_second_identifier": "t",
"projectors_identifier": "d",
"projector_second_forward": "u",
"projector_second_backward": "v",
"projector_second": "w",
"projectors": "x",
"camera_second_identifier": "y",
"cameras_identifier": "a",
"camera_second_forward": "1",
"camera_second_backward": "2",
"camera_second": "3",
"cameras": "4"
}
}
}

7
app/package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.3.1",
"version": "1.3.2",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@ -6556,6 +6556,11 @@
"system": {
"version": "file:lib/system"
},
"systeminformation": {
"version": "4.1.1",
"resolved": "https://registry.npmjs.org/systeminformation/-/systeminformation-4.1.1.tgz",
"integrity": "sha512-sRQYRRTOkwpXQA8grIBPSZEzJvxdsitdmrp0mer9MFRlry5AJC6DbAE0EcsK54k5jLTBaauvzCFwM+y7c5fMmg=="
},
"table-layout": {
"version": "0.4.4",
"resolved": "https://registry.npmjs.org/table-layout/-/table-layout-0.4.4.tgz",

3
app/package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy-app",
"version": "1.3.1",
"version": "1.3.2",
"description": "GUI for the mcopy small gauge film optical printer platform",
"main": "main.js",
"scripts": {
@ -67,6 +67,7 @@
"settings": "file:lib/settings",
"spawn": "file:lib/spawn",
"system": "file:lib/system",
"systeminformation": "^4.1.1",
"uuid": "^3.3.2",
"winston": "^3.0.0"
},

1215
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

3
package.json
View File

@ -1,6 +1,6 @@
{
"name": "mcopy",
"version": "1.3.0",
"version": "1.3.2",
"description": "Small gauge film optical printer platform",
"main": "build.js",
"directories": {
@ -22,6 +22,7 @@
},
"homepage": "https://github.com/sixteenmillimeter/mcopy#readme",
"devDependencies": {
"@types/electron": "^1.6.10",
"@types/node": "^11.10.4",
"typescript": "^3.3.3333"
}

18
scripts/build.sh
View File

@ -1,8 +1,24 @@
#!/bin/sh
./node_modules/.bin/tsc -p tsconfig.json
#./node_modules/.bin/tsc -p tsconfig.json
#electron-build fails when local modules are in parent directory
#copy them into lib directory
cp -r ./lib/* ./app/lib/
cp -r ./lib/* ./cli/lib/
cp ./data/cfg.json ./app/data/
cp ./data/cfg.json ./cli/data/
#version all sub projects and config files
version=$(jq -r '.version' ./package.json)
echo "VERSION: $version"
declare -a fileArr=("./data/cfg.json" "./app/package.json" "./cli/package.json")
for i in "${fileArr[@]}"
do
tmp=$(mktemp)
VERSION="$version" jq '.version = env.VERSION' "$i" > "$tmp" && mv "$tmp" "$i"
done