From 78aee5fdd4262594cbec085d4e1c00adbfe8b619 Mon Sep 17 00:00:00 2001 From: Peli de Halleux Date: Thu, 10 Mar 2016 22:17:32 -0800 Subject: [PATCH] folding sub-libs into single lib --- kindtarget.json | 7 +------ libs/microbit-game/README.md | 4 ---- libs/microbit-game/kind.json | 14 ------------- libs/microbit-led/README.md | 4 ---- libs/microbit-led/kind.json | 13 ------------ libs/microbit-music/README.md | 2 -- libs/microbit-music/kind.json | 13 ------------ libs/microbit-pins/README.md | 4 ---- libs/microbit-pins/kind.json | 13 ------------ libs/microbit-serial/README.md | 4 ---- libs/microbit-serial/kind.json | 13 ------------ libs/{microbit-game => microbit}/game.ts | 0 libs/microbit/kind.json | 21 ++++++++------------ libs/{microbit-led => microbit}/led.ts | 0 libs/{microbit-music => microbit}/music.ts | 0 libs/{microbit-pins => microbit}/pins.ts | 0 libs/{microbit-serial => microbit}/serial.ts | 0 17 files changed, 9 insertions(+), 103 deletions(-) delete mode 100644 libs/microbit-game/README.md delete mode 100644 libs/microbit-game/kind.json delete mode 100644 libs/microbit-led/README.md delete mode 100644 libs/microbit-led/kind.json delete mode 100644 libs/microbit-music/README.md delete mode 100644 libs/microbit-music/kind.json delete mode 100644 libs/microbit-pins/README.md delete mode 100644 libs/microbit-pins/kind.json delete mode 100644 libs/microbit-serial/README.md delete mode 100644 libs/microbit-serial/kind.json rename libs/{microbit-game => microbit}/game.ts (100%) rename libs/{microbit-led => microbit}/led.ts (100%) rename libs/{microbit-music => microbit}/music.ts (100%) rename libs/{microbit-pins => microbit}/pins.ts (100%) rename libs/{microbit-serial => microbit}/serial.ts (100%) diff --git a/kindtarget.json b/kindtarget.json index 48ea30f7..3ae6fa0c 100644 --- a/kindtarget.json +++ b/kindtarget.json @@ -2,11 +2,6 @@ "corepkg": "microbit", "bundleddirs": [ "libs/microbit", - "libs/microbit-led", - "libs/microbit-music", - "libs/microbit-radio", - "libs/microbit-game", - "libs/microbit-pins", - "libs/microbit-serial" + "libs/microbit-radio" ] } diff --git a/libs/microbit-game/README.md b/libs/microbit-game/README.md deleted file mode 100644 index 0ed2bde3..00000000 --- a/libs/microbit-game/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# game - -The game library. - diff --git a/libs/microbit-game/kind.json b/libs/microbit-game/kind.json deleted file mode 100644 index 18713884..00000000 --- a/libs/microbit-game/kind.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "microbit-game", - "description": "The game services", - "files": [ - "README.md", - "game.ts" - ], - "public": true, - "dependencies": { - "microbit": "file:../microbit", - "microbit-led": "file:../microbit-led" - }, - "installedVersion": "xsrqgc" -} diff --git a/libs/microbit-led/README.md b/libs/microbit-led/README.md deleted file mode 100644 index 535d3d54..00000000 --- a/libs/microbit-led/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# led - -The led library. - diff --git a/libs/microbit-led/kind.json b/libs/microbit-led/kind.json deleted file mode 100644 index c2eeb01f..00000000 --- a/libs/microbit-led/kind.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "microbit-led", - "description": "The led services", - "files": [ - "README.md", - "led.ts" - ], - "public": true, - "dependencies": { - "microbit": "file:../microbit" - }, - "installedVersion": "dnfzlf" -} diff --git a/libs/microbit-music/README.md b/libs/microbit-music/README.md deleted file mode 100644 index e659935f..00000000 --- a/libs/microbit-music/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# music - diff --git a/libs/microbit-music/kind.json b/libs/microbit-music/kind.json deleted file mode 100644 index 1cf2c334..00000000 --- a/libs/microbit-music/kind.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "microbit-music", - "description": "The music library", - "files": [ - "README.md", - "music.ts" - ], - "public": true, - "dependencies": { - "microbit": "file:../microbit" - }, - "installedVersion": "txubhm" -} diff --git a/libs/microbit-pins/README.md b/libs/microbit-pins/README.md deleted file mode 100644 index 1ffdf2b7..00000000 --- a/libs/microbit-pins/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# radio - -The radio library. - diff --git a/libs/microbit-pins/kind.json b/libs/microbit-pins/kind.json deleted file mode 100644 index 7041f829..00000000 --- a/libs/microbit-pins/kind.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "microbit-pins", - "description": "The pins services", - "files": [ - "README.md", - "pins.ts" - ], - "public": true, - "dependencies": { - "microbit": "file:../microbit" - }, - "installedVersion": "ddslvj" -} diff --git a/libs/microbit-serial/README.md b/libs/microbit-serial/README.md deleted file mode 100644 index 7907b1b9..00000000 --- a/libs/microbit-serial/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# serial - -The serial library. - diff --git a/libs/microbit-serial/kind.json b/libs/microbit-serial/kind.json deleted file mode 100644 index cb11debd..00000000 --- a/libs/microbit-serial/kind.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "microbit-serial", - "description": "The serial services", - "files": [ - "README.md", - "serial.ts" - ], - "public": true, - "dependencies": { - "microbit": "file:../microbit" - }, - "installedVersion": "pokbut" -} diff --git a/libs/microbit-game/game.ts b/libs/microbit/game.ts similarity index 100% rename from libs/microbit-game/game.ts rename to libs/microbit/game.ts diff --git a/libs/microbit/kind.json b/libs/microbit/kind.json index d773479a..8d7bb292 100644 --- a/libs/microbit/kind.json +++ b/libs/microbit/kind.json @@ -9,7 +9,12 @@ "images.ts", "basic.ts", "input.ts", - "control.ts" + "control.ts", + "game.ts", + "led.ts", + "music.ts", + "pins.ts", + "serial.ts" ], "public": true, "dependencies": {}, @@ -23,12 +28,7 @@ "name": "{0} block", "dependencies": { "microbit": "*", - "microbit-led": "*", - "microbit-music": "*", - "microbit-radio": "*", - "microbit-game": "*", - "microbit-pins": "*", - "microbit-serial": "*" + "microbit-radio": "*" }, "description": "", "files": [ @@ -49,12 +49,7 @@ "name": "{0} bit", "dependencies": { "microbit": "*", - "microbit-led": "*", - "microbit-music": "*", - "microbit-radio": "*", - "microbit-game": "*", - "microbit-pins": "*", - "microbit-serial": "*" + "microbit-radio": "*" }, "description": "", "files": [ diff --git a/libs/microbit-led/led.ts b/libs/microbit/led.ts similarity index 100% rename from libs/microbit-led/led.ts rename to libs/microbit/led.ts diff --git a/libs/microbit-music/music.ts b/libs/microbit/music.ts similarity index 100% rename from libs/microbit-music/music.ts rename to libs/microbit/music.ts diff --git a/libs/microbit-pins/pins.ts b/libs/microbit/pins.ts similarity index 100% rename from libs/microbit-pins/pins.ts rename to libs/microbit/pins.ts diff --git a/libs/microbit-serial/serial.ts b/libs/microbit/serial.ts similarity index 100% rename from libs/microbit-serial/serial.ts rename to libs/microbit/serial.ts