Compare commits
17 Commits
Author | SHA1 | Date | |
---|---|---|---|
0a380a70d1 | |||
5c57e0faa4 | |||
41abeb62c3 | |||
b6eeeef4d5 | |||
b5b7edb978 | |||
a65fe1343c | |||
3165fb3749 | |||
2789887f3b | |||
d230fdd2fb | |||
88c9ef5b22 | |||
154115cc66 | |||
145dbaeb8f | |||
1c8ceaef17 | |||
e30c6f7149 | |||
e69174ed0f | |||
303d37ac9b | |||
69e2b41c40 |
60
cmds/cmds.ts
60
cmds/cmds.ts
@ -1,60 +0,0 @@
|
|||||||
/// <reference path="../node_modules/pxt-core/typings/node/node.d.ts"/>
|
|
||||||
/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
|
|
||||||
|
|
||||||
import * as fs from "fs";
|
|
||||||
import * as path from "path";
|
|
||||||
import * as child_process from "child_process";
|
|
||||||
|
|
||||||
let writeFileAsync: any = Promise.promisify(fs.writeFile)
|
|
||||||
let execAsync: (cmd: string, options?: { cwd?: string }) => Promise<Buffer> = Promise.promisify(child_process.exec)
|
|
||||||
let readDirAsync = Promise.promisify(fs.readdir)
|
|
||||||
|
|
||||||
|
|
||||||
export function deployCoreAsync(res: ts.pxtc.CompileResult) {
|
|
||||||
return getBitDrivesAsync()
|
|
||||||
.then(drives => {
|
|
||||||
if (drives.length == 0) {
|
|
||||||
console.log("cannot find any drives to deploy to");
|
|
||||||
return Promise.resolve(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`copy ${ts.pxtc.BINARY_HEX} to ` + drives.join(", "));
|
|
||||||
|
|
||||||
let writeHexFile = (filename: string) => {
|
|
||||||
return writeFileAsync(filename + ts.pxtc.BINARY_HEX, res.outfiles[ts.pxtc.BINARY_HEX])
|
|
||||||
.then(() => console.log("wrote hex file to " + filename));
|
|
||||||
};
|
|
||||||
|
|
||||||
return Promise.map(drives, d => writeHexFile(d))
|
|
||||||
.then(() => drives.length);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function getBitDrivesAsync(): Promise<string[]> {
|
|
||||||
if (process.platform == "win32") {
|
|
||||||
const rx = new RegExp("^([A-Z]:).* " + pxt.appTarget.compile.deployDrives)
|
|
||||||
return execAsync("wmic PATH Win32_LogicalDisk get DeviceID, VolumeName, FileSystem")
|
|
||||||
.then(buf => {
|
|
||||||
let res: string[] = []
|
|
||||||
buf.toString("utf8").split(/\n/).forEach(ln => {
|
|
||||||
let m = rx.exec(ln)
|
|
||||||
if (m) {
|
|
||||||
res.push(m[1] + "/")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
return res
|
|
||||||
})
|
|
||||||
}
|
|
||||||
else if (process.platform == "darwin") {
|
|
||||||
const rx = new RegExp(pxt.appTarget.compile.deployDrives)
|
|
||||||
return readDirAsync("/Volumes")
|
|
||||||
.then(lst => lst.filter(s => rx.test(s)).map(s => "/Volumes/" + s + "/"))
|
|
||||||
} else if (process.platform == "linux") {
|
|
||||||
const rx = new RegExp(pxt.appTarget.compile.deployDrives)
|
|
||||||
const user = process.env["USER"]
|
|
||||||
return readDirAsync(`/media/${user}`)
|
|
||||||
.then(lst => lst.filter(s => rx.test(s)).map(s => `/media/${user}/${s}/`))
|
|
||||||
} else {
|
|
||||||
return Promise.resolve([])
|
|
||||||
}
|
|
||||||
}
|
|
@ -1,3 +1,6 @@
|
|||||||
|
/// <reference path="../node_modules/pxt-core/typings/node/node.d.ts"/>
|
||||||
|
/// <reference path="../node_modules/pxt-core/built/pxtlib.d.ts" />
|
||||||
|
|
||||||
import * as path from "path";
|
import * as path from "path";
|
||||||
export let pxtCore = require("pxt-core");
|
export let pxtCore = require("pxt-core");
|
||||||
// require.resolve() gives path to [pxt dir]/built/pxt.js, so move up twice to get pxt root dir
|
// require.resolve() gives path to [pxt dir]/built/pxt.js, so move up twice to get pxt root dir
|
||||||
|
@ -132,6 +132,9 @@ namespace pxt {
|
|||||||
if (refmask[i]) decr(r->fields[i]);
|
if (refmask[i]) decr(r->fields[i]);
|
||||||
r->fields[i] = 0;
|
r->fields[i] = 0;
|
||||||
}
|
}
|
||||||
|
//RefRecord is allocated using placement new
|
||||||
|
r->~RefRecord();
|
||||||
|
::operator delete(r);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RefRecord_print(RefRecord *r)
|
void RefRecord_print(RefRecord *r)
|
||||||
@ -258,6 +261,9 @@ namespace pxt {
|
|||||||
decr(fields[i]);
|
decr(fields[i]);
|
||||||
fields[i] = 0;
|
fields[i] = 0;
|
||||||
}
|
}
|
||||||
|
//RefAction is allocated using placement new
|
||||||
|
this->~RefAction();
|
||||||
|
::operator delete(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RefAction::print()
|
void RefAction::print()
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "pxt-calliope",
|
"name": "pxt-calliope",
|
||||||
"version": "0.5.94",
|
"version": "0.7.1",
|
||||||
"description": "calliope target for PXT",
|
"description": "calliope target for PXT",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"JavaScript",
|
"JavaScript",
|
||||||
@ -34,6 +34,6 @@
|
|||||||
"semantic-ui-less": "^2.2.4"
|
"semantic-ui-less": "^2.2.4"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"pxt-core": "0.5.87"
|
"pxt-core": "0.6.2"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -87,10 +87,13 @@
|
|||||||
padding:7px;
|
padding:7px;
|
||||||
}
|
}
|
||||||
|
|
||||||
#blocklyAddPackage {
|
/* Blockly Toolbox Buttons */
|
||||||
text-align: left;
|
#blocklyToolboxButtons .blocklyAddPackageButton {
|
||||||
|
background-color: rgba(0, 0, 0, 0.3);
|
||||||
|
color: white;
|
||||||
}
|
}
|
||||||
#blocklyAddPackage button {
|
|
||||||
|
#blocklyToolboxButtons .blocklyUndoButton {
|
||||||
background-color: rgba(0, 0, 0, 0.3);
|
background-color: rgba(0, 0, 0, 0.3);
|
||||||
color: white;
|
color: white;
|
||||||
}
|
}
|
||||||
@ -114,6 +117,11 @@
|
|||||||
.organization {
|
.organization {
|
||||||
top: auto;
|
top: auto;
|
||||||
}
|
}
|
||||||
|
/* Blockly Toolbox buttons */
|
||||||
|
#blocklyToolboxButtons {
|
||||||
|
margin-right: 0.5rem;
|
||||||
|
margin-left: 0.5rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Small Monitor */
|
/* Small Monitor */
|
||||||
@ -124,6 +132,11 @@
|
|||||||
.blocklyTreeRow {
|
.blocklyTreeRow {
|
||||||
width: 230px;
|
width: 230px;
|
||||||
}
|
}
|
||||||
|
/* Blockly Toolbox buttons */
|
||||||
|
#blocklyToolboxButtons {
|
||||||
|
margin-right: 1rem;
|
||||||
|
margin-left: 1rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Large Monitor */
|
/* Large Monitor */
|
||||||
@ -131,6 +144,11 @@
|
|||||||
.blocklyTreeRow {
|
.blocklyTreeRow {
|
||||||
width: 230px;
|
width: 230px;
|
||||||
}
|
}
|
||||||
|
/* Blockly Toolbox buttons */
|
||||||
|
#blocklyToolboxButtons {
|
||||||
|
margin-right: 2rem;
|
||||||
|
margin-left: 2rem;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*******************************
|
/*******************************
|
||||||
|
Reference in New Issue
Block a user